From f1c9e3e449eb6d4f9f5524bca085e4939b5fd1b0 Mon Sep 17 00:00:00 2001 From: Zorbatron Date: Thu, 6 Jun 2024 04:30:49 -0400 Subject: [PATCH 1/8] Mostly works (doesn't fill if it's empty to avoid null stuff) --- .../metatileentities/MetaTileEntities.java | 6 +- .../MetaTileEntityCreativeReservoirHatch.java | 238 ++++++++++++++++++ .../resources/assets/gregtech/lang/en_us.lang | 2 + 3 files changed, 245 insertions(+), 1 deletion(-) create mode 100644 src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityCreativeReservoirHatch.java diff --git a/src/main/java/gregtech/common/metatileentities/MetaTileEntities.java b/src/main/java/gregtech/common/metatileentities/MetaTileEntities.java index e708072d894..404cf9f71f9 100644 --- a/src/main/java/gregtech/common/metatileentities/MetaTileEntities.java +++ b/src/main/java/gregtech/common/metatileentities/MetaTileEntities.java @@ -75,6 +75,7 @@ import gregtech.common.metatileentities.multi.multiblockpart.MetaTileEntityAutoMaintenanceHatch; import gregtech.common.metatileentities.multi.multiblockpart.MetaTileEntityCleaningMaintenanceHatch; import gregtech.common.metatileentities.multi.multiblockpart.MetaTileEntityComputationHatch; +import gregtech.common.metatileentities.multi.multiblockpart.MetaTileEntityCreativeReservoirHatch; import gregtech.common.metatileentities.multi.multiblockpart.MetaTileEntityDataAccessHatch; import gregtech.common.metatileentities.multi.multiblockpart.MetaTileEntityEnergyHatch; import gregtech.common.metatileentities.multi.multiblockpart.MetaTileEntityFluidHatch; @@ -232,6 +233,7 @@ public class MetaTileEntities { public static MetaTileEntityPassthroughHatchItem PASSTHROUGH_HATCH_ITEM; public static MetaTileEntityPassthroughHatchFluid PASSTHROUGH_HATCH_FLUID; public static MetaTileEntityReservoirHatch RESERVOIR_HATCH; + public static MetaTileEntityCreativeReservoirHatch CREATIVE_RESERVOIR_HATCH; public static MetaTileEntityDataAccessHatch DATA_ACCESS_HATCH; public static MetaTileEntityDataAccessHatch ADVANCED_DATA_ACCESS_HATCH; public static MetaTileEntityDataAccessHatch CREATIVE_DATA_HATCH; @@ -935,7 +937,9 @@ public static void init() { new MetaTileEntityHPCABridge(gregtechId("hpca.bridge_component"))); RESERVOIR_HATCH = registerMetaTileEntity(1418, new MetaTileEntityReservoirHatch(gregtechId("reservoir_hatch"))); - // Free ID 1419 + CREATIVE_RESERVOIR_HATCH = registerMetaTileEntity(1419, + new MetaTileEntityCreativeReservoirHatch(gregtechId("creative_reservoir_hatch"))); + endPos = GregTechAPI.isHighTier() ? LASER_INPUT_HATCH_256.length - 1 : Math.min(LASER_INPUT_HATCH_256.length - 1, GTValues.UHV - GTValues.IV); for (int i = 0; i < endPos; i++) { diff --git a/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityCreativeReservoirHatch.java b/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityCreativeReservoirHatch.java new file mode 100644 index 00000000000..142f3960885 --- /dev/null +++ b/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityCreativeReservoirHatch.java @@ -0,0 +1,238 @@ +package gregtech.common.metatileentities.multi.multiblockpart; + +import gregtech.api.GTValues; +import gregtech.api.capability.impl.FilteredItemHandler; +import gregtech.api.capability.impl.FluidTankList; +import gregtech.api.capability.impl.NotifiableFluidTank; +import gregtech.api.gui.GuiTextures; +import gregtech.api.gui.ModularUI; +import gregtech.api.gui.widgets.AdvancedTextWidget; +import gregtech.api.gui.widgets.FluidContainerSlotWidget; +import gregtech.api.gui.widgets.ImageWidget; +import gregtech.api.gui.widgets.PhantomTankWidget; +import gregtech.api.gui.widgets.SlotWidget; +import gregtech.api.gui.widgets.TankWidget; +import gregtech.api.metatileentity.MetaTileEntity; +import gregtech.api.metatileentity.interfaces.IGregTechTileEntity; +import gregtech.api.metatileentity.multiblock.IMultiblockAbilityPart; +import gregtech.api.metatileentity.multiblock.MultiblockAbility; +import gregtech.client.renderer.texture.Textures; + +import net.minecraft.client.resources.I18n; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.TextComponentString; +import net.minecraft.util.text.TextComponentTranslation; +import net.minecraft.world.World; +import net.minecraftforge.common.capabilities.Capability; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.IFluidTank; +import net.minecraftforge.fluids.capability.CapabilityFluidHandler; + +import codechicken.lib.render.CCRenderState; +import codechicken.lib.render.pipeline.IVertexOperation; +import codechicken.lib.vec.Matrix4; + +import net.minecraftforge.items.IItemHandlerModifiable; +import net.minecraftforge.items.ItemStackHandler; + +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +import java.util.List; +import java.util.function.Consumer; + +public class MetaTileEntityCreativeReservoirHatch extends MetaTileEntityMultiblockNotifiablePart implements + IMultiblockAbilityPart { + + private static final int FLUID_AMOUNT = 2_000_000_000; + private InfiniteTank fluidTank; + + public MetaTileEntityCreativeReservoirHatch(ResourceLocation metaTileEntityId) { + super(metaTileEntityId, GTValues.MAX, false); + this.fluidTank = new InfiniteTank(FLUID_AMOUNT, this); + initializeInventory(); + } + + @Override + public MetaTileEntity createMetaTileEntity(IGregTechTileEntity tileEntity) { + return new MetaTileEntityCreativeReservoirHatch(metaTileEntityId); + } + + @Override + protected ModularUI createUI(EntityPlayer entityPlayer) { + return createTankUI(fluidTank, getMetaFullName(), entityPlayer).build(getHolder(), entityPlayer); + } + + public ModularUI.Builder createTankUI(IFluidTank fluidTank, String title, EntityPlayer entityPlayer) { + // Create base builder/widget references + ModularUI.Builder builder = ModularUI.defaultBuilder(); + TankWidget tankWidget; + + // Add input/output-specific widgets + tankWidget = new PhantomTankWidget(fluidTank, 69, 52, 18, 18, () -> fluidTank.getFluid(), (f) -> { + this.fluidTank.setFluid(new FluidStack(f.getFluid(), FLUID_AMOUNT)); + }) + .setAlwaysShowFull(true).setDrawHoveringText(false).setContainerClicking(true, false); + + builder.image(7, 16, 81, 55, GuiTextures.DISPLAY) + .widget(new ImageWidget(91, 36, 14, 15, GuiTextures.TANK_ICON)) + .widget(new SlotWidget(exportItems, 0, 90, 53, true, false) + .setBackgroundTexture(GuiTextures.SLOT, GuiTextures.OUT_SLOT_OVERLAY)); + + // Add general widgets + return builder.label(6, 6, title) + .label(11, 20, "gregtech.gui.fluid_amount", 0xFFFFFF) + .widget(new AdvancedTextWidget(11, 30, getFluidAmountText(tankWidget), 0xFFFFFF)) + .widget(new AdvancedTextWidget(11, 40, getFluidNameText(tankWidget), 0xFFFFFF)) + .widget(tankWidget) + .widget(new FluidContainerSlotWidget(importItems, 0, 90, 16, false) + .setBackgroundTexture(GuiTextures.SLOT, GuiTextures.IN_SLOT_OVERLAY)) + .bindPlayerInventory(entityPlayer.inventory); + } + + private Consumer> getFluidNameText(TankWidget tankWidget) { + return (list) -> { + TextComponentTranslation translation = tankWidget.getFluidTextComponent(); + if (translation != null) { + list.add(translation); + } + }; + } + + private Consumer> getFluidAmountText(TankWidget tankWidget) { + return (list) -> { + String fluidAmount = tankWidget.getFormattedFluidAmount(); + if (!fluidAmount.isEmpty()) { + list.add(new TextComponentString(fluidAmount)); + } + }; + } + + @Override + public MultiblockAbility getAbility() { + return MultiblockAbility.IMPORT_FLUIDS; + } + + @Override + public void registerAbilities(List abilityList) { + abilityList.add(fluidTank); + } + + @Override + public void update() { + super.update(); + if (!getWorld().isRemote) { + fillContainerFromInternalTank(fluidTank); + if (getOffsetTimer() % 20 == 0) { + fluidTank.refill(); + } + } + } + + @Override + public void renderMetaTileEntity(CCRenderState renderState, Matrix4 translation, IVertexOperation[] pipeline) { + super.renderMetaTileEntity(renderState, translation, pipeline); + if (shouldRenderOverlay()) { + Textures.WATER_OVERLAY.renderSided(getFrontFacing(), renderState, translation, pipeline); + } + } + + @Override + public T getCapability(Capability capability, EnumFacing side) { + if (capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) { + // allow both importing and exporting from the tank + return CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY.cast(fluidTank); + } + return super.getCapability(capability, side); + } + + private int getInventorySize() { + return FLUID_AMOUNT; + } + + @Override + protected FluidTankList createImportFluidHandler() { + return new FluidTankList(false, fluidTank); + } + + @Override + protected IItemHandlerModifiable createImportItemHandler() { + return new FilteredItemHandler(this).setFillPredicate( + FilteredItemHandler.getCapabilityFilter(CapabilityFluidHandler.FLUID_HANDLER_ITEM_CAPABILITY)); + } + + @Override + protected IItemHandlerModifiable createExportItemHandler() { + return new ItemStackHandler(1); + } + + @Override + public void addInformation(ItemStack stack, @Nullable World player, @NotNull List tooltip, + boolean advanced) { + tooltip.add(I18n.format("gregtech.universal.tooltip.fluid_storage_capacity", getInventorySize())); + tooltip.add(I18n.format("gregtech.universal.enabled")); + } + + @Override + public void addToolUsages(ItemStack stack, @Nullable World world, List tooltip, boolean advanced) { + tooltip.add(I18n.format("gregtech.tool_action.screwdriver.access_covers")); + super.addToolUsages(stack, world, tooltip, advanced); + } + + @Override + public NBTTagCompound writeToNBT(NBTTagCompound data) { + if (fluidTank.getFluid() != null) { + data.setTag("FluidInventory", fluidTank.writeToNBT(new NBTTagCompound())); + } + return super.writeToNBT(data); + } + + @Override + public void readFromNBT(NBTTagCompound data) { + if (data.hasKey("fluid")) { + this.fluidTank.readFromNBT(data.getCompoundTag("FluidInventory")); + } + super.readFromNBT(data); + } + + private class InfiniteTank extends NotifiableFluidTank { + + public InfiniteTank(int capacity, MetaTileEntity entityToNotify) { + super(capacity, entityToNotify, false); + setFluid(new FluidStack(FluidRegistry.WATER, FLUID_AMOUNT)); + setCanFill(false); + } + + public void refill() { + if (fluidTank.getFluid() != null) { + int fillAmount = Math.max(0, FLUID_AMOUNT - getFluidAmount()); + if (fillAmount > 0) { + // call super since our overrides don't allow any kind of filling + super.fillInternal(new FluidStack(fluidTank.getFluid(), fillAmount), true); + } + } + } + + @Override + public boolean canDrainFluidType(@Nullable FluidStack fluid) { + return true; + } + + // don't allow external filling + @Override + public int fillInternal(FluidStack resource, boolean doFill) { + return 0; + } + + @Override + public boolean canFillFluidType(FluidStack fluid) { + return false; + } + } +} diff --git a/src/main/resources/assets/gregtech/lang/en_us.lang b/src/main/resources/assets/gregtech/lang/en_us.lang index 48cc639c08c..f6a734efd21 100644 --- a/src/main/resources/assets/gregtech/lang/en_us.lang +++ b/src/main/resources/assets/gregtech/lang/en_us.lang @@ -4048,6 +4048,8 @@ gregtech.scanner.copy_stick_empty=§oEmpty Stick gregtech.machine.infinite_energy.name=Infinite GT Energy Unit Emitter gregtech.machine.creative_chest.name=Creative Quantum Chest gregtech.machine.creative_tank.name=Creative Quantum Tank +gregtech.machine.creative_reservoir_hatch.name=Creative Reservoir Hatch +gregtech.machine.creative_reservoir_hatch.tooltip=Definitely not a sink! gregtech.creative_tooltip.1=§7You just need gregtech.creative_tooltip.2= Creative Mode gregtech.creative_tooltip.3=§7 to use this From fa4f01caca42d2eff8d182e2bb0bb19fabaf12a3 Mon Sep 17 00:00:00 2001 From: Zorbatron Date: Thu, 6 Jun 2024 04:53:06 -0400 Subject: [PATCH 2/8] Refills if emptied before the 20 tick update and NBT! --- .../MetaTileEntityCreativeReservoirHatch.java | 26 ++++++++----------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityCreativeReservoirHatch.java b/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityCreativeReservoirHatch.java index 142f3960885..23cb0440342 100644 --- a/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityCreativeReservoirHatch.java +++ b/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityCreativeReservoirHatch.java @@ -51,7 +51,8 @@ public class MetaTileEntityCreativeReservoirHatch extends MetaTileEntityMultiblo IMultiblockAbilityPart { private static final int FLUID_AMOUNT = 2_000_000_000; - private InfiniteTank fluidTank; + private FluidStack lockTank = new FluidStack(FluidRegistry.WATER, 1); + private final InfiniteTank fluidTank; public MetaTileEntityCreativeReservoirHatch(ResourceLocation metaTileEntityId) { super(metaTileEntityId, GTValues.MAX, false); @@ -76,7 +77,8 @@ public ModularUI.Builder createTankUI(IFluidTank fluidTank, String title, Entity // Add input/output-specific widgets tankWidget = new PhantomTankWidget(fluidTank, 69, 52, 18, 18, () -> fluidTank.getFluid(), (f) -> { - this.fluidTank.setFluid(new FluidStack(f.getFluid(), FLUID_AMOUNT)); + this.lockTank = new FluidStack(f, 1); + this.fluidTank.setFluid(new FluidStack(f, FLUID_AMOUNT)); }) .setAlwaysShowFull(true).setDrawHoveringText(false).setContainerClicking(true, false); @@ -128,7 +130,7 @@ public void registerAbilities(List abilityList) { public void update() { super.update(); if (!getWorld().isRemote) { - fillContainerFromInternalTank(fluidTank); + //fillContainerFromInternalTank(fluidTank); if (getOffsetTimer() % 20 == 0) { fluidTank.refill(); } @@ -187,17 +189,13 @@ public void addToolUsages(ItemStack stack, @Nullable World world, List t @Override public NBTTagCompound writeToNBT(NBTTagCompound data) { - if (fluidTank.getFluid() != null) { - data.setTag("FluidInventory", fluidTank.writeToNBT(new NBTTagCompound())); - } + data.setTag("FluidInventory", lockTank.writeToNBT(new NBTTagCompound())); return super.writeToNBT(data); } @Override public void readFromNBT(NBTTagCompound data) { - if (data.hasKey("fluid")) { - this.fluidTank.readFromNBT(data.getCompoundTag("FluidInventory")); - } + this.lockTank = FluidStack.loadFluidStackFromNBT(data.getCompoundTag("FluidInventory")); super.readFromNBT(data); } @@ -210,12 +208,10 @@ public InfiniteTank(int capacity, MetaTileEntity entityToNotify) { } public void refill() { - if (fluidTank.getFluid() != null) { - int fillAmount = Math.max(0, FLUID_AMOUNT - getFluidAmount()); - if (fillAmount > 0) { - // call super since our overrides don't allow any kind of filling - super.fillInternal(new FluidStack(fluidTank.getFluid(), fillAmount), true); - } + int fillAmount = Math.max(0, FLUID_AMOUNT - getFluidAmount()); + if (fillAmount > 0) { + // call super since our overrides don't allow any kind of filling + super.fillInternal(new FluidStack(lockTank.getFluid(), fillAmount), true); } } From f2164ac0b8cc868ce05479e98d6941dd9cbfd166 Mon Sep 17 00:00:00 2001 From: Zorbatron Date: Thu, 6 Jun 2024 05:05:17 -0400 Subject: [PATCH 3/8] Yippe no more nulls :3 --- .../MetaTileEntityCreativeReservoirHatch.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityCreativeReservoirHatch.java b/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityCreativeReservoirHatch.java index 23cb0440342..5a841c46045 100644 --- a/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityCreativeReservoirHatch.java +++ b/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityCreativeReservoirHatch.java @@ -77,8 +77,11 @@ public ModularUI.Builder createTankUI(IFluidTank fluidTank, String title, Entity // Add input/output-specific widgets tankWidget = new PhantomTankWidget(fluidTank, 69, 52, 18, 18, () -> fluidTank.getFluid(), (f) -> { - this.lockTank = new FluidStack(f, 1); - this.fluidTank.setFluid(new FluidStack(f, FLUID_AMOUNT)); + // Runs when the tank empties and f ends up null?? + if (f != null) { + this.lockTank = new FluidStack(f, 1); + this.fluidTank.setFluid(new FluidStack(f, FLUID_AMOUNT)); + } }) .setAlwaysShowFull(true).setDrawHoveringText(false).setContainerClicking(true, false); From ab95cc444a0a6ccbdea56c70007c6e4ad995c2d6 Mon Sep 17 00:00:00 2001 From: Zorbatron Date: Thu, 6 Jun 2024 05:06:49 -0400 Subject: [PATCH 4/8] Spotless goodies --- .../MetaTileEntityCreativeReservoirHatch.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityCreativeReservoirHatch.java b/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityCreativeReservoirHatch.java index 5a841c46045..eaf8230b895 100644 --- a/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityCreativeReservoirHatch.java +++ b/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityCreativeReservoirHatch.java @@ -33,14 +33,12 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidTank; import net.minecraftforge.fluids.capability.CapabilityFluidHandler; +import net.minecraftforge.items.IItemHandlerModifiable; +import net.minecraftforge.items.ItemStackHandler; import codechicken.lib.render.CCRenderState; import codechicken.lib.render.pipeline.IVertexOperation; import codechicken.lib.vec.Matrix4; - -import net.minecraftforge.items.IItemHandlerModifiable; -import net.minecraftforge.items.ItemStackHandler; - import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -133,7 +131,7 @@ public void registerAbilities(List abilityList) { public void update() { super.update(); if (!getWorld().isRemote) { - //fillContainerFromInternalTank(fluidTank); + // fillContainerFromInternalTank(fluidTank); -- I'm not sure what this is supposed to do (I copied it from the reservoir hatch), so I commented it out :3 if (getOffsetTimer() % 20 == 0) { fluidTank.refill(); } From 1c4b9f288e83236c09241b75f1d25f783353892e Mon Sep 17 00:00:00 2001 From: Zorbatron Date: Thu, 6 Jun 2024 05:09:20 -0400 Subject: [PATCH 5/8] Figured out what "fillContainerFromInternalTank" does (I'm so, so smart...) --- .../multiblockpart/MetaTileEntityCreativeReservoirHatch.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityCreativeReservoirHatch.java b/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityCreativeReservoirHatch.java index eaf8230b895..5fa9cc1558b 100644 --- a/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityCreativeReservoirHatch.java +++ b/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityCreativeReservoirHatch.java @@ -131,7 +131,7 @@ public void registerAbilities(List abilityList) { public void update() { super.update(); if (!getWorld().isRemote) { - // fillContainerFromInternalTank(fluidTank); -- I'm not sure what this is supposed to do (I copied it from the reservoir hatch), so I commented it out :3 + fillContainerFromInternalTank(fluidTank); if (getOffsetTimer() % 20 == 0) { fluidTank.refill(); } From 55e9d39ccdc33ffb1f8f4f3ce6c3751be4c4fe1c Mon Sep 17 00:00:00 2001 From: Zorbatron Date: Thu, 6 Jun 2024 05:48:41 -0400 Subject: [PATCH 6/8] New overlay graphic --- .../java/gregtech/client/renderer/texture/Textures.java | 1 + .../MetaTileEntityCreativeReservoirHatch.java | 6 +----- .../blocks/overlay/machine/overlay_drop_infinity.png | 0 3 files changed, 2 insertions(+), 5 deletions(-) create mode 100644 src/main/resources/assets/gregtech/textures/blocks/overlay/machine/overlay_drop_infinity.png diff --git a/src/main/java/gregtech/client/renderer/texture/Textures.java b/src/main/java/gregtech/client/renderer/texture/Textures.java index c007a6b13d6..4da704dd714 100644 --- a/src/main/java/gregtech/client/renderer/texture/Textures.java +++ b/src/main/java/gregtech/client/renderer/texture/Textures.java @@ -320,6 +320,7 @@ public class Textures { "overlay/machine/overlay_item_hatch_input"); public static final SimpleOverlayRenderer WATER_OVERLAY = new SimpleOverlayRenderer( "overlay/machine/overlay_water"); + public static final SimpleOverlayRenderer DROP_INFINITY_OVERLAY = new SimpleOverlayRenderer("overlay/machine/overlay_drop_infinity"); public static final ICubeRenderer BRONZE_FIREBOX = new SidedCubeRenderer("casings/firebox/overlay/bronze"); public static final ICubeRenderer BRONZE_FIREBOX_ACTIVE = new FireboxActiveRenderer( diff --git a/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityCreativeReservoirHatch.java b/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityCreativeReservoirHatch.java index 5fa9cc1558b..de0fcfdafb7 100644 --- a/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityCreativeReservoirHatch.java +++ b/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityCreativeReservoirHatch.java @@ -155,10 +155,6 @@ public T getCapability(Capability capability, EnumFacing side) { return super.getCapability(capability, side); } - private int getInventorySize() { - return FLUID_AMOUNT; - } - @Override protected FluidTankList createImportFluidHandler() { return new FluidTankList(false, fluidTank); @@ -178,7 +174,7 @@ protected IItemHandlerModifiable createExportItemHandler() { @Override public void addInformation(ItemStack stack, @Nullable World player, @NotNull List tooltip, boolean advanced) { - tooltip.add(I18n.format("gregtech.universal.tooltip.fluid_storage_capacity", getInventorySize())); + tooltip.add(I18n.format("gregtech.universal.tooltip.fluid_storage_capacity", FLUID_AMOUNT)); tooltip.add(I18n.format("gregtech.universal.enabled")); } diff --git a/src/main/resources/assets/gregtech/textures/blocks/overlay/machine/overlay_drop_infinity.png b/src/main/resources/assets/gregtech/textures/blocks/overlay/machine/overlay_drop_infinity.png new file mode 100644 index 00000000000..e69de29bb2d From 1ca158284cc3b6277fde6b6999f4e4cd77877aaf Mon Sep 17 00:00:00 2001 From: Zorbatron Date: Thu, 6 Jun 2024 05:50:13 -0400 Subject: [PATCH 7/8] Git ate my image ;( --- .../overlay/machine/overlay_drop_infinity.png | Bin 0 -> 171 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/src/main/resources/assets/gregtech/textures/blocks/overlay/machine/overlay_drop_infinity.png b/src/main/resources/assets/gregtech/textures/blocks/overlay/machine/overlay_drop_infinity.png index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..589c1b52b4594bc195eff70685db59384c73cb72 100644 GIT binary patch literal 171 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`MV>B>Ar`&K2@+o#HoiPx-(_Mv zYyHpu^8#v{eAQDJk}uEy&l7DvA)kTk#xBP6hy>Gyh}#>b7%s;YJGE&t8 zWAFO(goK2K%PNuy-}lXXI3Yoq%h#kqRiWB6m!(%(OyZ+t)0zMA$D4xR9$;d)@WJZP U`I&WgK-(ESUHx3vIVCg!0Nt!UzyJUM literal 0 HcmV?d00001 From ebb9f4bb1bbe293809161ae717561547e270aa32 Mon Sep 17 00:00:00 2001 From: Zorbatron Date: Thu, 6 Jun 2024 06:06:54 -0400 Subject: [PATCH 8/8] More spotless fun --- src/main/java/gregtech/client/renderer/texture/Textures.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/gregtech/client/renderer/texture/Textures.java b/src/main/java/gregtech/client/renderer/texture/Textures.java index 4da704dd714..b4b656f8df2 100644 --- a/src/main/java/gregtech/client/renderer/texture/Textures.java +++ b/src/main/java/gregtech/client/renderer/texture/Textures.java @@ -320,7 +320,8 @@ public class Textures { "overlay/machine/overlay_item_hatch_input"); public static final SimpleOverlayRenderer WATER_OVERLAY = new SimpleOverlayRenderer( "overlay/machine/overlay_water"); - public static final SimpleOverlayRenderer DROP_INFINITY_OVERLAY = new SimpleOverlayRenderer("overlay/machine/overlay_drop_infinity"); + public static final SimpleOverlayRenderer DROP_INFINITY_OVERLAY = new SimpleOverlayRenderer( + "overlay/machine/overlay_drop_infinity"); public static final ICubeRenderer BRONZE_FIREBOX = new SidedCubeRenderer("casings/firebox/overlay/bronze"); public static final ICubeRenderer BRONZE_FIREBOX_ACTIVE = new FireboxActiveRenderer(