Endermans will now no longer place blocks inside multiblock structures

railcraft-reborn · Sep 29, 2023 · d5a3c59 · d5a3c59
1 parent e9f069b
commit d5a3c59
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 7 deletions.
diff --git a/src/generated/resources/.cache/f6df3207d01926c6f93d9a4a7cc4c4d514c1270c b/src/generated/resources/.cache/f6df3207d01926c6f93d9a4a7cc4c4d514c1270c
@@ -1,4 +1,5 @@
-// 1.20.1	2023-08-28T12:16:15.677719	Railcraft Block Tags
+// 1.20.1	2023-09-29T10:56:55.6776	Railcraft Block Tags
+9732f1964281f5d5e6f3d067e648bb4bfc5cbafb data/forge/tags/blocks/enderman_place_on_blacklist.json
 e36857f35c1bac4bde5a8450008b92cf82656216 data/forge/tags/blocks/ore_rates/dense.json
 8ce5fa4b4f1c2619e124ef387b086d72f9c26f04 data/forge/tags/blocks/ore_rates/singular.json
 c31435450cdbffad0151b7e26a9cc131bf672a75 data/forge/tags/blocks/ores.json

diff --git a/src/generated/resources/data/forge/tags/blocks/enderman_place_on_blacklist.json b/src/generated/resources/data/forge/tags/blocks/enderman_place_on_blacklist.json
@@ -0,0 +1,11 @@
+{
+  "values": [
+    "#railcraft:strengthened_glass",
+    "#railcraft:iron_tank_gauge",
+    "#railcraft:iron_tank_valve",
+    "#railcraft:iron_tank_wall",
+    "#railcraft:steel_tank_gauge",
+    "#railcraft:steel_tank_valve",
+    "#railcraft:steel_tank_wall"
+  ]
+}
diff --git a/src/main/java/mods/railcraft/charge/ChargeNetworkImpl.java b/src/main/java/mods/railcraft/charge/ChargeNetworkImpl.java
@@ -508,7 +508,7 @@ public String toString() {
     }
   }
 
-  private class UsageRecorder {
+  private static class UsageRecorder {
     private final int ticksToRecord;
     private final Consumer<Double> usageConsumer;
 

diff --git a/src/main/java/mods/railcraft/charge/ChargeStorageBlockImpl.java b/src/main/java/mods/railcraft/charge/ChargeStorageBlockImpl.java
@@ -106,7 +106,7 @@ public int getInitialCharge() {
 
   @Override
   public String toString() {
-    return String.format("%s@%s { c:%.2f }", getClass().getSimpleName(),
+    return String.format("%s@%s { energy: %d }", getClass().getSimpleName(),
         Integer.toHexString(hashCode()), this.energy);
   }
 

diff --git a/src/main/java/mods/railcraft/data/RailcraftBlockTagsProvider.java b/src/main/java/mods/railcraft/data/RailcraftBlockTagsProvider.java
@@ -424,6 +424,15 @@ protected void addTags(HolderLookup.Provider provider) {
         .add(RailcraftBlocks.DEEPSLATE_ZINC_ORE.get());
     this.tag(Tags.Blocks.ORES_IN_GROUND_NETHERRACK)
         .add(RailcraftBlocks.FIRESTONE_ORE.get());
+
+    this.tag(Tags.Blocks.ENDERMAN_PLACE_ON_BLACKLIST)
+        .addTag(RailcraftTags.Blocks.STRENGTHENED_GLASS)
+        .addTag(RailcraftTags.Blocks.IRON_TANK_GAUGE)
+        .addTag(RailcraftTags.Blocks.IRON_TANK_VALVE)
+        .addTag(RailcraftTags.Blocks.IRON_TANK_WALL)
+        .addTag(RailcraftTags.Blocks.STEEL_TANK_GAUGE)
+        .addTag(RailcraftTags.Blocks.STEEL_TANK_VALVE)
+        .addTag(RailcraftTags.Blocks.STEEL_TANK_WALL);
   }
 
   @Override

diff --git a/src/main/java/mods/railcraft/gui/widget/FluidGaugeWidget.java b/src/main/java/mods/railcraft/gui/widget/FluidGaugeWidget.java
@@ -34,8 +34,8 @@ public boolean requiresSync(ServerPlayer player) {
   @Override
   public void writeToBuf(ServerPlayer player, FriendlyByteBuf data) {
     super.writeToBuf(player, data);
-    FluidStack fluidStack = tank.getFluid();
-    this.lastSyncedFluidStack = fluidStack.isEmpty() ? FluidStack.EMPTY : fluidStack.copy();
+    var fluidStack = tank.getFluid();
+    this.lastSyncedFluidStack = fluidStack.copy();
     data.writeInt(tank.getCapacity());
     data.writeFluidStack(fluidStack);
   }

diff --git a/src/main/java/mods/railcraft/gui/widget/GaugeWidget.java b/src/main/java/mods/railcraft/gui/widget/GaugeWidget.java
@@ -17,8 +17,7 @@ public GaugeWidget(Gauge gauge, int x, int y, int u, int v, int w, int h) {
     this(gauge, x, y, u, v, w, h, true);
   }
 
-  public GaugeWidget(Gauge gauge, int x, int y, int u, int v, int w, int h,
-      boolean vertical) {
+  public GaugeWidget(Gauge gauge, int x, int y, int u, int v, int w, int h, boolean vertical) {
     super(x, y, u, v, w, h);
     this.gauge = gauge;
     this.vertical = vertical;