diff options
Diffstat (limited to 'src/Java')
3 files changed, 49 insertions, 21 deletions
diff --git a/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java b/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java index fc0627a0cc..4fda17ee8a 100644 --- a/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java +++ b/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java @@ -118,7 +118,7 @@ public class COMPAT_HANDLER { Gregtech4Content.run(); GregtechIndustrialFuelRefinery.run(); GregtechTreeFarmerTE.run(); - //GregtechIndustrialTreeFarm.run(); + GregtechIndustrialTreeFarm.run(); GregtechIndustrialSifter.run(); GregtechSimpleWasher.run(); GregtechRTG.run(); diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java index 1efa09c096..0a4e760a17 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java @@ -1116,22 +1116,22 @@ public class RECIPES_Machines { if (CORE.ConfigSwitches.enableMultiblock_TreeFarmer){ //Industrial Tree Farmer - /*RECIPE_TreeFarmController = GregtechItemList.Industrial_TreeFarm.get(1);*/ + RECIPE_TreeFarmController = GregtechItemList.Industrial_TreeFarm.get(1); RECIPE_TreeFarmFrame = GregtechItemList.Casing_PLACEHOLDER_TreeFarmer.get(Casing_Amount); //Industrial Tree Farm Controller if (!GTNH) { - /*RecipeUtils.addShapedGregtechRecipe( + RecipeUtils.addShapedGregtechRecipe( "plateEglinSteel", "rotorEglinSteel", "plateEglinSteel", "cableGt02Steel", "pipeMediumSteel", "cableGt02Steel", "plateEglinSteel", CI.machineCasing_MV, "plateEglinSteel", - RECIPE_TreeFarmController);*/ + RECIPE_TreeFarmController); } else { - /*RecipeUtils.addShapedGregtechRecipe( + RecipeUtils.addShapedGregtechRecipe( "plateEglinSteel", "rotorEglinSteel", "plateEglinSteel", "cableGt02Silver", "pipeMediumStainlessSteel", "cableGt02Silver", "plateEglinSteel", CI.machineCasing_HV, "plateEglinSteel", - RECIPE_TreeFarmController);*/ + RECIPE_TreeFarmController); } //Industrial Tree Farm Frame RecipeUtils.addShapedGregtechRecipe( diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java index 164301a22b..a2ce83522b 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java @@ -1,8 +1,11 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production; +import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.TimeUnit; +import com.gtnewhorizon.structurelib.structure.IStructureDefinition; import gregtech.api.enums.Materials; import gregtech.api.enums.TAE; import gregtech.api.enums.Textures; @@ -12,6 +15,7 @@ import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.items.GT_MetaGenerated_Tool; import gregtech.api.objects.GT_RenderedTexture; +import gregtech.api.util.GT_Multiblock_Tooltip_Builder; import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Utility; import gtPlusPlus.api.objects.Logger; @@ -64,12 +68,12 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase if (executor == null || mTreeData == null) { if (executor == null) { - executor = Executors.newScheduledThreadPool(10); + executor = Executors.newScheduledThreadPool(10); } if (executor != null) { if (aThread == null) { aThread = new ThreadFakeWorldGenerator(); - executor.scheduleAtFixedRate(aThread, 0, 1, TimeUnit.SECONDS); + executor.scheduleAtFixedRate(aThread, 0, 1, TimeUnit.SECONDS); while (aThread.mGenerator == null) { if (aThread.mGenerator != null) { break; @@ -97,20 +101,29 @@ if (executor == null || mTreeData == null) { return "Tree Farm"; } - public String[] getTooltip() { - + @Override + protected GT_Multiblock_Tooltip_Builder createTooltip() { if (mCasingName.toLowerCase().contains(".name")) { mCasingName = ItemUtils.getLocalizedNameOfBlock(ModBlocks.blockCasings2Misc, 15); } - - return new String[]{ - "Converts EU to Oak Logs", - "Speed: Very Fast | Eu Usage: 100% | Parallel: 1", - "Requires a Saw, Buzz Saw or Chainsaw in GUI slot", - "Constructed exactly the same as a normal Vacuum Freezer", - "Use "+mCasingName+"s (10 at least!)", - "TAG_HIDE_HATCHES" - }; + GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); + tt.addMachineType(getMachineType()) + .addInfo("Converts EU to Oak Logs") + .addInfo("Eu Usage: 100% | Parallel: 1") + .addInfo("Requires a Saw or Chainsaw in GUI slot") + .addInfo("Constructed exactly the same as a normal Vacuum Freezer") + .addPollutionAmount(getPollutionPerTick(null) * 20) + .addSeparator() + .beginStructureBlock(3, 3, 3, true) + .addController("Front center") + .addCasingInfo(mCasingName, 10) + .addInputBus("Any casing", 1) + .addOutputBus("Any casing", 1) + .addEnergyHatch("Any casing", 1) + .addMaintenanceHatch("Any casing", 1) + .addMufflerHatch("Any casing", 1) + .toolTipFinisher("GT++"); + return tt; } public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final byte aSide, final byte aFacing, @@ -146,8 +159,13 @@ if (executor == null || mTreeData == null) { //return true; } - public boolean isFacingValid(final byte aFacing) { - return aFacing > 1; +// public boolean isFacingValid(final byte aFacing) { +// return aFacing > 1; +// } + + @Override + public IStructureDefinition getStructureDefinition() { + return null; } public boolean checkRecipe(final ItemStack aStack) { @@ -215,6 +233,11 @@ if (executor == null || mTreeData == null) { } @Override + public boolean checkMachine(IGregTechTileEntity iGregTechTileEntity, ItemStack itemStack) { + return false; + } + + @Override public int getMaxParallelRecipes() { return 1; } @@ -314,4 +337,9 @@ if (executor == null || mTreeData == null) { } } } + + @Override + public void construct(ItemStack stackSize, boolean hintsOnly) { + + } } |