From e0d55a7759cc5dffc48d4dd424478c41ad1a82a3 Mon Sep 17 00:00:00 2001 From: ddoubleo <54915478+ddoubleo@users.noreply.github.com> Date: Mon, 15 Jul 2024 05:39:29 +0300 Subject: Amazon warehouse is now an unpackager too (#2723) * Amazon warehouse is now an unpackager too * Fixed unpackager recipes not showing up in NEI for the Warehouse. Edited the tooltip * sa (cherry picked from commit e42861816ba516bd3da1f28d068a1e800e6098ee) --------- Co-authored-by: bdoubleo Co-authored-by: Dream Master --- .../machines/multi/misc/GMTE_AmazonPackager.java | 72 +++++++++++++++++++++- 1 file changed, 70 insertions(+), 2 deletions(-) (limited to 'src/main/java/gtPlusPlus') diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/GMTE_AmazonPackager.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/GMTE_AmazonPackager.java index 0e71c3b9b1..10ccf64e96 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/GMTE_AmazonPackager.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/GMTE_AmazonPackager.java @@ -10,7 +10,21 @@ import static gregtech.api.enums.GT_HatchElement.Muffler; import static gregtech.api.enums.GT_HatchElement.OutputBus; import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; +import java.util.Arrays; +import java.util.Collection; +import java.util.List; + +import javax.annotation.Nonnull; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.StatCollector; +import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; import com.gtnewhorizon.structurelib.alignment.constructable.ISurvivalConstructable; import com.gtnewhorizon.structurelib.structure.IStructureDefinition; @@ -28,14 +42,19 @@ import gregtech.api.util.GT_Multiblock_Tooltip_Builder; import gregtech.api.util.GT_Utility; import gtPlusPlus.core.block.ModBlocks; import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.util.minecraft.PlayerUtils; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; +import mcp.mobius.waila.api.IWailaConfigHandler; +import mcp.mobius.waila.api.IWailaDataAccessor; public class GMTE_AmazonPackager extends GregtechMeta_MultiBlockBase implements ISurvivalConstructable { private int mCasing; + private boolean mPackageMode = true; + private static IStructureDefinition STRUCTURE_DEFINITION = null; @Override @@ -53,7 +72,7 @@ public class GMTE_AmazonPackager extends GregtechMeta_MultiBlockBase getRecipeMap() { - return RecipeMaps.packagerRecipes; + return mPackageMode ? RecipeMaps.packagerRecipes : RecipeMaps.unpackagerRecipes; + } + + @Nonnull + @Override + public Collection> getAvailableRecipeMaps() { + return Arrays.asList(RecipeMaps.packagerRecipes, RecipeMaps.unpackagerRecipes); } @Override @@ -165,4 +191,46 @@ public class GMTE_AmazonPackager extends GregtechMeta_MultiBlockBase currentTip, IWailaDataAccessor accessor, + IWailaConfigHandler config) { + super.getWailaBody(itemStack, currentTip, accessor, config); + final NBTTagCompound tag = accessor.getNBTData(); + currentTip.add( + StatCollector.translateToLocal("GT5U.machines.oreprocessor1") + " " + + EnumChatFormatting.WHITE + + StatCollector.translateToLocal("GT5U.GTPP_MULTI_PACKAGER.mode." + (tag.getBoolean("mode") ? 1 : 0)) + + EnumChatFormatting.RESET); + } } -- cgit