Skip to content

Update postea handlers for new version. #1591

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
C0bra5 wants to merge 1 commit into
base: master
Choose a base branch
from
+18 −63
Open

Update postea handlers for new version. #1591

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions dependencies.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ dependencies {
compileOnly("com.cubefury.vendingmachine:VendingMachine:0.4.2:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:BetterQuesting:3.8.14-GTNH:dev") { transitive = false }
//compileOnly("com.github.Roadhog360:Et-Futurum-Requiem:2.6.2:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:Postea:1.2.0-pre:dev") { transitive = false }

runtimeOnlyNonPublishable rfg.deobf("curse.maven:biomes-o-plenty-220318:2499612")
runtimeOnlyNonPublishable("com.github.GTNewHorizons:WailaHarvestability:1.3.4-GTNH:dev")
Expand Down
78 changes: 16 additions & 62 deletions src/main/java/com/dreammaster/tinkersConstruct/TiCoLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@
import static gregtech.api.enums.Mods.UniversalSingularities;
import static gregtech.api.util.GTModHandler.getModItem;

import net.minecraft.block.Block;
import net.minecraft.init.Items;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
Expand All @@ -16,10 +14,8 @@
import com.dreammaster.block.BlockList;
import com.dreammaster.mantle.BookLoader;
import com.dreammaster.tinkersConstruct.worldgen.ZincGravelWorldgen;
import com.gtnewhorizons.postea.api.BlockReplacementManager;
import com.gtnewhorizons.postea.api.ItemStackReplacementManager;
import com.gtnewhorizons.postea.api.TileEntityReplacementManager;
import com.gtnewhorizons.postea.utility.BlockConversionInfo;

import gregtech.api.enums.Materials;
import gregtech.api.enums.OrePrefixes;
Expand Down Expand Up @@ -62,53 +58,22 @@ private static void registerAluminumBrassPosteaTransformers() {
}

private static void convertAluminumBrassBlock() {
String targetBlock = "TConstruct:MetalBlock";
ItemStack brassBlock = GTOreDictUnificator.get(OrePrefixes.block, Materials.Brass, 1L);
int brassBlockMeta = Items.feather.getDamage(brassBlock);
BlockReplacementManager.addBlockReplacement(targetBlock, (blockConversionInfoOld, world) -> {
if (blockConversionInfoOld.metadata == 7) {
BlockConversionInfo blockConversionInfoNew = new BlockConversionInfo();
blockConversionInfoNew.blockID = Item.getIdFromItem(brassBlock.getItem());
blockConversionInfoNew.metadata = brassBlockMeta;
return blockConversionInfoNew;
}
return null;
});
ItemStackReplacementManager.addItemReplacement(targetBlock, tag -> {
if (tag.getShort("Damage") == 7) {
tag.setShort("id", (short) Item.getIdFromItem(brassBlock.getItem()));
tag.setShort("Damage", (short) brassBlockMeta);
return tag;
}
return tag;
});
// also applies a corresponding block transform.
ItemStackReplacementManager.addSimpleReplacement("TConstruct:MetalBlock", 7, brassBlock, false);
}

private static void convertAluminumBrassItems() {
ItemStack brassIngot = GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Brass, 1L);
ItemStack brassNugget = GTOreDictUnificator.get(OrePrefixes.nugget, Materials.Brass, 1L);
ItemStack brassDust = GTOreDictUnificator.get(OrePrefixes.dust, Materials.Brass, 1L);
ItemStackReplacementManager.addItemReplacement("TConstruct:materials", tag -> {
switch (tag.getShort("Damage")) {
case 14:
tag.setShort("id", (short) Item.getIdFromItem(brassIngot.getItem()));
tag.setShort("Damage", (short) Items.feather.getDamage(brassIngot));
break;
case 24:
tag.setShort("id", (short) Item.getIdFromItem(brassNugget.getItem()));
tag.setShort("Damage", (short) Items.feather.getDamage(brassNugget));
break;
case 42:
tag.setShort("id", (short) Item.getIdFromItem(brassDust.getItem()));
tag.setShort("Damage", (short) Items.feather.getDamage(brassDust));
break;
}
return tag;
});
ItemStackReplacementManager.addSimpleReplacement("TConstruct:materials", 14, brassIngot);
ItemStackReplacementManager.addSimpleReplacement("TConstruct:materials", 24, brassNugget);
ItemStackReplacementManager.addSimpleReplacement("TConstruct:materials", 42, brassDust);
}

private static void convertMoltenAluminumBrassInSmeltery() {
TileEntityReplacementManager.tileEntityTransformer("TConstruct.Smeltery", (tags, world) -> {
TileEntityReplacementManager.tileEntityTransformer("TConstruct.Smeltery", (tags, world, chunk) -> {
NBTTagList liquidTag = tags.getTagList("Liquids", 10);
for (int i = 0; i < liquidTag.tagCount(); i++) {
NBTTagCompound nbt = liquidTag.getCompoundTagAt(i);
Expand All @@ -127,30 +92,19 @@ private static void convertAluminumBrassSingularity() {
1,
32,
missing);
ItemStackReplacementManager
.addItemReplacement("universalsingularities:universal.tinkersConstruct.singularity", tag -> {
if (tag.getShort("Damage") == 0) {
tag.setShort("id", (short) Item.getIdFromItem(roseGoldSingularity.getItem()));
tag.setShort("Damage", (short) roseGoldSingularity.getItemDamage());
return tag;
}
return tag;
});
ItemStackReplacementManager.addSimpleReplacement(
"universalsingularities:universal.tinkersConstruct.singularity",
0,
roseGoldSingularity,
true);
}

private static void registerGravelOrePosteaTransformers() {
String targetBlock = "TConstruct:GravelOre";
BlockReplacementManager.addBlockReplacement(targetBlock, (blockConversionInfoOld, world) -> {
BlockConversionInfo blockConversionInfoNew = new BlockConversionInfo();
blockConversionInfoNew.blockID = Block.getIdFromBlock(BlockList.ZincGravelOre.block);
blockConversionInfoNew.metadata = 0;
return blockConversionInfoNew;
});
ItemStackReplacementManager.addItemReplacement(targetBlock, tag -> {
tag.setShort("id", (short) Block.getIdFromBlock(BlockList.ZincGravelOre.block));
tag.setShort("Damage", (short) 0);
return tag;
});
ItemStackReplacementManager.addSimpleReplacement(
"TConstruct:GravelOre",
Item.getItemFromBlock(BlockList.ZincGravelOre.block),
0,
false);
}

}
2 changes: 1 addition & 1 deletion src/main/java/com/dreammaster/travellersgear/TGConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public class TGConverter {
public static void doPostInitialization() {
TileEntityReplacementManager.tileEntityTransformer(
"TravellersGear.ArmorStand",
(tag, world) -> new BlockInfo(Blocks.chest, 0, TGConverter::chestTransformer));
(tag, world, chunk) -> new BlockInfo(Blocks.chest, 0, TGConverter::chestTransformer));
}

private static NBTTagCompound chestTransformer(NBTTagCompound oldTag) {
Expand Down
Loading