Pipe model rework

.github/workflows/apply-format.yml

@@ -0,0 +1,26 @@
+name: Apply Spotless formatting
+
+on:
+  workflow_dispatch:
+
+jobs:
+  apply-spotless:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    env:
+      GH_TOKEN: ${{ github.token }}
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        fetch-depth: 0 # do a full checkout instead of a shallow clone of HEAD so spotless's ratchetFrom works
+    - name: Setup Build
+      uses: ./.github/actions/build_setup
+    - run: |
+          git config user.name 'github-actions[bot]'
+          git config user.email '41898282+github-actions[bot]@users.noreply.github.com'
+
+          ./gradlew spotlessApply
+
+          git commit -am "Apply spotless formatting"
+          git push

docs/content/Modpacks/Changes/v7.4.0.md

@@ -24,4 +24,3 @@ to
 `roll(RecipeCapability<?> cap, List<Content> chancedEntries, ChanceBoostFunction boostFunction, int recipeTier, int chanceTier, Object2IntMap<?> cache, int times)`
 
 (The chance roll function now also requires the RecipeCapability that is currently being processed to be passed in.)
-

docs/content/Modpacks/Changes/v7.5.0.md

@@ -0,0 +1,50 @@
+---
+title: "Version 7.5.0"
+---
+
+
+# Updating from `7.4.0` to `7.5.0`
+
+## Pipe rendering changes
+_This is only relevant to add-on mods with custom pipe types._
+Addons with custom pipe implementations will have to tweak their code slightly to function with the new rendering code (see example below).
+
+```patch
+-public final PipeModel model = new PipeModel(pipeType.getThickness(), () -> [side texture], () -> [end texture], null, null); 
+-@Getter
+-private final PipeBlockRenderer renderer = new PipeBlockRenderer(model);
+
+ ...
+
+ @Override
+-public PipeModel getPipeModel() {
+-    return model;
++public PipeModel createPipeModel(GTBlockstateProvider provider) {
++    return new PipeModel(this, pipeType.getThickness(), [side texture], [end texture], provider);
+ }
+```
+If your pipe is generated from a material property (or equivalent), you should also call `PipeModel#dynamicModel()`
+to have models be generated at runtime.  
+If so, must also add a **Mod bus** event listener for `RegisterDynamicResourcesEvent`, like so:
+```java
+@SubscribeEvent
+public static void registerDynamicResources(RegisterDynamicResourcesEvent event) {
+   for (var block : MyBlocks.MY_PIPE_BLOCKS) block.get().createPipeModel(RuntimeExistingFileHelper.INSTANCE).dynamicModel();
+}
+```
+Replace `MyBlocks.MY_PIPE_BLOCKS` with a reference to your pipe block array/map value collection.
+
+
+Conversely, if the pipe is **not** generated, but has a constant set of variants (such as optical fiber cables or laser pipes),
+you should **NOT** use `PipeModel#dynamicModel()` and instead set the model with `GTBlockBuilder#gtBlockstate` as such:
+```java
+    // on your pipe block builder
+    ... = REGISTRATE.block(...)
+             .properties(...)
+             .gtBlockstate(GTModels::createPipeBlockModel)
+             ...more builder things...
+             .item(...)
+             .model(NonNullBiConsumer.noop())
+             ...more builder things...
+```
+This makes the pipe model(s) be generated for you without having to process them at runtime.

src/generated/resources/assets/gtceu/blockstates/huge_duct_pipe.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "gtceu:block/huge_duct_pipe"
+    }
+  }
+}

src/generated/resources/assets/gtceu/blockstates/large_duct_pipe.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "gtceu:block/large_duct_pipe"
+    }
+  }
+}

src/generated/resources/assets/gtceu/blockstates/normal_duct_pipe.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "gtceu:block/normal_duct_pipe"
+    }
+  }
+}

src/generated/resources/assets/gtceu/blockstates/normal_laser_pipe.json

@@ -0,0 +1,10 @@
+{
+  "variants": {
+    "active=false": {
+      "model": "gtceu:block/normal_laser_pipe"
+    },
+    "active=true": {
+      "model": "gtceu:block/normal_laser_pipe_active"
+    }
+  }
+}

src/generated/resources/assets/gtceu/blockstates/normal_optical_pipe.json

@@ -0,0 +1,10 @@
+{
+  "variants": {
+    "active=false": {
+      "model": "gtceu:block/normal_optical_pipe"
+    },
+    "active=true": {
+      "model": "gtceu:block/normal_optical_pipe_active"
+    }
+  }
+}

src/generated/resources/assets/gtceu/blockstates/small_duct_pipe.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "gtceu:block/small_duct_pipe"
+    }
+  }
+}

src/generated/resources/assets/gtceu/models/block/huge_duct_pipe.json

@@ -0,0 +1,55 @@
+{
+  "parent": "gtceu:block/pipe/huge_duct_pipe/center",
+  "loader": "gtceu:pipe",
+  "parts": {
+    "center": {
+      "model": "gtceu:block/pipe/huge_duct_pipe/center"
+    },
+    "down": {
+      "model": "gtceu:block/pipe/huge_duct_pipe/connection"
+    },
+    "east": {
+      "model": "gtceu:block/pipe/huge_duct_pipe/connection",
+      "x": 90,
+      "y": 270
+    },
+    "north": {
+      "model": "gtceu:block/pipe/huge_duct_pipe/connection",
+      "x": 90,
+      "y": 180
+    },
+    "south": {
+      "model": "gtceu:block/pipe/huge_duct_pipe/connection",
+      "x": 90
+    },
+    "up": {
+      "model": "gtceu:block/pipe/huge_duct_pipe/connection",
+      "x": 180
+    },
+    "west": {
+      "model": "gtceu:block/pipe/huge_duct_pipe/connection",
+      "x": 90,
+      "y": 90
+    }
+  },
+  "restrictors": {
+    "down": {
+      "model": "gtceu:block/pipe/restrictor/down/thickness_14.0"
+    },
+    "east": {
+      "model": "gtceu:block/pipe/restrictor/east/thickness_14.0"
+    },
+    "north": {
+      "model": "gtceu:block/pipe/restrictor/north/thickness_14.0"
+    },
+    "south": {
+      "model": "gtceu:block/pipe/restrictor/south/thickness_14.0"
+    },
+    "up": {
+      "model": "gtceu:block/pipe/restrictor/up/thickness_14.0"
+    },
+    "west": {
+      "model": "gtceu:block/pipe/restrictor/west/thickness_14.0"
+    }
+  }
+}

src/generated/resources/assets/gtceu/models/block/large_duct_pipe.json

@@ -0,0 +1,55 @@
+{
+  "parent": "gtceu:block/pipe/large_duct_pipe/center",
+  "loader": "gtceu:pipe",
+  "parts": {
+    "center": {
+      "model": "gtceu:block/pipe/large_duct_pipe/center"
+    },
+    "down": {
+      "model": "gtceu:block/pipe/large_duct_pipe/connection"
+    },
+    "east": {
+      "model": "gtceu:block/pipe/large_duct_pipe/connection",
+      "x": 90,
+      "y": 270
+    },
+    "north": {
+      "model": "gtceu:block/pipe/large_duct_pipe/connection",
+      "x": 90,
+      "y": 180
+    },
+    "south": {
+      "model": "gtceu:block/pipe/large_duct_pipe/connection",
+      "x": 90
+    },
+    "up": {
+      "model": "gtceu:block/pipe/large_duct_pipe/connection",
+      "x": 180
+    },
+    "west": {
+      "model": "gtceu:block/pipe/large_duct_pipe/connection",
+      "x": 90,
+      "y": 90
+    }
+  },
+  "restrictors": {
+    "down": {
+      "model": "gtceu:block/pipe/restrictor/down/thickness_12.0"
+    },
+    "east": {
+      "model": "gtceu:block/pipe/restrictor/east/thickness_12.0"
+    },
+    "north": {
+      "model": "gtceu:block/pipe/restrictor/north/thickness_12.0"
+    },
+    "south": {
+      "model": "gtceu:block/pipe/restrictor/south/thickness_12.0"
+    },
+    "up": {
+      "model": "gtceu:block/pipe/restrictor/up/thickness_12.0"
+    },
+    "west": {
+      "model": "gtceu:block/pipe/restrictor/west/thickness_12.0"
+    }
+  }
+}

src/generated/resources/assets/gtceu/models/block/normal_duct_pipe.json

@@ -0,0 +1,55 @@
+{
+  "parent": "gtceu:block/pipe/normal_duct_pipe/center",
+  "loader": "gtceu:pipe",
+  "parts": {
+    "center": {
+      "model": "gtceu:block/pipe/normal_duct_pipe/center"
+    },
+    "down": {
+      "model": "gtceu:block/pipe/normal_duct_pipe/connection"
+    },
+    "east": {
+      "model": "gtceu:block/pipe/normal_duct_pipe/connection",
+      "x": 90,
+      "y": 270
+    },
+    "north": {
+      "model": "gtceu:block/pipe/normal_duct_pipe/connection",
+      "x": 90,
+      "y": 180
+    },
+    "south": {
+      "model": "gtceu:block/pipe/normal_duct_pipe/connection",
+      "x": 90
+    },
+    "up": {
+      "model": "gtceu:block/pipe/normal_duct_pipe/connection",
+      "x": 180
+    },
+    "west": {
+      "model": "gtceu:block/pipe/normal_duct_pipe/connection",
+      "x": 90,
+      "y": 90
+    }
+  },
+  "restrictors": {
+    "down": {
+      "model": "gtceu:block/pipe/restrictor/down/thickness_8.0"
+    },
+    "east": {
+      "model": "gtceu:block/pipe/restrictor/east/thickness_8.0"
+    },
+    "north": {
+      "model": "gtceu:block/pipe/restrictor/north/thickness_8.0"
+    },
+    "south": {
+      "model": "gtceu:block/pipe/restrictor/south/thickness_8.0"
+    },
+    "up": {
+      "model": "gtceu:block/pipe/restrictor/up/thickness_8.0"
+    },
+    "west": {
+      "model": "gtceu:block/pipe/restrictor/west/thickness_8.0"
+    }
+  }
+}

src/generated/resources/assets/gtceu/models/block/normal_laser_pipe.json

@@ -0,0 +1,55 @@
+{
+  "parent": "gtceu:block/pipe/normal_laser_pipe/center",
+  "loader": "gtceu:pipe",
+  "parts": {
+    "center": {
+      "model": "gtceu:block/pipe/normal_laser_pipe/center"
+    },
+    "down": {
+      "model": "gtceu:block/pipe/normal_laser_pipe/connection"
+    },
+    "east": {
+      "model": "gtceu:block/pipe/normal_laser_pipe/connection",
+      "x": 90,
+      "y": 270
+    },
+    "north": {
+      "model": "gtceu:block/pipe/normal_laser_pipe/connection",
+      "x": 90,
+      "y": 180
+    },
+    "south": {
+      "model": "gtceu:block/pipe/normal_laser_pipe/connection",
+      "x": 90
+    },
+    "up": {
+      "model": "gtceu:block/pipe/normal_laser_pipe/connection",
+      "x": 180
+    },
+    "west": {
+      "model": "gtceu:block/pipe/normal_laser_pipe/connection",
+      "x": 90,
+      "y": 90
+    }
+  },
+  "restrictors": {
+    "down": {
+      "model": "gtceu:block/pipe/restrictor/down/thickness_6.0"
+    },
+    "east": {
+      "model": "gtceu:block/pipe/restrictor/east/thickness_6.0"
+    },
+    "north": {
+      "model": "gtceu:block/pipe/restrictor/north/thickness_6.0"
+    },
+    "south": {
+      "model": "gtceu:block/pipe/restrictor/south/thickness_6.0"
+    },
+    "up": {
+      "model": "gtceu:block/pipe/restrictor/up/thickness_6.0"
+    },
+    "west": {
+      "model": "gtceu:block/pipe/restrictor/west/thickness_6.0"
+    }
+  }
+}