From b86abdfa2fca6be84dafd5655d8eced43f2a57b0 Mon Sep 17 00:00:00 2001 From: Sphyix Date: Sun, 23 Jan 2022 02:17:42 +0100 Subject: Update GregtechMetaTileEntityTreeFarm.java --- .../production/GregtechMetaTileEntityTreeFarm.java | 115 +++++++++++---------- 1 file changed, 59 insertions(+), 56 deletions(-) diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java index 2b5320de20..c7355d23d2 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java @@ -24,6 +24,7 @@ import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; import gtPlusPlus.xmod.gregtech.common.helpers.TreeFarmHelper; import gtPlusPlus.xmod.gregtech.common.helpers.treefarm.TreeGenerator; import net.minecraft.init.Blocks; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; @@ -34,6 +35,7 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase< public static int CASING_TEXTURE_ID; public static String mCasingName = "Sterile Farm Casing"; public static TreeGenerator mTreeData; + private ItemStack mTreeType; private int mCasing; private IStructureDefinition STRUCTURE_DEFINITION = null; @@ -122,78 +124,53 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase< } public boolean checkRecipe(final ItemStack aStack) { - if (mTreeData == null) - // not finished somehow - return false; + if (aStack == null && !replaceTool()) // no tool return false; if (!isCorrectMachinePart(aStack)) // not a tool return false; - if (mTreeData != null) { - long tVoltage = getMaxInputVoltage(); - byte tTier = (byte) Math.max(1, GT_Utility.getTier(tVoltage)); + long tVoltage = getMaxInputVoltage(); + byte tTier = (byte) Math.max(1, GT_Utility.getTier(tVoltage)); - this.mMaxProgresstime = 100; - this.mEUt = (int) tVoltage; + this.mMaxProgresstime = 100; + this.mEUt = (int) tVoltage; - this.mEfficiency = (10000 - (getIdealStatus() - getRepairStatus()) * 1000); - this.mEfficiencyIncrease = 10000; + this.mEfficiency = (10000 - (getIdealStatus() - getRepairStatus()) * 1000); + this.mEfficiencyIncrease = 10000; - // Overclock - if (this.mEUt <= 16) { - this.mEUt = (this.mEUt * (1 << tTier - 1) * (1 << tTier - 1)); - this.mMaxProgresstime = (this.mMaxProgresstime / (1 << tTier - 1)); - } else { - while (this.mEUt <= gregtech.api.enums.GT_Values.V[(tTier - 1)]) { - this.mEUt *= 4; - this.mMaxProgresstime /= 2; - } - } - - if (this.mEUt > 0) { - this.mEUt = (-this.mEUt); + // Overclock + if (this.mEUt <= 16) { + this.mEUt = (this.mEUt * (1 << tTier - 1) * (1 << tTier - 1)); + this.mMaxProgresstime = (this.mMaxProgresstime / (1 << tTier - 1)); + } else { + while (this.mEUt <= gregtech.api.enums.GT_Values.V[(tTier - 1)]) { + this.mEUt *= 4; + this.mMaxProgresstime /= 2; } + } + if (this.mEUt > 0) { + this.mEUt = (-this.mEUt); + } - int aChance = MathUtils.randInt(0, 10); - - try { - if (aChance < 8) { - ItemStackMap allOutputs = new ItemStackMap<>(); - if (aLeaves == null) - aLeaves = ItemUtils.getSimpleStack(Blocks.leaves); - //1% Chance per Tick - for (int u = 0; u < (Math.max(4, (MathUtils.randInt((3 * tTier), 100) * tTier * tTier) / 14)); u++) { - AutoMap aOutputs = mTreeData.generateOutput(0); - if (aOutputs.size() > 0) { - for (ItemStack aOutputItemStack : aOutputs) { - if (!GT_Utility.areStacksEqual(aLeaves, aOutputItemStack)) { - Integer oldStackSize = allOutputs.get(aOutputItemStack); - int oldStackSizeUnboxed = oldStackSize == null ? 0 : oldStackSize; - allOutputs.put(aOutputItemStack, oldStackSizeUnboxed + aOutputItemStack.stackSize); - } - } - } - } - - mOutputItems = allOutputs.entries().stream() - .map(e -> { - e.key.stackSize = e.value; - return e.key; - }).toArray(ItemStack[]::new); - } - } catch (Throwable t) { - t.printStackTrace(GT_Log.err); + try { + int outputAmount = (2 * tTier ^ 2) - (2 * tTier) + 5; + int lastStack = outputAmount % 64; + mTreeType.stackSize = 64; + for (int i = 0; i < (outputAmount - lastStack) / 64; i++) { + this.addOutput(mTreeType); } - return true; - } else { - return false; + mTreeType.stackSize = lastStack; + this.addOutput(mTreeType); + this.updateSlots(); + } catch (Throwable t) { + t.printStackTrace(GT_Log.err); } + return true; } - @Override public boolean checkHatch() { return super.checkHatch() && mEnergyHatches.size() == 1; @@ -283,6 +260,31 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase< return false; } + public boolean getWoodBasedOnSapling() { + for (GT_MetaTileEntity_Hatch_InputBus mInputBus : this.mInputBusses) { + for (int i = 0; i < mInputBus.mInventory.length; i++) { + ItemStack uStack = mInputBus.mInventory[i]; + if (uStack != null) { + ItemStack aWood = woodMapper(uStack); + if(aWood != null) { + this.mTreeType = aWood; + return true; + } else{ + this.mTreeType = new ItemStack(Blocks.log, 0); + } + } + } + } + return false; + } + + public ItemStack woodMapper(ItemStack aStack){ + String b = aStack.getUnlocalizedName(); + String registryName = Item.itemRegistry.getNameForObject(aStack.getItem()); + String modID = registryName.substring(0, registryName.indexOf(":")); + return null; + } + public boolean tryDamageTool(ItemStack invItem) { if (invItem != null && invItem.getItem() instanceof GT_MetaGenerated_Tool) { long aDmg = GT_MetaGenerated_Tool.getToolDamage(invItem); @@ -317,6 +319,7 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase< @Override public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) { super.onPostTick(aBaseMetaTileEntity, aTick); + getWoodBasedOnSapling(); replaceTool(); } -- cgit From 03a4f719d406af2f979b0d1d903c53d8cf2cc24e Mon Sep 17 00:00:00 2001 From: Sphyix Date: Sun, 23 Jan 2022 03:39:41 +0100 Subject: commented old code, fixed output amount, mapped sapling to wood --- .../production/GregtechMetaTileEntityTreeFarm.java | 128 +++++++++++++++++++-- 1 file changed, 116 insertions(+), 12 deletions(-) diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java index c7355d23d2..29ddd549c3 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java @@ -76,6 +76,7 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase< .addInfo("Converts EU to Oak Logs") .addInfo("Eu Usage: 100% | Parallel: 1") .addInfo("Requires a Saw or Chainsaw in GUI slot") + .addInfo("Add a sapling in the input bus to change wood type output") .addPollutionAmount(getPollutionPerSecond(null)) .addSeparator() .beginStructureBlock(3, 3, 3, true) @@ -156,8 +157,39 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase< this.mEUt = (-this.mEUt); } + /* Old Methods with FakeWorld + int aChance = MathUtils.randInt(0, 10); + + try { + if (aChance < 8) { + ItemStackMap allOutputs = new ItemStackMap<>(); + if (aLeaves == null) + aLeaves = ItemUtils.getSimpleStack(Blocks.leaves); + //1% Chance per Tick + for (int u = 0; u < (Math.max(4, (MathUtils.randInt((3 * tTier), 100) * tTier * tTier) / 14)); u++) { + AutoMap aOutputs = mTreeData.generateOutput(0); + if (aOutputs.size() > 0) { + for (ItemStack aOutputItemStack : aOutputs) { + if (!GT_Utility.areStacksEqual(aLeaves, aOutputItemStack)) { + Integer oldStackSize = allOutputs.get(aOutputItemStack); + int oldStackSizeUnboxed = oldStackSize == null ? 0 : oldStackSize; + allOutputs.put(aOutputItemStack, oldStackSizeUnboxed + aOutputItemStack.stackSize); + } + } + } + } + + mOutputItems = allOutputs.entries().stream() + .map(e -> { + e.key.stackSize = e.value; + return e.key; + }).toArray(ItemStack[]::new); + } + } catch (Throwable t) { + t.printStackTrace(GT_Log.err); + */ try { - int outputAmount = (2 * tTier ^ 2) - (2 * tTier) + 5; + int outputAmount = ((2 * (tTier * tTier)) - (2 * tTier) + 5)*(mMaxProgresstime/20); int lastStack = outputAmount % 64; mTreeType.stackSize = 64; for (int i = 0; i < (outputAmount - lastStack) / 64; i++) { @@ -260,29 +292,101 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase< return false; } - public boolean getWoodBasedOnSapling() { + public void getWoodBasedOnSapling() { for (GT_MetaTileEntity_Hatch_InputBus mInputBus : this.mInputBusses) { for (int i = 0; i < mInputBus.mInventory.length; i++) { ItemStack uStack = mInputBus.mInventory[i]; - if (uStack != null) { - ItemStack aWood = woodMapper(uStack); + ItemStack aWood = woodMapper(uStack); if(aWood != null) { this.mTreeType = aWood; - return true; - } else{ - this.mTreeType = new ItemStack(Blocks.log, 0); + return; } - } } + this.mTreeType = new ItemStack(Blocks.log, 0); //default to oak wood } - return false; } public ItemStack woodMapper(ItemStack aStack){ - String b = aStack.getUnlocalizedName(); + if(aStack == null){ + return null; + } String registryName = Item.itemRegistry.getNameForObject(aStack.getItem()); - String modID = registryName.substring(0, registryName.indexOf(":")); - return null; + switch(registryName){ + case "minecraft:sapling": + switch(aStack.getItemDamage()) { + case 0: + return new ItemStack(Blocks.log,1, 0); //oak + case 1: + return new ItemStack(Blocks.log,1, 1); //spruce + case 2: + return new ItemStack(Blocks.log,1, 2); //birch + case 3: + return new ItemStack(Blocks.log,1, 3); //jungle + case 4: + return new ItemStack(Blocks.log2,1, 0); //acacia + case 5: + return new ItemStack(Blocks.log2,1, 1); //dark oak + default: + return null; + } + case "GalaxySpace:barnardaCsapling": + return GT_ModHandler.getModItem("GalaxySpace","barnardaClog", 1); + case "IC2:blockRubSapling": + return GT_ModHandler.getModItem("IC2","blockRubWood", 1); + case "Natura:florasapling": + switch(aStack.getItemDamage()){ + case 1: + return GT_ModHandler.getModItem("Natura","tree", 1, 0); //eucalyptus + case 2: + return GT_ModHandler.getModItem("Natura","tree", 1, 3); //hopseed + case 3: + return GT_ModHandler.getModItem("Natura","tree", 1, 1); //sakura + case 4: + return GT_ModHandler.getModItem("Natura","tree", 1, 2); //ghostwood + case 5: + return GT_ModHandler.getModItem("Natura","bloodwood", 1, 0); //bloodwood + case 6: + return GT_ModHandler.getModItem("Natura","Dark Tree", 1, 0); //darkwood + case 7: + return GT_ModHandler.getModItem("Natura","Dark Tree", 1, 1); //fusewood + default: + return null; + } + case "Natura:Rare Sapling": + switch(aStack.getItemDamage()){ + case 0: + return GT_ModHandler.getModItem("Natura","Rare Tree", 1, 0); //maple + case 1: + return GT_ModHandler.getModItem("Natura","Rare Tree", 1, 1); //silverbell + case 2: + return GT_ModHandler.getModItem("Natura","Rare Tree", 1, 2); //amaranth + case 3: + return GT_ModHandler.getModItem("Natura","Rare Tree", 1, 3); //tigerwood + case 4: + return GT_ModHandler.getModItem("Natura","willow", 1, 0); //willow + default: + return null; + } + case "TConstruct:slime.sapling": + return GT_ModHandler.getModItem("TConstruct","slime.gel", 1, 1); //green slime blocks + case "TaintedMagic:BlockWarpwoodSapling": + return GT_ModHandler.getModItem("TaintedMagic","BlockWarpwoodLog", 1); //warpwood + case "Thaumcraft:blockCustomPlant": + switch(aStack.getItemDamage()){ + case 0: + return GT_ModHandler.getModItem("Thaumcraft","blockMagicalLog", 0); //greatwood + case 1: + return GT_ModHandler.getModItem("Thaumcraft","blockMagicalLog", 1); //silverwood + default: + return null; + } + case "miscutils:blockRainforestOakSapling": + return GT_ModHandler.getModItem("miscutils","blockRainforestOakLog", 1); //gt++ rainforest + case "miscutils:blockPineSapling": + return GT_ModHandler.getModItem("miscutils","blockPineLogLog", 1); //gt++ pine + default: + return null; + } } public boolean tryDamageTool(ItemStack invItem) { -- cgit From 59f49192ad6b626101d75bbb515c10c81c63ac73 Mon Sep 17 00:00:00 2001 From: Sphyix Date: Sun, 23 Jan 2022 04:30:19 +0100 Subject: clean, optimize --- .../production/GregtechMetaTileEntityTreeFarm.java | 29 +++++++++++++++------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java index 29ddd549c3..0e61e473ca 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java @@ -39,6 +39,10 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase< private int mCasing; private IStructureDefinition STRUCTURE_DEFINITION = null; + private ItemStack currSapling; + private int currSlot = 0; + private GT_MetaTileEntity_Hatch_InputBus currInputBus; + static { new Thread("GTPP-TreeDataWorker") { @Override @@ -188,6 +192,7 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase< } catch (Throwable t) { t.printStackTrace(GT_Log.err); */ + getWoodFromSapling(); try { int outputAmount = ((2 * (tTier * tTier)) - (2 * tTier) + 5)*(mMaxProgresstime/20); int lastStack = outputAmount % 64; @@ -292,24 +297,31 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase< return false; } - public void getWoodBasedOnSapling() { + public void getWoodFromSapling() { + if(this.currSapling != null && this.currInputBus != null){ + ItemStack uStack = this.currInputBus.mInventory[this.currSlot]; + if(uStack == this.currSapling) + return; + } for (GT_MetaTileEntity_Hatch_InputBus mInputBus : this.mInputBusses) { for (int i = 0; i < mInputBus.mInventory.length; i++) { ItemStack uStack = mInputBus.mInventory[i]; - ItemStack aWood = woodMapper(uStack); - if(aWood != null) { + if(uStack != null) { + ItemStack aWood = mapWoodFromSapling(uStack); + if (aWood != null) { + this.currSapling = uStack; + this.currInputBus = mInputBus; + this.currSlot = i; this.mTreeType = aWood; return; } + } } - this.mTreeType = new ItemStack(Blocks.log, 0); //default to oak wood + this.mTreeType = new ItemStack(Blocks.log, 1,0); //default to oak wood } } - public ItemStack woodMapper(ItemStack aStack){ - if(aStack == null){ - return null; - } + public ItemStack mapWoodFromSapling(ItemStack aStack){ String registryName = Item.itemRegistry.getNameForObject(aStack.getItem()); switch(registryName){ case "minecraft:sapling": @@ -423,7 +435,6 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase< @Override public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) { super.onPostTick(aBaseMetaTileEntity, aTick); - getWoodBasedOnSapling(); replaceTool(); } -- cgit From 650eed5de127ad4cfdf305c44f427222223e1df0 Mon Sep 17 00:00:00 2001 From: Sphyix Date: Sun, 23 Jan 2022 19:12:12 +0100 Subject: fix height Vacuum Furnace --- .../multi/processing/GregtechMetaTileEntity_IndustrialDehydrator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialDehydrator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialDehydrator.java index 4147f58e36..fabbfbe388 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialDehydrator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialDehydrator.java @@ -75,7 +75,7 @@ public class GregtechMetaTileEntity_IndustrialDehydrator extends GregtechMeta_Mu .addInfo("Upgraded overclocks reduce recipe time to 25% and increase EU/t to 400%") .addPollutionAmount(getPollutionPerSecond(null)) .addSeparator() - .beginStructureBlock(3, 4, 3, true) + .beginStructureBlock(3, 5, 3, true) .addController("Bottom Center") .addCasingInfo(mCasingName, 10) .addInputBus("Any Casing", 1) -- cgit From fad8cfea7e7172c0872f1b7b348ce228082c3c2c Mon Sep 17 00:00:00 2001 From: Sphyix Date: Wed, 26 Jan 2022 15:03:37 +0100 Subject: using HashMap instead of switch for sapling to wood mapping --- .../production/GregtechMetaTileEntityTreeFarm.java | 132 +++++++++------------ 1 file changed, 53 insertions(+), 79 deletions(-) diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java index 0e61e473ca..52f0972575 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java @@ -27,6 +27,8 @@ import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import java.util.HashMap; + import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; import static gregtech.api.util.GT_StructureUtility.ofHatchAdder; @@ -38,6 +40,7 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase< private ItemStack mTreeType; private int mCasing; private IStructureDefinition STRUCTURE_DEFINITION = null; + private HashMap sLogCache = new HashMap(); private ItemStack currSapling; private int currSlot = 0; @@ -298,6 +301,9 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase< } public void getWoodFromSapling() { + if(sLogCache.size() == 0) + loadMapWoodFromSapling(); + if(this.currSapling != null && this.currInputBus != null){ ItemStack uStack = this.currInputBus.mInventory[this.currSlot]; if(uStack == this.currSapling) @@ -307,7 +313,9 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase< for (int i = 0; i < mInputBus.mInventory.length; i++) { ItemStack uStack = mInputBus.mInventory[i]; if(uStack != null) { - ItemStack aWood = mapWoodFromSapling(uStack); + String registryName = Item.itemRegistry.getNameForObject(uStack.getItem()); + int a = uStack.getItemDamage(); + ItemStack aWood = sLogCache.get(registryName + ":" + uStack.getItemDamage()); if (aWood != null) { this.currSapling = uStack; this.currInputBus = mInputBus; @@ -321,84 +329,50 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase< } } - public ItemStack mapWoodFromSapling(ItemStack aStack){ - String registryName = Item.itemRegistry.getNameForObject(aStack.getItem()); - switch(registryName){ - case "minecraft:sapling": - switch(aStack.getItemDamage()) { - case 0: - return new ItemStack(Blocks.log,1, 0); //oak - case 1: - return new ItemStack(Blocks.log,1, 1); //spruce - case 2: - return new ItemStack(Blocks.log,1, 2); //birch - case 3: - return new ItemStack(Blocks.log,1, 3); //jungle - case 4: - return new ItemStack(Blocks.log2,1, 0); //acacia - case 5: - return new ItemStack(Blocks.log2,1, 1); //dark oak - default: - return null; - } - case "GalaxySpace:barnardaCsapling": - return GT_ModHandler.getModItem("GalaxySpace","barnardaClog", 1); - case "IC2:blockRubSapling": - return GT_ModHandler.getModItem("IC2","blockRubWood", 1); - case "Natura:florasapling": - switch(aStack.getItemDamage()){ - case 1: - return GT_ModHandler.getModItem("Natura","tree", 1, 0); //eucalyptus - case 2: - return GT_ModHandler.getModItem("Natura","tree", 1, 3); //hopseed - case 3: - return GT_ModHandler.getModItem("Natura","tree", 1, 1); //sakura - case 4: - return GT_ModHandler.getModItem("Natura","tree", 1, 2); //ghostwood - case 5: - return GT_ModHandler.getModItem("Natura","bloodwood", 1, 0); //bloodwood - case 6: - return GT_ModHandler.getModItem("Natura","Dark Tree", 1, 0); //darkwood - case 7: - return GT_ModHandler.getModItem("Natura","Dark Tree", 1, 1); //fusewood - default: - return null; - } - case "Natura:Rare Sapling": - switch(aStack.getItemDamage()){ - case 0: - return GT_ModHandler.getModItem("Natura","Rare Tree", 1, 0); //maple - case 1: - return GT_ModHandler.getModItem("Natura","Rare Tree", 1, 1); //silverbell - case 2: - return GT_ModHandler.getModItem("Natura","Rare Tree", 1, 2); //amaranth - case 3: - return GT_ModHandler.getModItem("Natura","Rare Tree", 1, 3); //tigerwood - case 4: - return GT_ModHandler.getModItem("Natura","willow", 1, 0); //willow - default: - return null; - } - case "TConstruct:slime.sapling": - return GT_ModHandler.getModItem("TConstruct","slime.gel", 1, 1); //green slime blocks - case "TaintedMagic:BlockWarpwoodSapling": - return GT_ModHandler.getModItem("TaintedMagic","BlockWarpwoodLog", 1); //warpwood - case "Thaumcraft:blockCustomPlant": - switch(aStack.getItemDamage()){ - case 0: - return GT_ModHandler.getModItem("Thaumcraft","blockMagicalLog", 0); //greatwood - case 1: - return GT_ModHandler.getModItem("Thaumcraft","blockMagicalLog", 1); //silverwood - default: - return null; - } - case "miscutils:blockRainforestOakSapling": - return GT_ModHandler.getModItem("miscutils","blockRainforestOakLog", 1); //gt++ rainforest - case "miscutils:blockPineSapling": - return GT_ModHandler.getModItem("miscutils","blockPineLogLog", 1); //gt++ pine - default: - return null; - } + public void loadMapWoodFromSapling() { + + //minecraft + sLogCache.put("minecraft:sapling:0", new ItemStack(Blocks.log, 1, 0)); //oak + sLogCache.put("minecraft:sapling:1", new ItemStack(Blocks.log, 1, 1)); //spruce + sLogCache.put("minecraft:sapling:2", new ItemStack(Blocks.log, 1, 2)); //birch + sLogCache.put("minecraft:sapling:3", new ItemStack(Blocks.log, 1, 3)); //jungle + sLogCache.put("minecraft:sapling:4", new ItemStack(Blocks.log2, 1, 0)); //acacia + sLogCache.put("minecraft:sapling:5", new ItemStack(Blocks.log2, 1, 1)); //dark oak + + //galaxySpace + sLogCache.put("GalaxySpace:barnardaCsapling:0", GT_ModHandler.getModItem("GalaxySpace", "barnardaClog", 1)); //barnarda c + + //ic2 + sLogCache.put("IC2:blockRubSapling:0", GT_ModHandler.getModItem("IC2", "blockRubWood", 1)); //rubber + + //natura + sLogCache.put("Natura:florasapling:1", GT_ModHandler.getModItem("Natura","tree", 1, 0)); //eucalyptus + sLogCache.put("Natura:florasapling:2", GT_ModHandler.getModItem("Natura","tree", 1, 3)); //hopseed + sLogCache.put("Natura:florasapling:3", GT_ModHandler.getModItem("Natura","tree", 1, 1)); //sakura + sLogCache.put("Natura:florasapling:4", GT_ModHandler.getModItem("Natura","tree", 1, 2)); //ghostwood + sLogCache.put("Natura:florasapling:5", GT_ModHandler.getModItem("Natura","bloodwood", 1, 0)); //bloodwood + sLogCache.put("Natura:florasapling:6", GT_ModHandler.getModItem("Natura","Dark Tree", 1, 0)); //darkwood + sLogCache.put("Natura:florasapling:7", GT_ModHandler.getModItem("Natura","Dark Tree", 1, 1)); //fusewood + + sLogCache.put("Natura:Rare Sapling:0", GT_ModHandler.getModItem("Natura","Rare Tree", 1, 0)); //maple + sLogCache.put("Natura:Rare Sapling:1", GT_ModHandler.getModItem("Natura","Rare Tree", 1, 1)); //silverbell + sLogCache.put("Natura:Rare Sapling:2", GT_ModHandler.getModItem("Natura","Rare Tree", 1, 2)); //amaranth + sLogCache.put("Natura:Rare Sapling:3", GT_ModHandler.getModItem("Natura","Rare Tree", 1, 3)); //tigerwood + sLogCache.put("Natura:Rare Sapling:4", GT_ModHandler.getModItem("Natura","willow", 1, 0)); //willow + + //TConstruct + sLogCache.put("TConstruct:slime.sapling:0", GT_ModHandler.getModItem("TConstruct","slime.gel", 1)); //green slime blocks + + //TaintedMagic + sLogCache.put("TaintedMagic:BlockWarpwoodSapling:0", GT_ModHandler.getModItem("TaintedMagic","BlockWarpwoodLog", 1)); //warpwood + + //Thaumcraft + sLogCache.put("Thaumcraft:blockCustomPlant:0", GT_ModHandler.getModItem("Thaumcraft","blockMagicalLog", 1, 0)); //greatwood + sLogCache.put("Thaumcraft:blockCustomPlant:0", GT_ModHandler.getModItem("Thaumcraft","blockMagicalLog", 1, 1)); //silverwood + + //gt++ + sLogCache.put("miscutils:blockRainforestOakSapling:0", GT_ModHandler.getModItem("miscutils","blockRainforestOakLog", 1)); //gt++ rainforest + sLogCache.put("miscutils:blockPineSapling:0", GT_ModHandler.getModItem("miscutils","blockPineLogLog", 1)); //gt++ pine } public boolean tryDamageTool(ItemStack invItem) { -- cgit From 46708976eb4d136d71e59c020db350a6bc50b7f0 Mon Sep 17 00:00:00 2001 From: Sphyix Date: Wed, 26 Jan 2022 15:07:14 +0100 Subject: cleanup --- .../machines/multi/production/GregtechMetaTileEntityTreeFarm.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java index 52f0972575..4fc13e3ce3 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java @@ -1,7 +1,6 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production; -import codechicken.nei.ItemStackMap; import com.gtnewhorizon.structurelib.structure.IStructureDefinition; import com.gtnewhorizon.structurelib.structure.StructureDefinition; import gregtech.api.enums.Materials; @@ -14,11 +13,9 @@ import gregtech.api.items.GT_MetaGenerated_Tool; import gregtech.api.metatileentity.implementations.*; import gregtech.api.render.TextureFactory; import gregtech.api.util.*; -import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.core.block.ModBlocks; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.math.MathUtils; -import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; import gtPlusPlus.xmod.gregtech.common.helpers.TreeFarmHelper; @@ -314,7 +311,6 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase< ItemStack uStack = mInputBus.mInventory[i]; if(uStack != null) { String registryName = Item.itemRegistry.getNameForObject(uStack.getItem()); - int a = uStack.getItemDamage(); ItemStack aWood = sLogCache.get(registryName + ":" + uStack.getItemDamage()); if (aWood != null) { this.currSapling = uStack; -- cgit