From 7912a350836fea51cd2f9ad99a547a2bcc248281 Mon Sep 17 00:00:00 2001 From: zy <854865755@163.com> Date: Fri, 5 Jan 2024 11:07:41 +0800 Subject: [PATCH] update code style --- src/main/java/com/glodblock/github/FluidCraft.java | 2 +- .../java/com/glodblock/github/common/Config.java | 13 +++---------- .../common/storage/CreativeFluidCellInventory.java | 2 +- .../glodblock/github/loader/ItemAndBlockHolder.java | 6 +++--- src/main/java/com/glodblock/github/util/Util.java | 5 ++++- 5 files changed, 12 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/glodblock/github/FluidCraft.java b/src/main/java/com/glodblock/github/FluidCraft.java index 5acaa489c..3cc8709cf 100644 --- a/src/main/java/com/glodblock/github/FluidCraft.java +++ b/src/main/java/com/glodblock/github/FluidCraft.java @@ -73,7 +73,7 @@ public static void postInit(FMLPostInitializationEvent event) { if (!Config.removeRecipe) { RecipeLoader.INSTANCE.run(); } - if (Config.enableTestItemRecipe) { + if (Config.testItemRecipe) { RecipeLoader.addTestItem(); } RecipeLoader.runTerminalRecipe(); diff --git a/src/main/java/com/glodblock/github/common/Config.java b/src/main/java/com/glodblock/github/common/Config.java index bce5774d8..5046b3b48 100644 --- a/src/main/java/com/glodblock/github/common/Config.java +++ b/src/main/java/com/glodblock/github/common/Config.java @@ -15,11 +15,9 @@ public class Config { public static boolean noFluidPacket; public static boolean fluidIOBus; public static boolean removeRecipe; - public static boolean enableTestItemRecipe = true; + public static boolean testItemRecipe; public static double portableCellBattery; public static boolean fluidP2PInterface; - public static int packetSize; - public static int packetRate; public static boolean replaceEC2; public static int levelMaintainerMinTicks; public static int levelMaintainerMaxTicks; @@ -57,13 +55,8 @@ private static void loadProperty() { "Disable all recipes, for quick tweaker."); portableCellBattery = Config.get("Fluid Craft for AE2", "Portable Fluid Cell Battery Capacity", 20000D) .getDouble(); - packetSize = Config.get("Fluid Craft for AE2", "packetSize", 256, "Number of items to be sent per packet") - .getInt(); - if (packetSize <= 0) packetSize = 256; - packetRate = Config - .get("Fluid Craft for AE2", "packetRate", 50, "Period at which packets are dispatched, in ms.") - .getInt(); - if (packetRate <= 0) packetRate = 50; + testItemRecipe = Config.get("Fluid Craft for AE2", "Experimental items", true, "Experimental items") + .getBoolean(); replaceEC2 = Config.getBoolean( "replaceEC2", "Fluid Craft for AE2", diff --git a/src/main/java/com/glodblock/github/common/storage/CreativeFluidCellInventory.java b/src/main/java/com/glodblock/github/common/storage/CreativeFluidCellInventory.java index a41001d8c..d8599d339 100644 --- a/src/main/java/com/glodblock/github/common/storage/CreativeFluidCellInventory.java +++ b/src/main/java/com/glodblock/github/common/storage/CreativeFluidCellInventory.java @@ -61,7 +61,7 @@ protected void loadCellFluids() { if (fs == null) continue; IAEFluidStack iaeFluidStack = Util.FluidUtil.createAEFluidStack(fs); if (this.cellFluids.findPrecise(iaeFluidStack) == null) { - iaeFluidStack.setStackSize(Integer.MAX_VALUE); + iaeFluidStack.setStackSize(Integer.MAX_VALUE * 1000L); this.cellFluids.add(iaeFluidStack); } } diff --git a/src/main/java/com/glodblock/github/loader/ItemAndBlockHolder.java b/src/main/java/com/glodblock/github/loader/ItemAndBlockHolder.java index 6903e192b..aa0a89c59 100644 --- a/src/main/java/com/glodblock/github/loader/ItemAndBlockHolder.java +++ b/src/main/java/com/glodblock/github/loader/ItemAndBlockHolder.java @@ -54,9 +54,6 @@ public class ItemAndBlockHolder { public static void init() {} - public static ItemEnergyCard ENERGY_CARD = new ItemEnergyCard().register(); - public static ItemQuantumBridgeCard QUANTUM_BRIDGE_CARD = new ItemQuantumBridgeCard().register(); - public static ItemMagnetCard MAGNET_CARD = new ItemMagnetCard().register(); public static BlockCertusQuartzTank CERTUS_QUARTZ_TANK = new BlockCertusQuartzTank().register(); public static BlockFluidAutoFiller FLUID_AUTO_FILLER = new BlockFluidAutoFiller().register(); public static BlockFluidDiscretizer DISCRETIZER = new BlockFluidDiscretizer().register(); @@ -144,6 +141,9 @@ public static void init() {} public static ItemInfinityLavaStorageCell INFINITY_LAVA_CELL = new ItemInfinityLavaStorageCell().register(); public static ItemBasicFluidStoragePart CELL_PART = new ItemBasicFluidStoragePart().register(); public static ItemFluidStorageHousing CELL_HOUSING = new ItemFluidStorageHousing().register(); + public static ItemEnergyCard ENERGY_CARD = new ItemEnergyCard().register(); + public static ItemQuantumBridgeCard QUANTUM_BRIDGE_CARD = new ItemQuantumBridgeCard().register(); + public static ItemMagnetCard MAGNET_CARD = new ItemMagnetCard().register(); public static void loadSetting() { if (!Config.fluidCells) return; diff --git a/src/main/java/com/glodblock/github/util/Util.java b/src/main/java/com/glodblock/github/util/Util.java index 88918ba96..629dd6880 100644 --- a/src/main/java/com/glodblock/github/util/Util.java +++ b/src/main/java/com/glodblock/github/util/Util.java @@ -1,6 +1,9 @@ package com.glodblock.github.util; -import static com.glodblock.github.common.item.ItemBaseWirelessTerminal.*; +import static com.glodblock.github.common.item.ItemBaseWirelessTerminal.infinityBoosterCard; +import static com.glodblock.github.common.item.ItemBaseWirelessTerminal.infinityEnergyCard; +import static com.glodblock.github.common.item.ItemBaseWirelessTerminal.magnetCard; +import static com.glodblock.github.common.item.ItemBaseWirelessTerminal.restockItems; import static net.minecraft.init.Items.glass_bottle; import java.io.IOException;