From 1049cd90afa3fabcf4ebb4e44b9f072d95b95920 Mon Sep 17 00:00:00 2001 From: lordIcocain Date: Tue, 20 May 2025 06:50:45 +0300 Subject: [PATCH] rebranding --- .../client/gui/GuiPatternValueAmount.java | 8 +++---- ...ker.java => GuiSuperStockReplenisher.java} | 18 +++++++------- ...va => ContainerSuperStockReplenisher.java} | 14 +++++------ ...r.java => BlockSuperStockReplenisher.java} | 22 +++++++++--------- ...er.java => TileSuperStockReplenisher.java} | 8 +++---- .../github/inventory/gui/GuiType.java | 16 ++++++------- .../github/loader/ChannelLoader.java | 6 ++--- .../github/loader/ItemAndBlockHolder.java | 4 ++-- .../network/CPacketPatternValueSet.java | 4 ++-- ...> SPacketSuperStockReplenisherUpdate.java} | 14 +++++------ .../com/glodblock/github/util/NameConst.java | 2 +- .../resources/assets/ae2fc/lang/en_US.lang | 2 +- ...stoker.png => super_stock_replenisher.png} | Bin ...erStoker.png => superStockReplenisher.png} | Bin 14 files changed, 59 insertions(+), 59 deletions(-) rename src/main/java/com/glodblock/github/client/gui/{GuiSuperStoker.java => GuiSuperStockReplenisher.java} (89%) rename src/main/java/com/glodblock/github/client/gui/container/{ContainerSuperStoker.java => ContainerSuperStockReplenisher.java} (90%) rename src/main/java/com/glodblock/github/common/block/{BlockSuperStoker.java => BlockSuperStockReplenisher.java} (69%) rename src/main/java/com/glodblock/github/common/tile/{TileSuperStoker.java => TileSuperStockReplenisher.java} (98%) rename src/main/java/com/glodblock/github/network/{SPacketSuperStokerUpdate.java => SPacketSuperStockReplenisherUpdate.java} (73%) rename src/main/resources/assets/ae2fc/textures/blocks/{super_stoker.png => super_stock_replenisher.png} (100%) rename src/main/resources/assets/ae2fc/textures/gui/{superStoker.png => superStockReplenisher.png} (100%) diff --git a/src/main/java/com/glodblock/github/client/gui/GuiPatternValueAmount.java b/src/main/java/com/glodblock/github/client/gui/GuiPatternValueAmount.java index 77bb6a5d..b73d099d 100644 --- a/src/main/java/com/glodblock/github/client/gui/GuiPatternValueAmount.java +++ b/src/main/java/com/glodblock/github/client/gui/GuiPatternValueAmount.java @@ -9,7 +9,7 @@ import com.glodblock.github.client.gui.container.ContainerPatternValueAmount; import com.glodblock.github.common.item.ItemWirelessUltraTerminal; import com.glodblock.github.common.parts.PartFluidPatternTerminal; import com.glodblock.github.common.parts.PartFluidPatternTerminalEx; -import com.glodblock.github.common.tile.TileSuperStoker; +import com.glodblock.github.common.tile.TileSuperStockReplenisher; import com.glodblock.github.inventory.gui.GuiType; import com.glodblock.github.inventory.item.IWirelessTerminal; import com.glodblock.github.inventory.item.WirelessPatternTerminalInventory; @@ -77,9 +77,9 @@ public class GuiPatternValueAmount extends FCGuiAmount { } else if (target instanceof WirelessPatternTerminalInventory) { this.myIcon = ItemAndBlockHolder.WIRELESS_PATTERN_TERM.stack(); this.originalGui = GuiType.WIRELESS_FLUID_PATTERN_TERMINAL; - } else if (target instanceof TileSuperStoker) { - this.myIcon = ItemAndBlockHolder.SUPER_STOKER.stack(); - this.originalGui = GuiType.GUI_SUPER_STOKER; + } else if (target instanceof TileSuperStockReplenisher) { + this.myIcon = ItemAndBlockHolder.SUPER_STOCK_RERPLENISHER.stack(); + this.originalGui = GuiType.GUI_SUPER_STOCK_REPLENISHER; } } diff --git a/src/main/java/com/glodblock/github/client/gui/GuiSuperStoker.java b/src/main/java/com/glodblock/github/client/gui/GuiSuperStockReplenisher.java similarity index 89% rename from src/main/java/com/glodblock/github/client/gui/GuiSuperStoker.java rename to src/main/java/com/glodblock/github/client/gui/GuiSuperStockReplenisher.java index e50c4796..a67df7cc 100644 --- a/src/main/java/com/glodblock/github/client/gui/GuiSuperStoker.java +++ b/src/main/java/com/glodblock/github/client/gui/GuiSuperStockReplenisher.java @@ -11,9 +11,9 @@ import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; import com.glodblock.github.FluidCraft; -import com.glodblock.github.client.gui.container.ContainerSuperStoker; +import com.glodblock.github.client.gui.container.ContainerSuperStockReplenisher; import com.glodblock.github.common.item.ItemFluidPacket; -import com.glodblock.github.common.tile.TileSuperStoker; +import com.glodblock.github.common.tile.TileSuperStockReplenisher; import com.glodblock.github.network.CPacketInventoryAction; import appeng.api.storage.data.IAEItemStack; @@ -25,17 +25,17 @@ import appeng.core.localization.GuiText; import appeng.helpers.InventoryAction; import appeng.util.item.AEItemStack; -public class GuiSuperStoker extends AEBaseGui { +public class GuiSuperStockReplenisher extends AEBaseGui { - private static final ResourceLocation TEX_BG = FluidCraft.resource("textures/gui/superStoker.png"); - private final ContainerSuperStoker cont; - private final TileSuperStoker tile; + private static final ResourceLocation TEX_BG = FluidCraft.resource("textures/gui/superStockReplenisher.png"); + private final ContainerSuperStockReplenisher cont; + private final TileSuperStockReplenisher tile; private Map> list = new HashMap<>(); - public GuiSuperStoker(InventoryPlayer ipl, TileSuperStoker tile) { - super(new ContainerSuperStoker(ipl, tile)); + public GuiSuperStockReplenisher(InventoryPlayer ipl, TileSuperStockReplenisher tile) { + super(new ContainerSuperStockReplenisher(ipl, tile)); this.tile = tile; - this.cont = (ContainerSuperStoker) inventorySlots; + this.cont = (ContainerSuperStockReplenisher) inventorySlots; this.ySize = 251; this.xSize = 216; } diff --git a/src/main/java/com/glodblock/github/client/gui/container/ContainerSuperStoker.java b/src/main/java/com/glodblock/github/client/gui/container/ContainerSuperStockReplenisher.java similarity index 90% rename from src/main/java/com/glodblock/github/client/gui/container/ContainerSuperStoker.java rename to src/main/java/com/glodblock/github/client/gui/container/ContainerSuperStockReplenisher.java index 1702302e..b05dcd9d 100644 --- a/src/main/java/com/glodblock/github/client/gui/container/ContainerSuperStoker.java +++ b/src/main/java/com/glodblock/github/client/gui/container/ContainerSuperStockReplenisher.java @@ -13,9 +13,9 @@ import net.minecraft.item.ItemStack; import com.glodblock.github.FluidCraft; import com.glodblock.github.common.item.FCBaseItemCell; -import com.glodblock.github.common.tile.TileSuperStoker; +import com.glodblock.github.common.tile.TileSuperStockReplenisher; import com.glodblock.github.inventory.slot.OptionalFluidSlotFake; -import com.glodblock.github.network.SPacketSuperStokerUpdate; +import com.glodblock.github.network.SPacketSuperStockReplenisherUpdate; import appeng.api.storage.data.IAEStack; import appeng.container.AEBaseContainer; @@ -24,14 +24,14 @@ import appeng.container.slot.SlotPatternOutputs; import appeng.container.slot.SlotRestrictedInput; import appeng.items.storage.ItemBasicStorageCell; -public class ContainerSuperStoker extends AEBaseContainer implements IOptionalSlotHost { +public class ContainerSuperStockReplenisher extends AEBaseContainer implements IOptionalSlotHost { - private final TileSuperStoker tile; + private final TileSuperStockReplenisher tile; private final IInventory configFluids; private final IInventory configItems; private int lastUpdated = 0; - public ContainerSuperStoker(InventoryPlayer ipl, TileSuperStoker tile) { + public ContainerSuperStockReplenisher(InventoryPlayer ipl, TileSuperStockReplenisher tile) { super(ipl, tile); this.tile = tile; configFluids = tile.getConfigFluid(); @@ -101,7 +101,7 @@ public class ContainerSuperStoker extends AEBaseContainer implements IOptionalSl for (final Object g : this.crafters) { if (g instanceof EntityPlayer) { - FluidCraft.proxy.netHandler.sendTo(new SPacketSuperStokerUpdate(tmp), (EntityPlayerMP) g); + FluidCraft.proxy.netHandler.sendTo(new SPacketSuperStockReplenisherUpdate(tmp), (EntityPlayerMP) g); } } } @@ -147,7 +147,7 @@ public class ContainerSuperStoker extends AEBaseContainer implements IOptionalSl return super.isValidForSlot(s, is); } - public TileSuperStoker getTile() { + public TileSuperStockReplenisher getTile() { return tile; } } diff --git a/src/main/java/com/glodblock/github/common/block/BlockSuperStoker.java b/src/main/java/com/glodblock/github/common/block/BlockSuperStockReplenisher.java similarity index 69% rename from src/main/java/com/glodblock/github/common/block/BlockSuperStoker.java rename to src/main/java/com/glodblock/github/common/block/BlockSuperStockReplenisher.java index 6bdb6ea0..a93be5fc 100644 --- a/src/main/java/com/glodblock/github/common/block/BlockSuperStoker.java +++ b/src/main/java/com/glodblock/github/common/block/BlockSuperStockReplenisher.java @@ -7,7 +7,7 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import com.glodblock.github.common.tabs.FluidCraftingTabs; -import com.glodblock.github.common.tile.TileSuperStoker; +import com.glodblock.github.common.tile.TileSuperStockReplenisher; import com.glodblock.github.inventory.InventoryHandler; import com.glodblock.github.inventory.gui.GuiType; import com.glodblock.github.util.BlockPos; @@ -16,11 +16,11 @@ import com.glodblock.github.util.NameConst; import appeng.block.AEBaseItemBlock; import cpw.mods.fml.common.registry.GameRegistry; -public class BlockSuperStoker extends FCBaseBlock { +public class BlockSuperStockReplenisher extends FCBaseBlock { - public BlockSuperStoker() { - super(Material.web, NameConst.BLOCK_SUPER_STOKER); - setTileEntity(TileSuperStoker.class); + public BlockSuperStockReplenisher() { + super(Material.web, NameConst.BLOCK_SUPER_STOCK_REPLENISHER); + setTileEntity(TileSuperStockReplenisher.class); setOpaque(false); setFullBlock(false); this.lightOpacity = 4; @@ -32,7 +32,7 @@ public class BlockSuperStoker extends FCBaseBlock { if (player.isSneaking()) { return false; } - TileSuperStoker tile = getTileEntity(world, x, y, z); + TileSuperStockReplenisher tile = getTileEntity(world, x, y, z); if (tile != null) { if (!world.isRemote) { InventoryHandler.openGui( @@ -40,7 +40,7 @@ public class BlockSuperStoker extends FCBaseBlock { world, new BlockPos(x, y, z), ForgeDirection.getOrientation(facing), - GuiType.GUI_SUPER_STOKER); + GuiType.GUI_SUPER_STOCK_REPLENISHER); } return true; } @@ -49,7 +49,7 @@ public class BlockSuperStoker extends FCBaseBlock { @Override public void breakBlock(World w, int x, int y, int z, Block a, int b) { - final TileSuperStoker tss = this.getTileEntity(w, x, y, z); + final TileSuperStockReplenisher tss = this.getTileEntity(w, x, y, z); if (tss != null) { tss.fullRefund(); } @@ -57,9 +57,9 @@ public class BlockSuperStoker extends FCBaseBlock { } @Override - public BlockSuperStoker register() { - GameRegistry.registerBlock(this, AEBaseItemBlock.class, NameConst.BLOCK_SUPER_STOKER); - GameRegistry.registerTileEntity(TileSuperStoker.class, NameConst.BLOCK_SUPER_STOKER); + public BlockSuperStockReplenisher register() { + GameRegistry.registerBlock(this, AEBaseItemBlock.class, NameConst.BLOCK_SUPER_STOCK_REPLENISHER); + GameRegistry.registerTileEntity(TileSuperStockReplenisher.class, NameConst.BLOCK_SUPER_STOCK_REPLENISHER); setCreativeTab(FluidCraftingTabs.INSTANCE); return this; } diff --git a/src/main/java/com/glodblock/github/common/tile/TileSuperStoker.java b/src/main/java/com/glodblock/github/common/tile/TileSuperStockReplenisher.java similarity index 98% rename from src/main/java/com/glodblock/github/common/tile/TileSuperStoker.java rename to src/main/java/com/glodblock/github/common/tile/TileSuperStockReplenisher.java index 57187a5e..191e80cd 100644 --- a/src/main/java/com/glodblock/github/common/tile/TileSuperStoker.java +++ b/src/main/java/com/glodblock/github/common/tile/TileSuperStockReplenisher.java @@ -50,7 +50,7 @@ import appeng.tile.inventory.InvOperation; import appeng.util.item.AEFluidStack; import io.netty.buffer.ByteBuf; -public class TileSuperStoker extends AENetworkInvTile +public class TileSuperStockReplenisher extends AENetworkInvTile implements IAEFluidInventory, IFluidHandler, IPowerChannelState, IGridTickable { private final AppEngInternalInventory cell = new AppEngInternalInventory(this, 1); @@ -64,7 +64,7 @@ public class TileSuperStoker extends AENetworkInvTile private long storedFluidCount; private long storedItemCount; - public TileSuperStoker() { + public TileSuperStockReplenisher() { getProxy().setIdlePowerUsage(4D); getProxy().setFlags(GridFlags.REQUIRE_CHANNEL); this.source = new MachineSource(this); @@ -356,14 +356,14 @@ public class TileSuperStoker extends AENetworkInvTile } @TileEvent(TileEventType.NETWORK_READ) - public boolean readFromStream_TileSuperStoker(final ByteBuf data) { + public boolean readFromStream_TileSuperStockReplenisher(final ByteBuf data) { final boolean oldPower = isPowered; isPowered = data.readBoolean(); return isPowered != oldPower; } @TileEvent(TileEventType.NETWORK_WRITE) - public void writeToStream_TileSuperStoker(final ByteBuf data) { + public void writeToStream_TileSuperStockReplenisher(final ByteBuf data) { data.writeBoolean(isActive()); } diff --git a/src/main/java/com/glodblock/github/inventory/gui/GuiType.java b/src/main/java/com/glodblock/github/inventory/gui/GuiType.java index 61e4baca..efed73ef 100644 --- a/src/main/java/com/glodblock/github/inventory/gui/GuiType.java +++ b/src/main/java/com/glodblock/github/inventory/gui/GuiType.java @@ -39,7 +39,7 @@ import com.glodblock.github.client.gui.GuiPatternItemRenamer; import com.glodblock.github.client.gui.GuiPatternMulti; import com.glodblock.github.client.gui.GuiPatternValueAmount; import com.glodblock.github.client.gui.GuiRenamer; -import com.glodblock.github.client.gui.GuiSuperStoker; +import com.glodblock.github.client.gui.GuiSuperStockReplenisher; import com.glodblock.github.client.gui.container.ContainerCraftingWireless; import com.glodblock.github.client.gui.container.ContainerDualInterface; import com.glodblock.github.client.gui.container.ContainerEssentiaMonitor; @@ -68,7 +68,7 @@ import com.glodblock.github.client.gui.container.ContainerOCPatternEditor; import com.glodblock.github.client.gui.container.ContainerPatternMulti; import com.glodblock.github.client.gui.container.ContainerPatternValueAmount; import com.glodblock.github.client.gui.container.ContainerRenamer; -import com.glodblock.github.client.gui.container.ContainerSuperStoker; +import com.glodblock.github.client.gui.container.ContainerSuperStockReplenisher; import com.glodblock.github.common.parts.PartFluidLevelEmitter; import com.glodblock.github.common.parts.PartFluidStorageBus; import com.glodblock.github.common.parts.base.FCPart; @@ -80,7 +80,7 @@ import com.glodblock.github.common.tile.TileIngredientBuffer; import com.glodblock.github.common.tile.TileLargeIngredientBuffer; import com.glodblock.github.common.tile.TileLevelMaintainer; import com.glodblock.github.common.tile.TileOCPatternEditor; -import com.glodblock.github.common.tile.TileSuperStoker; +import com.glodblock.github.common.tile.TileSuperStockReplenisher; import com.glodblock.github.inventory.IDualHost; import com.glodblock.github.inventory.item.IFluidPortableCell; import com.glodblock.github.inventory.item.IWirelessTerminal; @@ -560,16 +560,16 @@ public enum GuiType { } }), - GUI_SUPER_STOKER(new TileGuiFactory<>(TileSuperStoker.class) { + GUI_SUPER_STOCK_REPLENISHER(new TileGuiFactory<>(TileSuperStockReplenisher.class) { @Override - protected Object createServerGui(EntityPlayer player, TileSuperStoker inv) { - return new ContainerSuperStoker(player.inventory, inv); + protected Object createServerGui(EntityPlayer player, TileSuperStockReplenisher inv) { + return new ContainerSuperStockReplenisher(player.inventory, inv); } @Override - protected Object createClientGui(EntityPlayer player, TileSuperStoker inv) { - return new GuiSuperStoker(player.inventory, inv); + protected Object createClientGui(EntityPlayer player, TileSuperStockReplenisher inv) { + return new GuiSuperStockReplenisher(player.inventory, inv); } }); diff --git a/src/main/java/com/glodblock/github/loader/ChannelLoader.java b/src/main/java/com/glodblock/github/loader/ChannelLoader.java index 3dda0137..b2d02c66 100644 --- a/src/main/java/com/glodblock/github/loader/ChannelLoader.java +++ b/src/main/java/com/glodblock/github/loader/ChannelLoader.java @@ -26,7 +26,7 @@ import com.glodblock.github.network.SPacketMEItemInvUpdate; import com.glodblock.github.network.SPacketPatternItemRenamer; import com.glodblock.github.network.SPacketSetItemAmount; import com.glodblock.github.network.SPacketStringUpdate; -import com.glodblock.github.network.SPacketSuperStokerUpdate; +import com.glodblock.github.network.SPacketSuperStockReplenisherUpdate; import com.glodblock.github.network.SPacketSwitchBack; import com.glodblock.github.network.wrapper.FCNetworkWrapper; @@ -62,8 +62,8 @@ public class ChannelLoader implements Runnable { netHandler.registerMessage(new CPacketDumpTank.Handler(), CPacketDumpTank.class, id++, Side.SERVER); netHandler.registerMessage(new SPacketFluidUpdate.Handler(), SPacketFluidUpdate.class, id++, Side.CLIENT); netHandler.registerMessage( - new SPacketSuperStokerUpdate.Handler(), - SPacketSuperStokerUpdate.class, + new SPacketSuperStockReplenisherUpdate.Handler(), + SPacketSuperStockReplenisherUpdate.class, id++, Side.CLIENT); netHandler diff --git a/src/main/java/com/glodblock/github/loader/ItemAndBlockHolder.java b/src/main/java/com/glodblock/github/loader/ItemAndBlockHolder.java index 0f728b9e..98c9054f 100644 --- a/src/main/java/com/glodblock/github/loader/ItemAndBlockHolder.java +++ b/src/main/java/com/glodblock/github/loader/ItemAndBlockHolder.java @@ -14,7 +14,7 @@ import com.glodblock.github.common.block.BlockIngredientBuffer; import com.glodblock.github.common.block.BlockLargeIngredientBuffer; import com.glodblock.github.common.block.BlockLevelMaintainer; import com.glodblock.github.common.block.BlockOCPatternEditor; -import com.glodblock.github.common.block.BlockSuperStoker; +import com.glodblock.github.common.block.BlockSuperStockReplenisher; import com.glodblock.github.common.block.BlockWalrus; import com.glodblock.github.common.item.ItemBasicFluidStorageCell; import com.glodblock.github.common.item.ItemBasicFluidStoragePart; @@ -66,7 +66,7 @@ public class ItemAndBlockHolder { public static BlockLargeIngredientBuffer LARGE_BUFFER = new BlockLargeIngredientBuffer().register(); public static BlockOCPatternEditor OC_EDITOR = new BlockOCPatternEditor().register(); public static BlockWalrus WALRUS = new BlockWalrus().register(); - public static BlockSuperStoker SUPER_STOKER = new BlockSuperStoker().register(); + public static BlockSuperStockReplenisher SUPER_STOCK_RERPLENISHER = new BlockSuperStockReplenisher().register(); public static ItemFluidDrop DROP = new ItemFluidDrop().register(); public static ItemFluidEncodedPattern PATTERN = new ItemFluidEncodedPattern().register(); public static ItemPartFluidTerminal FLUID_TERM = new ItemPartFluidTerminal().register(); diff --git a/src/main/java/com/glodblock/github/network/CPacketPatternValueSet.java b/src/main/java/com/glodblock/github/network/CPacketPatternValueSet.java index 2a95038b..e17557a9 100644 --- a/src/main/java/com/glodblock/github/network/CPacketPatternValueSet.java +++ b/src/main/java/com/glodblock/github/network/CPacketPatternValueSet.java @@ -9,7 +9,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraftforge.fluids.FluidStack; import com.glodblock.github.client.gui.container.ContainerPatternValueAmount; -import com.glodblock.github.client.gui.container.ContainerSuperStoker; +import com.glodblock.github.client.gui.container.ContainerSuperStockReplenisher; import com.glodblock.github.client.gui.container.base.FCContainerEncodeTerminal; import com.glodblock.github.common.item.ItemFluidPacket; import com.glodblock.github.inventory.InventoryHandler; @@ -94,7 +94,7 @@ public class CPacketPatternValueSet implements IMessage { message.originGui); } if (player.openContainer instanceof FCContainerEncodeTerminal - || player.openContainer instanceof ContainerSuperStoker) { + || player.openContainer instanceof ContainerSuperStockReplenisher) { Slot slot = player.openContainer.getSlot(message.valueIndex); if (slot instanceof SlotFake) { ItemStack stack = slot.getStack().copy(); diff --git a/src/main/java/com/glodblock/github/network/SPacketSuperStokerUpdate.java b/src/main/java/com/glodblock/github/network/SPacketSuperStockReplenisherUpdate.java similarity index 73% rename from src/main/java/com/glodblock/github/network/SPacketSuperStokerUpdate.java rename to src/main/java/com/glodblock/github/network/SPacketSuperStockReplenisherUpdate.java index 9bbf01f8..e039fb70 100644 --- a/src/main/java/com/glodblock/github/network/SPacketSuperStokerUpdate.java +++ b/src/main/java/com/glodblock/github/network/SPacketSuperStockReplenisherUpdate.java @@ -7,7 +7,7 @@ import java.util.Map; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; -import com.glodblock.github.client.gui.GuiSuperStoker; +import com.glodblock.github.client.gui.GuiSuperStockReplenisher; import com.glodblock.github.util.Util; import appeng.api.storage.data.IAEStack; @@ -16,13 +16,13 @@ import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import io.netty.buffer.ByteBuf; -public class SPacketSuperStokerUpdate implements IMessage { +public class SPacketSuperStockReplenisherUpdate implements IMessage { private Map> list; - public SPacketSuperStokerUpdate() {} + public SPacketSuperStockReplenisherUpdate() {} - public SPacketSuperStokerUpdate(Map> data) { + public SPacketSuperStockReplenisherUpdate(Map> data) { this.list = data; } @@ -45,12 +45,12 @@ public class SPacketSuperStokerUpdate implements IMessage { } } - public static class Handler implements IMessageHandler { + public static class Handler implements IMessageHandler { @Override - public IMessage onMessage(SPacketSuperStokerUpdate message, MessageContext ctx) { + public IMessage onMessage(SPacketSuperStockReplenisherUpdate message, MessageContext ctx) { final GuiScreen gs = Minecraft.getMinecraft().currentScreen; - if (gs instanceof GuiSuperStoker gss) { + if (gs instanceof GuiSuperStockReplenisher gss) { gss.update(message.list); } return null; diff --git a/src/main/java/com/glodblock/github/util/NameConst.java b/src/main/java/com/glodblock/github/util/NameConst.java index 2152a5d8..422b59bf 100644 --- a/src/main/java/com/glodblock/github/util/NameConst.java +++ b/src/main/java/com/glodblock/github/util/NameConst.java @@ -21,7 +21,7 @@ public class NameConst { public static final String BLOCK_OC_PATTERN_EDITOR = "oc_pattern_editor"; public static final String BLOCK_LEVEL_MAINTAINER = "level_maintainer"; public static final String BLOCK_WALRUS = "walrus"; - public static final String BLOCK_SUPER_STOKER = "super_stoker"; + public static final String BLOCK_SUPER_STOCK_REPLENISHER = "super_stock_replenisher"; public static final String ITEM_FLUID_DROP = "fluid_drop"; public static final String ITEM_FLUID_ENCODED_PATTERN = "fluid_encoded_pattern"; public static final String ITEM_PART_FLUID_STORAGE_MONITOR = "part_fluid_storage_monitor"; diff --git a/src/main/resources/assets/ae2fc/lang/en_US.lang b/src/main/resources/assets/ae2fc/lang/en_US.lang index 1bf918fe..80aec562 100644 --- a/src/main/resources/assets/ae2fc/lang/en_US.lang +++ b/src/main/resources/assets/ae2fc/lang/en_US.lang @@ -75,7 +75,7 @@ tile.oc_pattern_editor.name=OC Pattern Editor tile.level_maintainer.name=ME Level Maintainer tile.fluid_buffer.name=ME Fluid Buffer tile.walrus.name=Walrus -tile.super_stoker.name=Super Stoker +tile.super_stock_replenisher.name=Super Stock Replenisher tile.fluid_auto_filler.name=ME Fluid Auto Filler tile.certus_quartz_tank.name=Certus Quartz Tank - %s tile.certus_quartz_tank_empty.name=Certus Quartz Tank diff --git a/src/main/resources/assets/ae2fc/textures/blocks/super_stoker.png b/src/main/resources/assets/ae2fc/textures/blocks/super_stock_replenisher.png similarity index 100% rename from src/main/resources/assets/ae2fc/textures/blocks/super_stoker.png rename to src/main/resources/assets/ae2fc/textures/blocks/super_stock_replenisher.png diff --git a/src/main/resources/assets/ae2fc/textures/gui/superStoker.png b/src/main/resources/assets/ae2fc/textures/gui/superStockReplenisher.png similarity index 100% rename from src/main/resources/assets/ae2fc/textures/gui/superStoker.png rename to src/main/resources/assets/ae2fc/textures/gui/superStockReplenisher.png