From 726c09d18569e2045e7ec67b19ec0187b257705f Mon Sep 17 00:00:00 2001 From: lc-1337 Date: Fri, 8 May 2026 19:34:24 +0300 Subject: [PATCH 1/4] remove --- .../item/ItemFluidConversionMonitor.java | 58 --------------- .../common/item/ItemFluidStorageMonitor.java | 58 --------------- .../item/ItemPartFluidPatternTerminal.java | 64 ----------------- .../item/ItemPartFluidPatternTerminalEx.java | 64 ----------------- .../common/item/ItemPartFluidTerminal.java | 72 ------------------- .../item/ItemWirelessFluidTerminal.java | 48 ------------- .../github/loader/ItemAndBlockHolder.java | 12 ---- .../glodblock/github/loader/RecipeLoader.java | 31 -------- 8 files changed, 407 deletions(-) delete mode 100644 src/main/java/com/glodblock/github/common/item/ItemFluidConversionMonitor.java delete mode 100644 src/main/java/com/glodblock/github/common/item/ItemFluidStorageMonitor.java delete mode 100644 src/main/java/com/glodblock/github/common/item/ItemPartFluidPatternTerminal.java delete mode 100644 src/main/java/com/glodblock/github/common/item/ItemPartFluidPatternTerminalEx.java delete mode 100644 src/main/java/com/glodblock/github/common/item/ItemPartFluidTerminal.java delete mode 100644 src/main/java/com/glodblock/github/common/item/ItemWirelessFluidTerminal.java diff --git a/src/main/java/com/glodblock/github/common/item/ItemFluidConversionMonitor.java b/src/main/java/com/glodblock/github/common/item/ItemFluidConversionMonitor.java deleted file mode 100644 index f9d24db06..000000000 --- a/src/main/java/com/glodblock/github/common/item/ItemFluidConversionMonitor.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.glodblock.github.common.item; - -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; -import net.minecraft.world.World; - -import com.glodblock.github.FluidCraft; -import com.glodblock.github.client.textures.FCPartsTexture; -import com.glodblock.github.common.parts.PartFluidConversionMonitor; -import com.glodblock.github.common.tabs.FluidCraftingTabs; -import com.glodblock.github.util.NameConst; - -import appeng.api.AEApi; -import appeng.api.parts.IPartItem; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -public class ItemFluidConversionMonitor extends FCBaseItem implements IPartItem { - - public ItemFluidConversionMonitor() { - this.setMaxStackSize(64); - this.setUnlocalizedName(NameConst.ITEM_PART_FLUID_CONVERSION_MONITOR); - AEApi.instance().partHelper().setItemBusRenderer(this); - } - - @Override - public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, - float xOffset, float yOffset, float zOffset) { - return AEApi.instance().partHelper().placeBus(stack, x, y, z, side, player, world); - } - - @Override - public ItemFluidConversionMonitor register() { - GameRegistry.registerItem(this, NameConst.ITEM_PART_FLUID_CONVERSION_MONITOR, FluidCraft.MODID); - setCreativeTab(FluidCraftingTabs.INSTANCE); - return this; - } - - @Override - public IIcon getIconIndex(ItemStack p_77650_1_) { - return FCPartsTexture.PartTerminalBroad.getIcon(); - } - - public void registerIcons(IIconRegister _iconRegister) {} - - @SideOnly(Side.CLIENT) - public int getSpriteNumber() { - return 0; - } - - @Override - public PartFluidConversionMonitor createPartFromItemStack(ItemStack is) { - return new PartFluidConversionMonitor(is); - } -} diff --git a/src/main/java/com/glodblock/github/common/item/ItemFluidStorageMonitor.java b/src/main/java/com/glodblock/github/common/item/ItemFluidStorageMonitor.java deleted file mode 100644 index da7ced436..000000000 --- a/src/main/java/com/glodblock/github/common/item/ItemFluidStorageMonitor.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.glodblock.github.common.item; - -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; -import net.minecraft.world.World; - -import com.glodblock.github.FluidCraft; -import com.glodblock.github.client.textures.FCPartsTexture; -import com.glodblock.github.common.parts.PartFluidStorageMonitor; -import com.glodblock.github.common.tabs.FluidCraftingTabs; -import com.glodblock.github.util.NameConst; - -import appeng.api.AEApi; -import appeng.api.parts.IPartItem; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -public class ItemFluidStorageMonitor extends FCBaseItem implements IPartItem { - - public ItemFluidStorageMonitor() { - this.setMaxStackSize(64); - this.setUnlocalizedName(NameConst.ITEM_PART_FLUID_STORAGE_MONITOR); - AEApi.instance().partHelper().setItemBusRenderer(this); - } - - @Override - public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, - float xOffset, float yOffset, float zOffset) { - return AEApi.instance().partHelper().placeBus(stack, x, y, z, side, player, world); - } - - @Override - public ItemFluidStorageMonitor register() { - GameRegistry.registerItem(this, NameConst.ITEM_PART_FLUID_STORAGE_MONITOR, FluidCraft.MODID); - setCreativeTab(FluidCraftingTabs.INSTANCE); - return this; - } - - @Override - public IIcon getIconIndex(ItemStack p_77650_1_) { - return FCPartsTexture.PartTerminalBroad.getIcon(); - } - - public void registerIcons(IIconRegister _iconRegister) {} - - @SideOnly(Side.CLIENT) - public int getSpriteNumber() { - return 0; - } - - @Override - public PartFluidStorageMonitor createPartFromItemStack(ItemStack is) { - return new PartFluidStorageMonitor(is); - } -} diff --git a/src/main/java/com/glodblock/github/common/item/ItemPartFluidPatternTerminal.java b/src/main/java/com/glodblock/github/common/item/ItemPartFluidPatternTerminal.java deleted file mode 100644 index 282865989..000000000 --- a/src/main/java/com/glodblock/github/common/item/ItemPartFluidPatternTerminal.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.glodblock.github.common.item; - -import java.util.List; - -import javax.annotation.Nullable; - -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; - -import com.glodblock.github.FluidCraft; -import com.glodblock.github.common.parts.PartFluidPatternTerminal; -import com.glodblock.github.common.tabs.FluidCraftingTabs; -import com.glodblock.github.util.NameConst; - -import appeng.api.AEApi; -import appeng.api.parts.IPartItem; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -public class ItemPartFluidPatternTerminal extends FCBaseItem implements IPartItem { - - public ItemPartFluidPatternTerminal() { - this.setMaxStackSize(64); - this.setUnlocalizedName(NameConst.ITEM_PART_FLUID_PATTERN_TERMINAL); - AEApi.instance().partHelper().setItemBusRenderer(this); - } - - @Nullable - @Override - public PartFluidPatternTerminal createPartFromItemStack(ItemStack is) { - return new PartFluidPatternTerminal(is); - } - - @Override - public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, - float xOffset, float yOffset, float zOffset) { - return AEApi.instance().partHelper().placeBus(stack, x, y, z, side, player, world); - } - - @Override - public ItemPartFluidPatternTerminal register() { - GameRegistry.registerItem(this, NameConst.ITEM_PART_FLUID_PATTERN_TERMINAL, FluidCraft.MODID); - setCreativeTab(FluidCraftingTabs.INSTANCE); - return this; - } - - @Override - public void registerIcons(IIconRegister _iconRegister) {} - - @Override - @SideOnly(Side.CLIENT) - public int getSpriteNumber() { - return 0; - } - - @Override - @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, EntityPlayer player, List toolTip, boolean flag) { - toolTip.add("§4DEPRECATED!"); - } -} diff --git a/src/main/java/com/glodblock/github/common/item/ItemPartFluidPatternTerminalEx.java b/src/main/java/com/glodblock/github/common/item/ItemPartFluidPatternTerminalEx.java deleted file mode 100644 index 69054e86b..000000000 --- a/src/main/java/com/glodblock/github/common/item/ItemPartFluidPatternTerminalEx.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.glodblock.github.common.item; - -import java.util.List; - -import javax.annotation.Nullable; - -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; - -import com.glodblock.github.FluidCraft; -import com.glodblock.github.common.parts.PartFluidPatternTerminalEx; -import com.glodblock.github.common.tabs.FluidCraftingTabs; -import com.glodblock.github.util.NameConst; - -import appeng.api.AEApi; -import appeng.api.parts.IPartItem; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -public class ItemPartFluidPatternTerminalEx extends FCBaseItem implements IPartItem { - - public ItemPartFluidPatternTerminalEx() { - this.setMaxStackSize(64); - this.setUnlocalizedName(NameConst.ITEM_PART_FLUID_PATTERN_TERMINAL_EX); - AEApi.instance().partHelper().setItemBusRenderer(this); - } - - @Nullable - @Override - public PartFluidPatternTerminalEx createPartFromItemStack(ItemStack is) { - return new PartFluidPatternTerminalEx(is); - } - - @Override - public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, - float xOffset, float yOffset, float zOffset) { - return AEApi.instance().partHelper().placeBus(stack, x, y, z, side, player, world); - } - - @Override - public ItemPartFluidPatternTerminalEx register() { - GameRegistry.registerItem(this, NameConst.ITEM_PART_FLUID_PATTERN_TERMINAL_EX, FluidCraft.MODID); - setCreativeTab(FluidCraftingTabs.INSTANCE); - return this; - } - - @Override - public void registerIcons(IIconRegister _iconRegister) {} - - @Override - @SideOnly(Side.CLIENT) - public int getSpriteNumber() { - return 0; - } - - @Override - @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, EntityPlayer player, List toolTip, boolean flag) { - toolTip.add("§4DEPRECATED!"); - } -} diff --git a/src/main/java/com/glodblock/github/common/item/ItemPartFluidTerminal.java b/src/main/java/com/glodblock/github/common/item/ItemPartFluidTerminal.java deleted file mode 100644 index 5e31ef3e1..000000000 --- a/src/main/java/com/glodblock/github/common/item/ItemPartFluidTerminal.java +++ /dev/null @@ -1,72 +0,0 @@ -package com.glodblock.github.common.item; - -import static net.minecraft.client.gui.GuiScreen.isShiftKeyDown; - -import java.util.List; - -import javax.annotation.Nullable; - -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; - -import com.glodblock.github.FluidCraft; -import com.glodblock.github.common.parts.PartFluidTerminal; -import com.glodblock.github.common.tabs.FluidCraftingTabs; -import com.glodblock.github.util.NameConst; - -import appeng.api.AEApi; -import appeng.api.parts.IPartItem; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -public class ItemPartFluidTerminal extends FCBaseItem implements IPartItem { - - public ItemPartFluidTerminal() { - this.setMaxStackSize(64); - this.setUnlocalizedName(NameConst.ITEM_PART_FLUID_TERMINAL); - AEApi.instance().partHelper().setItemBusRenderer(this); - } - - @Nullable - @Override - public PartFluidTerminal createPartFromItemStack(ItemStack is) { - return new PartFluidTerminal(is); - } - - @Override - public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, - float xOffset, float yOffset, float zOffset) { - return AEApi.instance().partHelper().placeBus(stack, x, y, z, side, player, world); - } - - @Override - @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, EntityPlayer player, List toolTip, boolean flag) { - toolTip.add("§4DEPRECATED!"); - if (isShiftKeyDown()) { - toolTip.add(NameConst.i18n(NameConst.TT_FLUID_TERMINAL)); - } else { - toolTip.add(NameConst.i18n(NameConst.TT_SHIFT_FOR_MORE)); - } - } - - @Override - public ItemPartFluidTerminal register() { - GameRegistry.registerItem(this, NameConst.ITEM_PART_FLUID_TERMINAL, FluidCraft.MODID); - setCreativeTab(FluidCraftingTabs.INSTANCE); - return this; - } - - @Override - public void registerIcons(IIconRegister _iconRegister) {} - - @Override - @SideOnly(Side.CLIENT) - public int getSpriteNumber() { - return 0; - } - -} diff --git a/src/main/java/com/glodblock/github/common/item/ItemWirelessFluidTerminal.java b/src/main/java/com/glodblock/github/common/item/ItemWirelessFluidTerminal.java deleted file mode 100644 index d2ca25c0a..000000000 --- a/src/main/java/com/glodblock/github/common/item/ItemWirelessFluidTerminal.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.glodblock.github.common.item; - -import java.util.EnumSet; -import java.util.List; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; - -import com.glodblock.github.FluidCraft; -import com.glodblock.github.common.tabs.FluidCraftingTabs; -import com.glodblock.github.loader.IRegister; -import com.glodblock.github.util.NameConst; - -import appeng.api.AEApi; -import appeng.core.features.AEFeature; -import cpw.mods.fml.common.registry.GameRegistry; - -public class ItemWirelessFluidTerminal extends ItemBaseWirelessTerminal - implements IRegister { - - public ItemWirelessFluidTerminal() { - super(null); - AEApi.instance().registries().wireless().registerWirelessHandler(this); - this.setFeature(EnumSet.of(AEFeature.WirelessAccessTerminal, AEFeature.PoweredTools)); - setUnlocalizedName(NameConst.ITEM_WIRELESS_FLUID_TERMINAL); - setTextureName(FluidCraft.resource(NameConst.ITEM_WIRELESS_FLUID_TERMINAL).toString()); - } - - @Override - public ItemWirelessFluidTerminal register() { - GameRegistry.registerItem(this, NameConst.ITEM_WIRELESS_FLUID_TERMINAL, FluidCraft.MODID); - setCreativeTab(FluidCraftingTabs.INSTANCE); - return this; - } - - @Override - public Object getInventory(ItemStack stack, World world, int x, int y, int z, EntityPlayer player) { - return null; - } - - @Override - public void addCheckedInformation(ItemStack stack, EntityPlayer player, List lines, - boolean displayMoreInfo) { - lines.add("§4DEPRECATED!"); - super.addCheckedInformation(stack, player, lines, displayMoreInfo); - } -} diff --git a/src/main/java/com/glodblock/github/loader/ItemAndBlockHolder.java b/src/main/java/com/glodblock/github/loader/ItemAndBlockHolder.java index ec153e028..5d3950cc6 100644 --- a/src/main/java/com/glodblock/github/loader/ItemAndBlockHolder.java +++ b/src/main/java/com/glodblock/github/loader/ItemAndBlockHolder.java @@ -18,7 +18,6 @@ import com.glodblock.github.common.item.ItemCreativeFluidStorageCell; import com.glodblock.github.common.item.ItemEnergyCard; import com.glodblock.github.common.item.ItemFluidAnnihilationPlane; -import com.glodblock.github.common.item.ItemFluidConversionMonitor; import com.glodblock.github.common.item.ItemFluidDrop; import com.glodblock.github.common.item.ItemFluidEncodedPattern; import com.glodblock.github.common.item.ItemFluidExportBus; @@ -28,20 +27,15 @@ import com.glodblock.github.common.item.ItemFluidLevelEmitter; import com.glodblock.github.common.item.ItemFluidPacket; import com.glodblock.github.common.item.ItemFluidStorageHousing; -import com.glodblock.github.common.item.ItemFluidStorageMonitor; import com.glodblock.github.common.item.ItemFluidVoidStorageCell; import com.glodblock.github.common.item.ItemInfinityWaterStorageCell; import com.glodblock.github.common.item.ItemMultiFluidStorageCell; import com.glodblock.github.common.item.ItemPartFluidInterface; import com.glodblock.github.common.item.ItemPartFluidP2PInterface; -import com.glodblock.github.common.item.ItemPartFluidPatternTerminal; -import com.glodblock.github.common.item.ItemPartFluidPatternTerminalEx; import com.glodblock.github.common.item.ItemPartFluidStorageBus; -import com.glodblock.github.common.item.ItemPartFluidTerminal; import com.glodblock.github.common.item.ItemPartLevelTerminal; import com.glodblock.github.common.item.ItemPortableFluidCell; import com.glodblock.github.common.item.ItemQuantumBridgeCard; -import com.glodblock.github.common.item.ItemWirelessFluidTerminal; import com.glodblock.github.common.item.ItemWirelessInterfaceTerminal; import com.glodblock.github.common.item.ItemWirelessLevelTerminal; import com.glodblock.github.common.item.ItemWirelessPatternTerminal; @@ -67,9 +61,6 @@ public static void init() {} 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(); - public static ItemPartFluidPatternTerminal FLUID_TERMINAL = new ItemPartFluidPatternTerminal().register(); - public static ItemPartFluidPatternTerminalEx FLUID_TERMINAL_EX = new ItemPartFluidPatternTerminalEx().register(); public static ItemPartFluidInterface FLUID_INTERFACE = new ItemPartFluidInterface().register(); public static ItemPartFluidP2PInterface FLUID_INTERFACE_P2P = new ItemPartFluidP2PInterface().register(); public static ItemPartLevelTerminal LEVEL_TERMINAL = new ItemPartLevelTerminal().register(); @@ -77,10 +68,7 @@ public static void init() {} public static ItemFluidExportBus FLUID_EXPORT_BUS = new ItemFluidExportBus().register(); public static ItemPartFluidStorageBus FLUID_STORAGE_BUS = new ItemPartFluidStorageBus().register(); public static ItemFluidLevelEmitter FLUID_LEVEL_EMITTER = new ItemFluidLevelEmitter().register(); - public static ItemFluidStorageMonitor FLUID_STORAGE_MONITOR = new ItemFluidStorageMonitor().register(); - public static ItemFluidConversionMonitor FLUID_CONVERSION_MONITOR = new ItemFluidConversionMonitor().register(); public static ItemPortableFluidCell PORTABLE_FLUID_CELL = new ItemPortableFluidCell().register(); - public static ItemWirelessFluidTerminal WIRELESS_FLUID_TERM = new ItemWirelessFluidTerminal().register(); public static ItemWirelessLevelTerminal WIRELESS_LEVEL_TERM = new ItemWirelessLevelTerminal().register(); public static ItemWirelessPatternTerminal WIRELESS_PATTERN_TERM = new ItemWirelessPatternTerminal().register(); public static ItemWirelessUltraTerminal WIRELESS_ULTRA_TERM = new ItemWirelessUltraTerminal().register(); diff --git a/src/main/java/com/glodblock/github/loader/RecipeLoader.java b/src/main/java/com/glodblock/github/loader/RecipeLoader.java index 7b4c2715c..028fb4d72 100644 --- a/src/main/java/com/glodblock/github/loader/RecipeLoader.java +++ b/src/main/java/com/glodblock/github/loader/RecipeLoader.java @@ -26,17 +26,12 @@ import static com.glodblock.github.loader.ItemAndBlockHolder.ENERGY_CARD; import static com.glodblock.github.loader.ItemAndBlockHolder.FLUID_AUTO_FILLER; import static com.glodblock.github.loader.ItemAndBlockHolder.FLUID_BUFFER; -import static com.glodblock.github.loader.ItemAndBlockHolder.FLUID_CONVERSION_MONITOR; import static com.glodblock.github.loader.ItemAndBlockHolder.FLUID_EXPORT_BUS; import static com.glodblock.github.loader.ItemAndBlockHolder.FLUID_IMPORT_BUS; import static com.glodblock.github.loader.ItemAndBlockHolder.FLUID_INTERFACE; import static com.glodblock.github.loader.ItemAndBlockHolder.FLUID_INTERFACE_P2P; import static com.glodblock.github.loader.ItemAndBlockHolder.FLUID_LEVEL_EMITTER; import static com.glodblock.github.loader.ItemAndBlockHolder.FLUID_STORAGE_BUS; -import static com.glodblock.github.loader.ItemAndBlockHolder.FLUID_STORAGE_MONITOR; -import static com.glodblock.github.loader.ItemAndBlockHolder.FLUID_TERM; -import static com.glodblock.github.loader.ItemAndBlockHolder.FLUID_TERMINAL; -import static com.glodblock.github.loader.ItemAndBlockHolder.FLUID_TERMINAL_EX; import static com.glodblock.github.loader.ItemAndBlockHolder.FLUID_VOID_CELL; import static com.glodblock.github.loader.ItemAndBlockHolder.INFINITY_WATER_CELL; import static com.glodblock.github.loader.ItemAndBlockHolder.INTERFACE; @@ -50,7 +45,6 @@ import static com.glodblock.github.loader.ItemAndBlockHolder.QUANTUM_CELL; import static com.glodblock.github.loader.ItemAndBlockHolder.SINGULARITY_CELL; import static com.glodblock.github.loader.ItemAndBlockHolder.WALRUS; -import static com.glodblock.github.loader.ItemAndBlockHolder.WIRELESS_FLUID_TERM; import static com.glodblock.github.loader.ItemAndBlockHolder.WIRELESS_INTERFACE_TERM; import static com.glodblock.github.loader.ItemAndBlockHolder.WIRELESS_LEVEL_TERM; import static com.glodblock.github.loader.ItemAndBlockHolder.WIRELESS_PATTERN_TERM; @@ -279,27 +273,6 @@ public void run() { AE2_WORK_BENCH)); GameRegistry.addShapelessRecipe(FLUID_STORAGE_BUS.stack(), FLUID_INTERFACE, STICKY_PISTON, PISTON); GameRegistry.addShapelessRecipe(FLUID_STORAGE_BUS.stack(), INTERFACE, STICKY_PISTON, PISTON); - GameRegistry.addRecipe( - new ShapedOreRecipe( - FLUID_STORAGE_MONITOR.stack(), - "EIP", - "P ", - 'I', - "itemIlluminatedPanel", - 'E', - AE2_LEVEL_EMITTER, - 'P', - "dyeBlue")); - GameRegistry.addRecipe( - new ShapedOreRecipe( - FLUID_CONVERSION_MONITOR.stack(), - "ASF", - 'A', - AE2_CORE_ANN, - 'S', - FLUID_STORAGE_MONITOR, - 'F', - AE2_CORE_FOM)); GameRegistry.addRecipe( new ShapedOreRecipe( BUFFER.stack(), @@ -342,11 +315,7 @@ public void run() { .addShapelessRecipe(LEVEL_MAINTAINER.stack(), AE2_CRAFTING_CP_UNIT, ENCODER, AE2_PATTERN_CAPACITY_CARD); // Deprecated - GameRegistry.addShapelessRecipe(AE2_TERMINAL, FLUID_TERM.stack()); - GameRegistry.addShapelessRecipe(AE2_WIRELESS_TERMINAL, WIRELESS_FLUID_TERM.stack()); GameRegistry.addShapelessRecipe(AE2_LEVEL_EMITTER, FLUID_LEVEL_EMITTER.stack()); - GameRegistry.addShapelessRecipe(AE2_PATTERN_TERM, FLUID_TERMINAL.stack()); - GameRegistry.addShapelessRecipe(AE2_PATTERN_TERM_EX, FLUID_TERMINAL_EX.stack()); if (Config.fluidCells) { OreDictionary.registerOre("anyCertusCrystal", AE2_PURE_CERTUS); From e704c5d72a00660775db7e3fcc741f154ad1853b Mon Sep 17 00:00:00 2001 From: lc-1337 Date: Fri, 8 May 2026 22:20:52 +0300 Subject: [PATCH 2/4] Clean up --- .../client/textures/FCPartsTexture.java | 9 +--- .../common/item/ItemFluidLevelEmitter.java | 20 ++----- .../common/parts/PartFluidTerminal.java | 49 ------------------ .../com/glodblock/github/util/NameConst.java | 7 --- .../resources/assets/ae2fc/lang/en_US.lang | 20 ------- .../textures/blocks/fluid_level_emitter.png | Bin 232 -> 0 bytes .../textures/blocks/fluid_terminal_bright.png | Bin 229 -> 0 bytes .../textures/blocks/fluid_terminal_dark.png | Bin 198 -> 0 bytes .../textures/blocks/fluid_terminal_medium.png | Bin 250 -> 0 bytes .../blocks/pattern_terminal_bright.png | Bin 1452 -> 0 bytes .../textures/blocks/pattern_terminal_dark.png | Bin 1416 -> 0 bytes .../blocks/pattern_terminal_medium.png | Bin 1467 -> 0 bytes .../items/wireless_fluid_terminal.png | Bin 335 -> 0 bytes 13 files changed, 4 insertions(+), 101 deletions(-) delete mode 100644 src/main/java/com/glodblock/github/common/parts/PartFluidTerminal.java delete mode 100644 src/main/resources/assets/ae2fc/textures/blocks/fluid_level_emitter.png delete mode 100644 src/main/resources/assets/ae2fc/textures/blocks/fluid_terminal_bright.png delete mode 100644 src/main/resources/assets/ae2fc/textures/blocks/fluid_terminal_dark.png delete mode 100644 src/main/resources/assets/ae2fc/textures/blocks/fluid_terminal_medium.png delete mode 100644 src/main/resources/assets/ae2fc/textures/blocks/pattern_terminal_bright.png delete mode 100644 src/main/resources/assets/ae2fc/textures/blocks/pattern_terminal_dark.png delete mode 100644 src/main/resources/assets/ae2fc/textures/blocks/pattern_terminal_medium.png delete mode 100644 src/main/resources/assets/ae2fc/textures/items/wireless_fluid_terminal.png diff --git a/src/main/java/com/glodblock/github/client/textures/FCPartsTexture.java b/src/main/java/com/glodblock/github/client/textures/FCPartsTexture.java index a49621f2e..2c1af821a 100644 --- a/src/main/java/com/glodblock/github/client/textures/FCPartsTexture.java +++ b/src/main/java/com/glodblock/github/client/textures/FCPartsTexture.java @@ -12,12 +12,6 @@ public enum FCPartsTexture { - PartFluidTerminal_Bright("fluid_terminal_bright"), - PartFluidTerminal_Dark("fluid_terminal_dark"), - PartFluidTerminal_Colored("fluid_terminal_medium"), - PartFluidPatternTerminal_Bright("pattern_terminal_bright"), - PartFluidPatternTerminal_Dark("pattern_terminal_dark"), - PartFluidPatternTerminal_Colored("pattern_terminal_medium"), PartLevelTerminal_Bright("level_terminal_bright"), PartLevelTerminal_Dark("level_terminal_dark"), PartLevelTerminal_Colored("level_terminal_medium"), @@ -28,13 +22,12 @@ public enum FCPartsTexture { BlockFluidInterfaceAlternate_Arrow("fluid_interface_arrow"), BlockInterfaceAlternate("fluid_interface_a"), BlockInterface_Face("fluid_interface"), - PartFluidLevelEmitter("fluid_level_emitter"), BlockLevelMaintainer("level_maintainer"), BlockLevelMaintainer_Active("level_maintainer_active"), PartFluidFormationPlane("fluid_formation_plane"), PartFluidAnnihilationPlane("fluid_annihilation_plane"), PartFluidFormationPlaneOn("fluid_formation_plane_on"), - PartFluidAnnihilationPlaneOn("fluid_annihilation_plane_on"),; + PartFluidAnnihilationPlaneOn("fluid_annihilation_plane_on"); private final String name; public net.minecraft.util.IIcon IIcon; diff --git a/src/main/java/com/glodblock/github/common/item/ItemFluidLevelEmitter.java b/src/main/java/com/glodblock/github/common/item/ItemFluidLevelEmitter.java index 5b9cc09d0..4d940f0c9 100644 --- a/src/main/java/com/glodblock/github/common/item/ItemFluidLevelEmitter.java +++ b/src/main/java/com/glodblock/github/common/item/ItemFluidLevelEmitter.java @@ -7,33 +7,20 @@ import net.minecraft.util.IIcon; import net.minecraft.world.World; -import org.jetbrains.annotations.Nullable; - import com.glodblock.github.FluidCraft; -import com.glodblock.github.client.textures.FCPartsTexture; -import com.glodblock.github.common.parts.PartFluidLevelEmitter; -import com.glodblock.github.common.tabs.FluidCraftingTabs; import com.glodblock.github.util.NameConst; import appeng.api.AEApi; -import appeng.api.parts.IPart; -import appeng.api.parts.IPartItem; +import appeng.client.texture.TextureUtils; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -public class ItemFluidLevelEmitter extends FCBaseItem implements IPartItem { +public class ItemFluidLevelEmitter extends FCBaseItem { public ItemFluidLevelEmitter() { this.setMaxStackSize(64); this.setUnlocalizedName(NameConst.ITEM_PART_FLUID_LEVEL_EMITTER); - AEApi.instance().partHelper().setItemBusRenderer(this); - } - - @Nullable - @Override - public IPart createPartFromItemStack(ItemStack is) { - return new PartFluidLevelEmitter(is); } @Override @@ -45,13 +32,12 @@ public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int @Override public ItemFluidLevelEmitter register() { GameRegistry.registerItem(this, NameConst.ITEM_PART_FLUID_LEVEL_EMITTER, FluidCraft.MODID); - setCreativeTab(FluidCraftingTabs.INSTANCE); return this; } @Override public IIcon getIconIndex(ItemStack is) { - return FCPartsTexture.PartFluidLevelEmitter.getIcon(); + return TextureUtils.getMissingBlock(); } @Override diff --git a/src/main/java/com/glodblock/github/common/parts/PartFluidTerminal.java b/src/main/java/com/glodblock/github/common/parts/PartFluidTerminal.java deleted file mode 100644 index a26038c20..000000000 --- a/src/main/java/com/glodblock/github/common/parts/PartFluidTerminal.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.glodblock.github.common.parts; - -import net.minecraft.item.ItemStack; - -import com.glodblock.github.client.textures.FCPartsTexture; -import com.glodblock.github.common.parts.base.FCPart; - -import appeng.core.sync.GuiBridge; - -public class PartFluidTerminal extends FCPart { - - private static final FCPartsTexture FRONT_BRIGHT_ICON = FCPartsTexture.PartFluidTerminal_Bright; - private static final FCPartsTexture FRONT_DARK_ICON = FCPartsTexture.PartFluidTerminal_Colored; - private static final FCPartsTexture FRONT_COLORED_ICON = FCPartsTexture.PartFluidTerminal_Dark; - - public PartFluidTerminal(ItemStack is) { - super(is, true); - } - - @Override - public FCPartsTexture getFrontBright() { - return FRONT_BRIGHT_ICON; - } - - @Override - public FCPartsTexture getFrontColored() { - return FRONT_COLORED_ICON; - } - - @Override - public FCPartsTexture getFrontDark() { - return FRONT_DARK_ICON; - } - - @Override - public boolean isLightSource() { - return false; - } - - @Override - public boolean isBooting() { - return super.isBooting(); - } - - @Override - public GuiBridge getGui() { - return GuiBridge.GUI_ME; - } -} diff --git a/src/main/java/com/glodblock/github/util/NameConst.java b/src/main/java/com/glodblock/github/util/NameConst.java index 68a6429bf..f4dbc84d1 100644 --- a/src/main/java/com/glodblock/github/util/NameConst.java +++ b/src/main/java/com/glodblock/github/util/NameConst.java @@ -23,12 +23,7 @@ public class NameConst { 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"; - public static final String ITEM_PART_FLUID_CONVERSION_MONITOR = "part_fluid_conversion_monitor"; - public static final String ITEM_PART_FLUID_TERMINAL = "part_fluid_terminal"; public static final String ITEM_PART_LEVEL_TERMINAL = "part_level_terminal"; - public static final String ITEM_PART_FLUID_PATTERN_TERMINAL = "part_fluid_pattern_terminal"; - public static final String ITEM_PART_FLUID_PATTERN_TERMINAL_EX = "part_fluid_pattern_terminal_ex"; public static final String ITEM_PART_FLUID_INTERFACE = "part_fluid_interface"; public static final String ITEM_PART_FLUID_P2P_INTERFACE = "part_fluid_p2p_interface"; public static final String ITEM_PART_FLUID_IMPORT = "part_fluid_import"; @@ -46,7 +41,6 @@ public class NameConst { public static final String ITEM_INFINITY_WATER_FLUID_STORAGE = ITEM_INFINITY_FLUID_STORAGE + ".water"; public static final String ITEM_CREATIVE_FLUID_STORAGE = "creative_" + ITEM_FLUID_STORAGE; public static final String ITEM_FLUID_PORTABLE_CELL = "portable_fluid_cell"; - public static final String ITEM_WIRELESS_FLUID_TERMINAL = "wireless_fluid_terminal"; public static final String ITEM_WIRELESS_INTERFACE_TERMINAL = "wireless_interface_terminal"; public static final String ITEM_WIRELESS_LEVEL_TERMINAL = "wireless_level_terminal"; public static final String ITEM_WIRELESS_ULTRA_TERMINAL = "wireless_ultra_terminal"; @@ -59,7 +53,6 @@ public class NameConst { public static final String ITEM_PART_FLUID_ANNIHILATION_PLANE = "part_fluid_annihilation_plane"; public static final String TT_KEY = FluidCraft.MODID + ".tooltip."; - public static final String TT_FLUID_TERMINAL = TT_KEY + "fluid_terminal"; public static final String TT_LEVEL_TERMINAL = TT_KEY + "level_terminal"; public static final String TT_INVALID_FLUID = TT_KEY + "invalid_fluid"; public static final String TT_FLUID_PACKET_TIPS = TT_KEY + "item_fluid_packet"; diff --git a/src/main/resources/assets/ae2fc/lang/en_US.lang b/src/main/resources/assets/ae2fc/lang/en_US.lang index 6fc8235af..e8ec635bd 100644 --- a/src/main/resources/assets/ae2fc/lang/en_US.lang +++ b/src/main/resources/assets/ae2fc/lang/en_US.lang @@ -1,19 +1,12 @@ item.fluid_drop.name=drop of %s item.fluid_encoded_pattern.name=Encoded Pattern -item.part_fluid_terminal.name=ME Fluid Terminal -item.part_fluid_pattern_terminal.name=ME Fluid Pattern Terminal -item.part_fluid_pattern_terminal_ex.name=ME Fluid Processing Pattern Terminal item.part_fluid_interface.name=ME Dual Interface item.part_fluid_p2p_interface.name=P2P Tunnel - ME Dual Interface item.part_fluid_import.name=ME Fluid Import Bus item.part_fluid_export.name=ME Fluid Export Bus item.part_fluid_storage_bus.name=ME Fluid Storage Bus -item.part_fluid_level_emitter.name=ME Fluid Level Emitter -item.part_fluid_storage_monitor.name=ME Fluid Storage Monitor -item.part_fluid_conversion_monitor.name=ME Fluid Conversion Monitor item.part_level_terminal.name=ME Level Terminal item.portable_fluid_cell.name=Portable Fluid Cell -item.wireless_fluid_terminal.name=Wireless Fluid Terminal item.wireless_level_terminal.name=Wireless Level Terminal item.wireless_fluid_pattern_terminal.name=Wireless Pattern Terminal item.wireless_interface_terminal.name=Wireless Interface Terminal @@ -223,16 +216,3 @@ ae2fc.key.OpenPatternExTerminal=Open Wireless Universal Processing Pattern Termi ae2fc.key.Restock=Toggle Restock itemGroup.ae2fc=Fluid Craft For AE2 - -item.ec2placeholder.oc.upgrade.name=[EC2 PLACEHOLDER] ME Upgrade -item.ec2placeholder.part.base.name=[EC2 PLACEHOLDER] ME Fluid Bus -item.ec2placeholder.pattern.fluid.name=[EC2 PLACEHOLDER] ME Fluid Pattern -item.ec2placeholder.storage.casing.name=[EC2 PLACEHOLDER] Storage Housing -item.ec2placeholder.storage.component.name=[EC2 PLACEHOLDER] ME Storage Component -item.ec2placeholder.storage.fluid.name=[EC2 PLACEHOLDER] ME Fluid Storage -item.ec2placeholder.storage.physical.advanced.quantum.name=[EC2 PLACEHOLDER] ME Quantum Storage -item.ec2placeholder.storage.physical.advanced.singularity.name=[EC2 PLACEHOLDER] ME Digital Singularity -item.ec2placeholder.storage.physical.name=[EC2 PLACEHOLDER] ME Storage -item.ec2placeholder.storage.physical.void.name=[EC2 PLACEHOLDER] ME Void Storage -item.ec2placeholder.terminal.fluid.wireless.name=[EC2 PLACEHOLDER] Wireless Fluid Terminal -item.ec2placeholder.terminal.universal.wireless.name=[EC2 PLACEHOLDER] Wireless Universal Terminal diff --git a/src/main/resources/assets/ae2fc/textures/blocks/fluid_level_emitter.png b/src/main/resources/assets/ae2fc/textures/blocks/fluid_level_emitter.png deleted file mode 100644 index 793b3e4f59bba0b6739643103156cb62092bb6dd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 232 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6-E$sR$z z3=CCj3=9n|3=F@3LJcn%7)lKo7+xhXFj&oCU=S~uvn$XBD8X6a5n0T@z_$#98Qbry z%m)femAFQf1m~xflqVLYG6W=M=9TFAxrQi|8S9zq85+8Ob}|R5vhZ|q46*12(k5Pp%xg=IG>B@4{mIYBP`Kal_V)J4`3L_0{~u`JI_qUVLo6f1Ghxf$ UWqcv!Kr;M1& diff --git a/src/main/resources/assets/ae2fc/textures/blocks/fluid_terminal_bright.png b/src/main/resources/assets/ae2fc/textures/blocks/fluid_terminal_bright.png deleted file mode 100644 index cf7faea8f1c61cdcf793d6020108a5319e87f24a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 229 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6-E$sR$z z3=CCj3=9n|3=F@3LJcn%7)lKo7+xhXFj&oCU=S~uvn$XBD8X6a5n0T@z_$#98Qbry z%m)fembgZg1m~xflqVLYG880c=9TE>rIsj|=o#o48GcmAoC;KA=IP=XVsSe8$N&HK z%&IdIFGxD@DBNTyshq@fK+Sy%W=HZW#n@YlBbF#V(4 QDxe7rp00i_>zopr00wVAkN^Mx diff --git a/src/main/resources/assets/ae2fc/textures/blocks/fluid_terminal_dark.png b/src/main/resources/assets/ae2fc/textures/blocks/fluid_terminal_dark.png deleted file mode 100644 index 53db9f0c0fdada5c310a66d0c056a930ed6acdc5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 198 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6-E$sR$z z3=CCj3=9n|3=F@3LJcn%7)lKo7+xhXFj&oCU=S~uvn$XBD8X6a5n0T@z_$#98Qbry z%m)fembgZg1m~xflqVLYG880c=9TE>rIsj|=o#o48GcmAoC;JV?&;zfV$qwNAi?^D k{eNS^m4-lOHhBhyf?4tp^VU|l0hKU#y85}Sb4q9e0G84-m;e9( diff --git a/src/main/resources/assets/ae2fc/textures/blocks/fluid_terminal_medium.png b/src/main/resources/assets/ae2fc/textures/blocks/fluid_terminal_medium.png deleted file mode 100644 index 4272fce0a4ae74cf260e9dea37d1d3b0248d3f91..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 250 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6-E$sR$z z3=CCj3=9n|3=F@3LJcn%7)lKo7+xhXFj&oCU=S~uvn$XBD8X6a5n0T@z_$#98Qbry z%m)fembgZg1m~xflqVLYG880c=9TE>rIsj|=o#o48GcmAoC;Lr?djqeVsSe8$N&HK z%&IdI3nVW{Zf5G?%=p#6rcEMx0wc4K?-a%tvpl(&n`UKZ9jN!(>mbVfZ*mSpl+=M$ nlD2Cf7&B-e%RX@7j1PnEXFi2ZKhHb>8q476>gTe~DWM4fTjxwM diff --git a/src/main/resources/assets/ae2fc/textures/blocks/pattern_terminal_bright.png b/src/main/resources/assets/ae2fc/textures/blocks/pattern_terminal_bright.png deleted file mode 100644 index a0ea37f07232b5a4647f8f9116f471bd64cc6d62..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1452 zcmbVM&x_Pn9M9s9s?;Jya8bcWM5t(zm&{~#@-W@5neEPiS(n`b*IVDbyqO6*$&1Nb zXJ$`}7qJLdkfPv0=v};)9`xct^ysyJL&5goZT)6`g!M-&HIU@xy-z-$@9$eH%S(q3 z9Y3Tf%Hc-6whHef`F&tNJWu_-L*aEWsb9?$<(r53J@eJQwLcYQ-?w3NU9S6=2osS` z1JUC8AW8tOC>Q1j31u5xq89Ijv8(>|$5R!BfvaAzee5S5?}qiQl&@_qH`&$(a{_h# zdvswyfFR&cYoHOv8VU{#(5?moA2Td*&)Y70$R%<^_wBXBCyHX~^F#7$z-Y@AQ?HH!xI0m*1 z%hCX$Wy4s~ffi?{rwlcou{2C%C}NZ|(w5kit_qfpU5Ju`HqIttf`AzVni!^zbC*WI zfEBo8GwqGU17`3Zk9aIIz?ua%=?W>buJ{+~;`luQ2(9lI8lSW!iVBHLE?x&WCIR^* zI%^ISZmjZ5Y^IDaUI#Nz=iVg5OF5MyZ3@wwCTeABGV(n1-IXv7L_a&b3(jj)a#yvm zg*DUEOuGp=vns@%JBOHV6gF?XsRMO9a14h~+jVQPqMzq6? zB<`rF2qN)BPoy9W)|GbeH#~18745JG2ifY7?6@(E;HM~8fCnyS+v~Js<5ZETUEPSYFq69gU~2nq$b#AUI5eoga7&eIBWdcWYr7Ns8|SPc@wxQ%d^h|b+R3PaRkP+{VoU6|EP;G zEE8?nrzv0PK(sznbq1JjGG`oL{=R{^<4g-CvI>>Z`9$y*YxPvy)9z8^1@v(-$#PLryPU6-wR^Y zx8wmY66^F>lfeMOw=8)v6$mz+IwXpj0d z;IY8!88+-P&f+fn3w3sVNPuvy<76_9)W!ER5iwuh5oU}WawIx#?uJxr(3ovUgf8z0 zHRn=mLS#o2a~3rj>x~0dAFB*(8{F9N0+%K6%>!^+!JJyM0S&0=x}q1FB4$Pr6-u{Z z89_LNI?VOjyMI7+hz#=(PGpOVIX)ig64YjqkAbW7 zYqnjFSljD~i@3461ZvB6Q8$Z4#ZdKuqK<=VLCkSLXsu$&!YQifxu^^aE+jfss7rOF zfb(UgMaopctzx@GVFBjy+4~A3+iB>>@7@1=e?Rg>>EYgqdD4PRa|TttSVVJoR5I)I z(P-84z#vT!CTaRxGD+i3U3qluo!A3I+N4Vb=`k5GgvG4Q6CBaSj_}q$@=X(}YiXGd ztospu{F?aWoKpEfNjv)Q8ufMe~zumBnWHBl)?%zc6|I1^#s9 n`>SbZf9ma}mD$Tqb&^QZmva-ho;^;2v{%-a*D7z89zOX6ZhN<< diff --git a/src/main/resources/assets/ae2fc/textures/blocks/pattern_terminal_medium.png b/src/main/resources/assets/ae2fc/textures/blocks/pattern_terminal_medium.png deleted file mode 100644 index 7c2f86d8bb4dd556857955602de455274dafb982..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1467 zcmbVMJB-vu7&e>&91>APgFi|EKl86y<}%thpgJybFl% zP{%%RQGF1`60Inw76&mVT`E9}wprw;|K7c?0_HpFrIKfQu}eE_WhC=T4^X3ab}CEm9JM1vj0~gS@9X`7&XcwQZQC|X z%djj>BD8cE2|UoE^w^A{MpKfoSTG)ej1jl^rf^iL>BNLE&S|4`>L%$hV}N4=>Skur z80eE67jGuLv2dRlv`0f4iBw`?j*UB9@U+9^KuzG>Jo;zh*T_JlV(gE zvLiZe4r6LGXv#MeLYJ>eHIHT1#K=u37CdQk-kSw#ZKg7CU2x(Oi+tWsKidYUH7uy3 zTBc=c5Nfd0lrgi)s8spftRmB#Kt1lWVE7son#ii6lKB!;CX9~--WBW<6!0X((p(ne zHZ|g?t%BT%$mKnrNWoIO!uIpJ>#ij{U_E(}HqM;^^<}pV?Q&VObU0Sm^H4oX1&#=< z*Bn*4MrX`N6b3DVt1YcsuuB@Yi!IGA;iBdjs}R#7!Ihvodtc*ZGfRNkd;cBZUrd-R zK-_z8o~$gh%t0$Gl`$Po3um2PovwNejFSank`;lYk}UevSEtA9y*)6Y?RTgoeM??U zU?~qoA18FFExol%))`WDBP-U46~?Ouj_Ii*uj+g5!^sy`y>Mx1%@o=huJ#b#&+P-;MA8JbV1eVXDmixM%bL ze)IK_n{$oJPZoaeKKkeBUFCXpxbNmy-v#sRK=7%u@W=lruG|*gti9HkS8KP!lvI6-E$sR$z z3=CCj3=9n|3=F@3LJcn%7)lKo7+xhXFj&oCU=S~uvn$XBD8X6a5n0T@z_$#98Qbry z%m)femAFQf1m~xflqVLYG6W=M=9TFAxrQi|8S9zq85+8Ob}|R5n(yi27-DfcIbi|o zkNX9G?OkUH{|)=U{Dwf+o(B&e7&x%akj(n~y`=cZ`?v2t+&_L;(8JlFgZJ>VwplxP z*)xx@Ut1UZ`~LB}jV8<+=oK-90o@5fETPuNe89lb!IR=zH$97qs;ex7q&1QdpBXr!B2GI+ZBxvX Date: Sun, 10 May 2026 16:13:23 +0300 Subject: [PATCH 3/4] delete level emitter --- .../common/item/ItemFluidLevelEmitter.java | 55 ------------------- .../common/parts/PartFluidLevelEmitter.java | 38 ------------- .../github/loader/ItemAndBlockHolder.java | 2 - .../glodblock/github/loader/RecipeLoader.java | 4 -- .../github/util/LevelTerminalRegistry.java | 2 - .../com/glodblock/github/util/NameConst.java | 1 - 6 files changed, 102 deletions(-) delete mode 100644 src/main/java/com/glodblock/github/common/item/ItemFluidLevelEmitter.java delete mode 100644 src/main/java/com/glodblock/github/common/parts/PartFluidLevelEmitter.java diff --git a/src/main/java/com/glodblock/github/common/item/ItemFluidLevelEmitter.java b/src/main/java/com/glodblock/github/common/item/ItemFluidLevelEmitter.java deleted file mode 100644 index 4d940f0c9..000000000 --- a/src/main/java/com/glodblock/github/common/item/ItemFluidLevelEmitter.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.glodblock.github.common.item; - -import java.util.List; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; -import net.minecraft.world.World; - -import com.glodblock.github.FluidCraft; -import com.glodblock.github.util.NameConst; - -import appeng.api.AEApi; -import appeng.client.texture.TextureUtils; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -public class ItemFluidLevelEmitter extends FCBaseItem { - - public ItemFluidLevelEmitter() { - this.setMaxStackSize(64); - this.setUnlocalizedName(NameConst.ITEM_PART_FLUID_LEVEL_EMITTER); - } - - @Override - public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, - float xOffset, float yOffset, float zOffset) { - return AEApi.instance().partHelper().placeBus(stack, x, y, z, side, player, world); - } - - @Override - public ItemFluidLevelEmitter register() { - GameRegistry.registerItem(this, NameConst.ITEM_PART_FLUID_LEVEL_EMITTER, FluidCraft.MODID); - return this; - } - - @Override - public IIcon getIconIndex(ItemStack is) { - return TextureUtils.getMissingBlock(); - } - - @Override - @SideOnly(Side.CLIENT) - public int getSpriteNumber() { - return 0; - } - - @Override - public void addInformation(final ItemStack stack, final EntityPlayer player, final List lines, - final boolean displayMoreInfo) { - lines.add("§4Deprecated, use regular level emitter, hold CTRL for get fluid of container."); - super.addInformation(stack, player, lines, displayMoreInfo); - } -} diff --git a/src/main/java/com/glodblock/github/common/parts/PartFluidLevelEmitter.java b/src/main/java/com/glodblock/github/common/parts/PartFluidLevelEmitter.java deleted file mode 100644 index a501cfea9..000000000 --- a/src/main/java/com/glodblock/github/common/parts/PartFluidLevelEmitter.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.glodblock.github.common.parts; - -import static appeng.util.item.AEFluidStackType.FLUID_STACK_TYPE; - -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; - -import com.glodblock.github.common.item.ItemFluidPacket; - -import appeng.api.storage.StorageName; -import appeng.api.storage.data.IAEItemStack; -import appeng.api.storage.data.IAEStack; -import appeng.api.storage.data.IAEStackType; -import appeng.helpers.Reflected; -import appeng.parts.automation.PartLevelEmitter; - -public class PartFluidLevelEmitter extends PartLevelEmitter { - - @Reflected - public PartFluidLevelEmitter(final ItemStack is) { - super(is); - } - - @Override - public void readFromNBT(NBTTagCompound data) { - super.readFromNBT(data); - - final IAEStack aes = this.getAEInventoryByName(StorageName.CONFIG).getAEStackInSlot(0); - if (aes instanceof IAEItemStack ais && ais.getItem() instanceof ItemFluidPacket) { - this.getAEInventoryByName(StorageName.CONFIG).putAEStackInSlot(0, ItemFluidPacket.getFluidAEStack(ais)); - } - } - - @Override - protected IAEStackType getUltraLegacyType() { - return FLUID_STACK_TYPE; - } -} diff --git a/src/main/java/com/glodblock/github/loader/ItemAndBlockHolder.java b/src/main/java/com/glodblock/github/loader/ItemAndBlockHolder.java index 5d3950cc6..8674f48ff 100644 --- a/src/main/java/com/glodblock/github/loader/ItemAndBlockHolder.java +++ b/src/main/java/com/glodblock/github/loader/ItemAndBlockHolder.java @@ -24,7 +24,6 @@ import com.glodblock.github.common.item.ItemFluidExtremeStorageCell; import com.glodblock.github.common.item.ItemFluidFormationPlane; import com.glodblock.github.common.item.ItemFluidImportBus; -import com.glodblock.github.common.item.ItemFluidLevelEmitter; import com.glodblock.github.common.item.ItemFluidPacket; import com.glodblock.github.common.item.ItemFluidStorageHousing; import com.glodblock.github.common.item.ItemFluidVoidStorageCell; @@ -67,7 +66,6 @@ public static void init() {} public static ItemFluidImportBus FLUID_IMPORT_BUS = new ItemFluidImportBus().register(); public static ItemFluidExportBus FLUID_EXPORT_BUS = new ItemFluidExportBus().register(); public static ItemPartFluidStorageBus FLUID_STORAGE_BUS = new ItemPartFluidStorageBus().register(); - public static ItemFluidLevelEmitter FLUID_LEVEL_EMITTER = new ItemFluidLevelEmitter().register(); public static ItemPortableFluidCell PORTABLE_FLUID_CELL = new ItemPortableFluidCell().register(); public static ItemWirelessLevelTerminal WIRELESS_LEVEL_TERM = new ItemWirelessLevelTerminal().register(); public static ItemWirelessPatternTerminal WIRELESS_PATTERN_TERM = new ItemWirelessPatternTerminal().register(); diff --git a/src/main/java/com/glodblock/github/loader/RecipeLoader.java b/src/main/java/com/glodblock/github/loader/RecipeLoader.java index 028fb4d72..e2e678637 100644 --- a/src/main/java/com/glodblock/github/loader/RecipeLoader.java +++ b/src/main/java/com/glodblock/github/loader/RecipeLoader.java @@ -30,7 +30,6 @@ import static com.glodblock.github.loader.ItemAndBlockHolder.FLUID_IMPORT_BUS; import static com.glodblock.github.loader.ItemAndBlockHolder.FLUID_INTERFACE; import static com.glodblock.github.loader.ItemAndBlockHolder.FLUID_INTERFACE_P2P; -import static com.glodblock.github.loader.ItemAndBlockHolder.FLUID_LEVEL_EMITTER; import static com.glodblock.github.loader.ItemAndBlockHolder.FLUID_STORAGE_BUS; import static com.glodblock.github.loader.ItemAndBlockHolder.FLUID_VOID_CELL; import static com.glodblock.github.loader.ItemAndBlockHolder.INFINITY_WATER_CELL; @@ -314,9 +313,6 @@ public void run() { GameRegistry .addShapelessRecipe(LEVEL_MAINTAINER.stack(), AE2_CRAFTING_CP_UNIT, ENCODER, AE2_PATTERN_CAPACITY_CARD); - // Deprecated - GameRegistry.addShapelessRecipe(AE2_LEVEL_EMITTER, FLUID_LEVEL_EMITTER.stack()); - if (Config.fluidCells) { OreDictionary.registerOre("anyCertusCrystal", AE2_PURE_CERTUS); for (ItemStack it : OreDictionary.getOres("crystalCertusQuartz")) diff --git a/src/main/java/com/glodblock/github/util/LevelTerminalRegistry.java b/src/main/java/com/glodblock/github/util/LevelTerminalRegistry.java index 8e2c312a9..f97362621 100644 --- a/src/main/java/com/glodblock/github/util/LevelTerminalRegistry.java +++ b/src/main/java/com/glodblock/github/util/LevelTerminalRegistry.java @@ -7,7 +7,6 @@ import com.glodblock.github.api.registries.ILevelTerminalRegistry; import com.glodblock.github.api.registries.ILevelViewableAdapter; -import com.glodblock.github.common.parts.PartFluidLevelEmitter; import com.glodblock.github.common.tile.TileLevelMaintainer; import appeng.api.features.ILevelViewable; @@ -28,7 +27,6 @@ private static class Singleton { { this.register(TileLevelMaintainer.class); this.register(PartLevelEmitter.class); - this.register(PartFluidLevelEmitter.class); } public Set> getSupportedClasses() { diff --git a/src/main/java/com/glodblock/github/util/NameConst.java b/src/main/java/com/glodblock/github/util/NameConst.java index f4dbc84d1..8e9717c37 100644 --- a/src/main/java/com/glodblock/github/util/NameConst.java +++ b/src/main/java/com/glodblock/github/util/NameConst.java @@ -29,7 +29,6 @@ public class NameConst { public static final String ITEM_PART_FLUID_IMPORT = "part_fluid_import"; public static final String ITEM_PART_FLUID_EXPORT = "part_fluid_export"; public static final String ITEM_PART_FLUID_STORAGE_BUS = "part_fluid_storage_bus"; - public static final String ITEM_PART_FLUID_LEVEL_EMITTER = "part_fluid_level_emitter"; public static final String ITEM_FLUID_PACKET = "fluid_packet"; public static final String ITEM_FLUID_STORAGE = "fluid_storage"; public static final String ITEM_MULTI_FLUID_STORAGE = "multi_fluid_storage"; From fb9b2766a40eefee8cfa12be6772bb275d29c018 Mon Sep 17 00:00:00 2001 From: lc-1337 Date: Sun, 10 May 2026 18:04:46 +0300 Subject: [PATCH 4/4] lang --- .../resources/assets/ae2fc/lang/de_DE.lang | 22 +------------------ .../resources/assets/ae2fc/lang/ru_RU.lang | 22 +------------------ .../resources/assets/ae2fc/lang/zh_CN.lang | 22 +------------------ 3 files changed, 3 insertions(+), 63 deletions(-) diff --git a/src/main/resources/assets/ae2fc/lang/de_DE.lang b/src/main/resources/assets/ae2fc/lang/de_DE.lang index b94eb9c5d..9e59eb161 100644 --- a/src/main/resources/assets/ae2fc/lang/de_DE.lang +++ b/src/main/resources/assets/ae2fc/lang/de_DE.lang @@ -1,19 +1,12 @@ item.fluid_drop.name=Tropfen %s item.fluid_encoded_pattern.name=Kodierte ME-Flüssigkeitsschablone -item.part_fluid_terminal.name=ME-Flüssigkeitskonsole -item.part_fluid_pattern_terminal.name=ME-Flüssigkeitsschablonenkonsole -item.part_fluid_pattern_terminal_ex.name=ME-Flüssigkeitsverarbeitungsschablonenkonsole item.part_fluid_interface.name=ME-Dualschnittstelle item.part_fluid_p2p_interface.name=P2P-Tunnel - ME-Dualschnittstelle item.part_fluid_import.name=ME-Flüssigkeits-Importbus item.part_fluid_export.name=ME-Flüssigkeits-Exportbus item.part_fluid_storage_bus.name=ME-Flüssigkeitsspeicherbus -item.part_fluid_level_emitter.name=ME-Flüssigkeitsfüllstandsemitter -item.part_fluid_storage_monitor.name=ME-Flüssigkeitsspeicherkonsole -item.part_fluid_conversion_monitor.name=ME-Flüssigkeitsumwandlungskonsole item.part_level_terminal.name=ME-Füllstandkonsole item.portable_fluid_cell.name=Tragbare Flüssigkeitszelle -item.wireless_fluid_terminal.name=Flüssigkeits-Handkonsole item.wireless_level_terminal.name=Füllstands-Handkonsole item.wireless_fluid_pattern_terminal.name=Flüssigkeitsschablonen-Handkonsole item.wireless_interface_terminal.name=Schnittstellen-Handkonsole @@ -213,17 +206,4 @@ ae2fc.key.OpenPatternTerminal=Open Wireless Universal Pattern Terminal ae2fc.key.OpenPatternExTerminal=Open Wireless Universal Processing Pattern Terminal ae2fc.key.Restock=Wiederauffüllen -itemGroup.ae2fc=Flüssigkeitsfertigung für AE2 - -item.ec2placeholder.oc.upgrade.name=[EC2 PLACEHOLDER] ME-Upgrade -item.ec2placeholder.part.base.name=[EC2 PLACEHOLDER] ME-Flüssigkeitsbus -item.ec2placeholder.pattern.fluid.name=[EC2 PLACEHOLDER] ME-Flüssigkeitsschablone -item.ec2placeholder.storage.casing.name=[EC2 PLACEHOLDER] Speichergehäuse -item.ec2placeholder.storage.component.name=[EC2 PLACEHOLDER] ME-Speicherkomponente -item.ec2placeholder.storage.fluid.name=[EC2 PLACEHOLDER] ME-Flüssigkeitsspeicher -item.ec2placeholder.storage.physical.advanced.quantum.name=[EC2 PLACEHOLDER] ME-Quantenspeicher -item.ec2placeholder.storage.physical.advanced.singularity.name=[EC2 PLACEHOLDER] ME-Digitale Singularität -item.ec2placeholder.storage.physical.name=[EC2 PLACEHOLDER] ME-Speicher -item.ec2placeholder.storage.physical.void.name=[EC2 PLACEHOLDER] Void-ME-Speicher -item.ec2placeholder.terminal.fluid.wireless.name=[EC2 PLACEHOLDER] Flüssigkeits-Handkonsole -item.ec2placeholder.terminal.universal.wireless.name=[EC2 PLACEHOLDER] Universelle Handkonsole +itemGroup.ae2fc=Flüssigkeitsfertigung für AE2 \ No newline at end of file diff --git a/src/main/resources/assets/ae2fc/lang/ru_RU.lang b/src/main/resources/assets/ae2fc/lang/ru_RU.lang index 99086950b..04e00c651 100644 --- a/src/main/resources/assets/ae2fc/lang/ru_RU.lang +++ b/src/main/resources/assets/ae2fc/lang/ru_RU.lang @@ -1,19 +1,12 @@ item.fluid_drop.name=Капля (%s) item.fluid_encoded_pattern.name=Закодированный шаблон -item.part_fluid_terminal.name=МЭ жидкостный терминал -item.part_fluid_pattern_terminal.name=МЭ жидкостный терминал шаблонов -item.part_fluid_pattern_terminal_ex.name=МЭ жидкостный терминал шаблонов обработки item.part_fluid_interface.name=МЭ двойной интерфейс item.part_fluid_p2p_interface.name=P2P туннель - МЭ двойной интерфейс item.part_fluid_import.name=МЭ жидкостная шина импорта item.part_fluid_export.name=МЭ жидкостная шина экспорта item.part_fluid_storage_bus.name=МЭ жидкостная шина хранения -item.part_fluid_level_emitter.name=МЭ жидкостный излучатель уровня -item.part_fluid_storage_monitor.name=МЭ жидкостный монитор хранения -item.part_fluid_conversion_monitor.name=МЭ жидкостный монитор преобразования item.part_level_terminal.name=МЭ терминал регуляторов уровня item.portable_fluid_cell.name=Переносная жидкостная ячейка -item.wireless_fluid_terminal.name=Беспроводной жидкостный терминал item.wireless_level_terminal.name=Беспроводной терминал уровня item.wireless_fluid_pattern_terminal.name=Беспроводной жидкостный терминал шаблонов item.wireless_interface_terminal.name=Беспроводной терминал интерфейсов @@ -213,17 +206,4 @@ ae2fc.key.OpenPatternTerminal=Открыть беспроводной униве ae2fc.key.OpenPatternExTerminal=Открыть беспроводной универсальный терминал шаблонов обработки ae2fc.key.Restock=Автопополнение запасов -itemGroup.ae2fc=Fluid Craft For AE2 - -item.ec2placeholder.oc.upgrade.name=[EC2 ЗАПОЛНИТЕЛЬ] МЭ улучшение -item.ec2placeholder.part.base.name=[EC2 ЗАПОЛНИТЕЛЬ] МЭ жидкостная шина -item.ec2placeholder.pattern.fluid.name=[EC2 ЗАПОЛНИТЕЛЬ] МЭ жидкостной шаблон -item.ec2placeholder.storage.casing.name=[EC2 ЗАПОЛНИТЕЛЬ] Ячейка хранения -item.ec2placeholder.storage.component.name=[EC2 ЗАПОЛНИТЕЛЬ] МЭ компонент хранения -item.ec2placeholder.storage.fluid.name=[EC2 ЗАПОЛНИТЕЛЬ] МЭ жидкостная ячейка хранения -item.ec2placeholder.storage.physical.advanced.quantum.name=[EC2 ЗАПОЛНИТЕЛЬ] МЭ квантовая ячейка хранения -item.ec2placeholder.storage.physical.advanced.singularity.name=[EC2 ЗАПОЛНИТЕЛЬ] МЭ сингулярная ячейка хранения -item.ec2placeholder.storage.physical.name=[EC2 ЗАПОЛНИТЕЛЬ] МЭ ячейка хранения -item.ec2placeholder.storage.physical.void.name=[EC2 ЗАПОЛНИТЕЛЬ] МЭ пустотная ячейка хранения -item.ec2placeholder.terminal.fluid.wireless.name=[EC2 ЗАПОЛНИТЕЛЬ] Беспроводной жидкостный терминал -item.ec2placeholder.terminal.universal.wireless.name=[EC2 ЗАПОЛНИТЕЛЬ] Беспроводной универсальный терминал +itemGroup.ae2fc=Fluid Craft For AE2 \ No newline at end of file diff --git a/src/main/resources/assets/ae2fc/lang/zh_CN.lang b/src/main/resources/assets/ae2fc/lang/zh_CN.lang index c320b4ef3..10e5f6782 100644 --- a/src/main/resources/assets/ae2fc/lang/zh_CN.lang +++ b/src/main/resources/assets/ae2fc/lang/zh_CN.lang @@ -1,19 +1,12 @@ item.fluid_drop.name=%s液滴 item.fluid_encoded_pattern.name=编码样板 -item.part_fluid_terminal.name=ME流体终端 -item.part_fluid_pattern_terminal.name=ME流体样板终端 -item.part_fluid_pattern_terminal_ex.name=ME增广流体样板终端 item.part_fluid_interface.name=ME二合一接口 item.part_fluid_p2p_interface.name=P2P通道 - ME二合一接口 item.part_fluid_import.name=ME流体输入总线 item.part_fluid_export.name=ME流体输出总线 item.part_fluid_storage_bus.name=ME流体存储总线 -item.part_fluid_level_emitter.name=ME流体发信器 -item.part_fluid_storage_monitor.name=ME流体存储监控器 -item.part_fluid_conversion_monitor.name=ME流体交换监控器 item.part_level_terminal.name=ME Level Terminal item.portable_fluid_cell.name=便携流体单元 -item.wireless_fluid_terminal.name=无线流体终端 item.wireless_level_terminal.name=Wireless Level Terminal item.wireless_fluid_pattern_terminal.name=无线样板终端 item.wireless_interface_terminal.name=无线接口终端 @@ -207,17 +200,4 @@ ae2fc.key.OpenPatternTerminal=Open Wireless Universal Pattern Terminal ae2fc.key.OpenPatternExTerminal=Open Wireless Universal Processing Pattern Terminal ae2fc.key.Restock=Toggle Restock -itemGroup.ae2fc=AE2流体合成套件重置 - -item.ec2placeholder.oc.upgrade.name=[EC2 PLACEHOLDER] ME Upgrade -item.ec2placeholder.part.base.name=[EC2 PLACEHOLDER] ME Fluid Bus -item.ec2placeholder.pattern.fluid.name=[EC2 PLACEHOLDER] ME Fluid Pattern -item.ec2placeholder.storage.casing.name=[EC2 PLACEHOLDER] Storage Housing -item.ec2placeholder.storage.component.name=[EC2 PLACEHOLDER] ME Storage Component -item.ec2placeholder.storage.fluid.name=[EC2 PLACEHOLDER] ME Fluid Storage -item.ec2placeholder.storage.physical.advanced.quantum.name=[EC2 PLACEHOLDER] ME Quantum Storage -item.ec2placeholder.storage.physical.advanced.singularity.name=[EC2 PLACEHOLDER] ME Digital Singularity -item.ec2placeholder.storage.physical.name=[EC2 PLACEHOLDER] ME Storage -item.ec2placeholder.storage.physical.void.name=[EC2 PLACEHOLDER] ME Void Storage -item.ec2placeholder.terminal.fluid.wireless.name=[EC2 PLACEHOLDER] Wireless Fluid Terminal -item.ec2placeholder.terminal.universal.wireless.name=[EC2 PLACEHOLDER] Wireless Universal Terminal +itemGroup.ae2fc=AE2流体合成套件重置 \ No newline at end of file