Fix #1

恢复缓存指令器的id以确保旧存档的兼容

Author: Circulate233

src/main/java/com/glodblock/github/client/GuiGeneralLevelMaintainer.java

@@ -31,7 +31,7 @@
 
 public class GuiGeneralLevelMaintainer extends AEBaseGui implements IJEIGhostIngredients {
 
-    private static final ResourceLocation TEX_BG = FluidCraft.resource("textures/gui/general_level_maintainer.png");
+    private static final ResourceLocation TEX_BG = FluidCraft.resource("textures/gui/fluid_level_maintainer.png");
 
     private final ContainerGeneralLevelMaintainer cont;
     private final GuiNumberBox[] maintain = new GuiNumberBox[TileGeneralLevelMaintainer.MAX_FLUID];

src/main/java/com/glodblock/github/inventory/FluidConvertingInventoryAdaptor.java

@@ -58,10 +58,10 @@ public static InventoryAdaptor wrap(final ICapabilityProvider capProvider, final
         final DualityInterface dualInterface = getInterfaceTE(inter, face) == null ?
                 null : Objects.requireNonNull(getInterfaceTE(inter, face)).getInterfaceDuality();
         boolean onmi = false;
-        if (inter instanceof TileInterface) {
-            onmi = ((TileInterface) inter).getTargets().size() > 1;
-        } else if (inter instanceof TileDualInterface) {
-            onmi = ((TileDualInterface) inter).getTargets().size() > 1;
+        if (inter instanceof TileInterface i) {
+            onmi = i.getTargets().size() > 1;
+        } else if (inter instanceof TileDualInterface i) {
+            onmi = i.getTargets().size() > 1;
         }
 
         if (dualInterface == null || !((FCDualityInterface) dualInterface).isFluidPacket()) {
@@ -431,8 +431,8 @@ public boolean hasSlots() {
     protected static IInterfaceHost getInterfaceTE(final TileEntity te, final EnumFacing face) {
         if (te instanceof IInterfaceHost) {
             return (IInterfaceHost) te;
-        } else if (te instanceof TileCableBus) {
-            final IPart part = ((TileCableBus) te).getPart(face.getOpposite());
+        } else if (te instanceof TileCableBus p) {
+            final IPart part = p.getPart(face.getOpposite());
             if (part instanceof IInterfaceHost) {
                 return (IInterfaceHost) part;
             }
@@ -444,8 +444,8 @@ protected static IInterfaceHost getInterfaceTE(final TileEntity te, final EnumFa
     protected static IFluidInterfaceHost getFluidInterfaceTE(final TileEntity te, final EnumFacing face) {
         if (te instanceof IFluidInterfaceHost) {
             return (IFluidInterfaceHost) te;
-        } else if (te instanceof TileCableBus) {
-            final IPart part = ((TileCableBus) te).getPart(face.getOpposite());
+        } else if (te instanceof TileCableBus p) {
+            final IPart part = p.getPart(face.getOpposite());
             if (part instanceof IFluidInterfaceHost) {
                 return (IFluidInterfaceHost) part;
             }
@@ -457,8 +457,8 @@ protected static IFluidInterfaceHost getFluidInterfaceTE(final TileEntity te, fi
     protected static Object getGasInterfaceTE(final TileEntity te, final EnumFacing face) {
         if (te instanceof IGasInterfaceHost) {
             return te;
-        } else if (te instanceof TileCableBus) {
-            final IPart part = ((TileCableBus) te).getPart(face.getOpposite());
+        } else if (te instanceof TileCableBus p) {
+            final IPart part = p.getPart(face.getOpposite());
             if (part instanceof IGasInterfaceHost) {
                 return part;
             }
@@ -469,8 +469,8 @@ protected static Object getGasInterfaceTE(final TileEntity te, final EnumFacing
     protected static AENetworkProxy getGasInterfaceGrid(@Nullable final TileEntity te, final EnumFacing face) {
         if (te instanceof IGasInterfaceHost) {
             return Ae2Reflect.getGasInterfaceGrid(((IGasInterfaceHost) te).getDualityGasInterface());
-        } else if (te instanceof TileCableBus) {
-            final IPart part = ((TileCableBus) te).getPart(face.getOpposite());
+        } else if (te instanceof TileCableBus p) {
+            final IPart part = p.getPart(face.getOpposite());
             if (part instanceof IGasInterfaceHost) {
                 return Ae2Reflect.getGasInterfaceGrid(((IGasInterfaceHost) part).getDualityGasInterface());
             }

src/main/java/com/glodblock/github/util/NameConst.java

@@ -13,7 +13,7 @@ public final class NameConst {
     public static final String BLOCK_LARGE_INGREDIENT_BUFFER = "large_ingredient_buffer";
     public static final String BLOCK_BURETTE = "burette";
     public static final String BLOCK_DUAL_INTERFACE = "dual_interface";
-    public static final String BLOCK_GENERAL_LEVEL_MAINTAINER = "general_level_maintainer";
+    public static final String BLOCK_GENERAL_LEVEL_MAINTAINER = "fluid_level_maintainer";
     public static final String BLOCK_FLUID_ASSEMBLER = "fluid_assembler";
     public static final String BLOCK_ULTIMATE_ENCODER = "ultimate_encoder";
     public static final String BLOCK_TRIO_INTERFACE = "trio_interface";

src/main/resources/assets/ae2fc/blockstates/fluid_level_maintainer.json

@@ -0,0 +1,27 @@
+{
+  "variants": {
+    "facing=north": {
+      "model": "ae2fc:fluid_level_maintainer"
+    },
+    "facing=south": {
+      "model": "ae2fc:fluid_level_maintainer",
+      "y": 180
+    },
+    "facing=west": {
+      "model": "ae2fc:fluid_level_maintainer",
+      "y": 270
+    },
+    "facing=east": {
+      "model": "ae2fc:fluid_level_maintainer",
+      "y": 90
+    },
+    "facing=down": {
+      "model": "ae2fc:fluid_level_maintainer",
+      "x": 90
+    },
+    "facing=up": {
+      "model": "ae2fc:fluid_level_maintainer",
+      "x": 270
+    }
+  }
+}

src/main/resources/assets/ae2fc/blockstates/general_level_maintainer.json

@@ -12,7 +12,7 @@ tile.ae2fc:large_ingredient_buffer.name=Large Ingredient Buffer
 tile.ae2fc:burette.name=Precision Burette
 tile.ae2fc:dual_interface.name=ME Dual Interface
 tile.ae2fc:part_dual_interface.name=ME Dual Interface
-tile.ae2fc:general_level_maintainer.name=ME General Level Maintainer
+tile.ae2fc:fluid_level_maintainer.name=ME General Level Maintainer
 tile.ae2fc:fluid_assembler.name=ME Fluid Assembler
 tile.ae2fc:ultimate_encoder.name=ME Ultimate Encoder
 tile.ae2fc:trio_interface.name=ME Trio Interface
@@ -35,7 +35,7 @@ ae2fc.gui.fluid_packet_decoder=ME Fluid Packet Decoder
 ae2fc.gui.ingredient_buffer=Ingredient Buffer
 ae2fc.gui.large_ingredient_buffer=Large Ingredient Buffer
 ae2fc.gui.burette=Precision Burette
-ae2fc.gui.general_level_maintainer=ME General Level Maintainer
+ae2fc.gui.fluid_level_maintainer=ME General Level Maintainer
 ae2fc.gui.fluid_assembler=ME Fluid Assembler
 ae2fc.gui.ultimate_encoder=ME Ultimate Encoder
 ae2fc.gui.item_amount_set=Set Amount

src/main/resources/assets/ae2fc/lang/en_us.lang

@@ -10,7 +10,7 @@ tile.ae2fc:large_ingredient_buffer.name=ME大型材料バッファ
 tile.ae2fc:burette.name=ME精密ビュレット
 tile.ae2fc:dual_interface.name=ME混合インターフェース
 tile.ae2fc:part_dual_interface.name=ME混合インターフェース
-tile.ae2fc:general_level_maintainer.name=ME通用レベルメンテナ
+tile.ae2fc:fluid_level_maintainer.name=ME通用レベルメンテナ
 tile.ae2fc:fluid_assembler.name=ME液体組立機
 tile.ae2fc:ultimate_encoder.name=ME究極エンコーダー
 
@@ -31,7 +31,7 @@ ae2fc.gui.fluid_packet_decoder=ME液体パケットデコーダー
 ae2fc.gui.ingredient_buffer=ME材料バッファ
 ae2fc.gui.large_ingredient_buffer=ME大型材料バッファ
 ae2fc.gui.burette=ME精密ビュレット
-ae2fc.gui.general_level_maintainer=ME通用レベルメンテナ
+ae2fc.gui.fluid_level_maintainer=ME通用レベルメンテナ
 ae2fc.gui.fluid_assembler=ME液体組立機
 ae2fc.gui.ultimate_encoder=ME究極エンコーダー
 ae2fc.gui.item_amount_set=数を設定

src/main/resources/assets/ae2fc/lang/ja_jp.lang

@@ -8,7 +8,7 @@ tile.ae2fc:large_ingredient_buffer.name=Большой буфер ингреди
 tile.ae2fc:burette.name=Точная бюретка
 tile.ae2fc:dual_interface.name=ME Двойной интерфейс
 tile.ae2fc:part_dual_interface.name=ME Двойной интерфейс
-tile.ae2fc:general_level_maintainer.name=ME Устройство поддержания универсального уровня
+tile.ae2fc:fluid_level_maintainer.name=ME Устройство поддержания универсального уровня
 
 item.ae2fc:fluid_drop.name=Капля из %s
 item.ae2fc:fluid_packet.name=Жидкостный пакет
@@ -22,7 +22,7 @@ ae2fc.gui.fluid_packet_decoder=ME Декодер жидкостных пакет
 ae2fc.gui.ingredient_buffer=Буфер ингредиентов
 ae2fc.gui.large_ingredient_buffer=Большой буфер ингредиентов
 ae2fc.gui.burette=Точная бюретка
-ae2fc.gui.general_level_maintainer=ME Устройство поддержания универсального уровня
+ae2fc.gui.fluid_level_maintainer=ME Устройство поддержания универсального уровня
 
 ae2fc.misc.threshold=Порог
 ae2fc.misc.request=Размер партии

src/main/resources/assets/ae2fc/lang/ru_ru.lang

@@ -12,7 +12,7 @@ tile.ae2fc:large_ingredient_buffer.name=大型原材料缓存仓
 tile.ae2fc:burette.name=精准滴定器
 tile.ae2fc:dual_interface.name=ME二合一接口
 tile.ae2fc:part_dual_interface.name=ME二合一接口
-tile.ae2fc:general_level_maintainer.name=ME通用缓存指令器
+tile.ae2fc:fluid_level_maintainer.name=ME通用缓存指令器
 tile.ae2fc:fluid_assembler.name=ME流体装配室
 tile.ae2fc:ultimate_encoder.name=ME终极编码台
 tile.ae2fc:trio_interface.name=ME三合一接口
@@ -35,7 +35,7 @@ ae2fc.gui.fluid_packet_decoder=ME流体封包解码器
 ae2fc.gui.ingredient_buffer=原材料缓存仓
 ae2fc.gui.large_ingredient_buffer=大型原材料缓存仓
 ae2fc.gui.burette=精准滴定器
-ae2fc.gui.general_level_maintainer=ME通用缓存指令器
+ae2fc.gui.fluid_level_maintainer=ME通用缓存指令器
 ae2fc.gui.fluid_assembler=ME流体装配室
 ae2fc.gui.ultimate_encoder=ME终极编码台
 ae2fc.gui.item_amount_set=设置数量

src/main/resources/assets/ae2fc/lang/zh_cn.lang

@@ -0,0 +1,10 @@
+{
+  "parent": "block/orientable",
+  "textures": {
+    "top": "ae2fc:blocks/fluid_level_maintainer_side",
+    "bottom": "ae2fc:blocks/fluid_level_maintainer_side",
+    "front": "ae2fc:blocks/fluid_level_maintainer",
+    "side": "ae2fc:blocks/fluid_level_maintainer_side",
+    "back": "ae2fc:blocks/fluid_level_maintainer_side"
+  }
+}