Added the new textures and adjusted our models

build.gradle

@@ -317,13 +317,13 @@ dependencies {
     compileOnly fg.deobf("com.ldtteam:domum_ornamentum:${domumornamentum_version}:universal")
     compileOnly fg.deobf("com.ldtteam:blockui:${blockui_version}")
     // IMPORTANT. This should be removed/uncommented when running `runData`
-    runtimeOnly fg.deobf("com.ldtteam:minecolonies:${minecolonies_version}")
-    runtimeOnly fg.deobf("com.ldtteam:structurize:${structurize_version}")
-    runtimeOnly fg.deobf("com.ldtteam:multipiston:${multipiston_version}")
-    runtimeOnly fg.deobf("com.ldtteam:domum_ornamentum:${domumornamentum_version}:universal")
-    runtimeOnly fg.deobf("com.ldtteam:blockui:${blockui_version}")
+    //runtimeOnly fg.deobf("com.ldtteam:minecolonies:${minecolonies_version}")
+    //runtimeOnly fg.deobf("com.ldtteam:structurize:${structurize_version}")
+    //runtimeOnly fg.deobf("com.ldtteam:multipiston:${multipiston_version}")
+    //runtimeOnly fg.deobf("com.ldtteam:domum_ornamentum:${domumornamentum_version}:universal")
+    //runtimeOnly fg.deobf("com.ldtteam:blockui:${blockui_version}")
 
-    //Patchouli
+    // Patchouli
     runtimeOnly fg.deobf("vazkii.patchouli:Patchouli:${patchouli_version}")
 
     // Create

src/generated/resources/.cache/b8526e444ae7356037f3a813274f6835d1f3dd16

@@ -1,4 +1,4 @@
-// 1.19.2	2023-09-25T15:21:21.7763015	Block States: advancedperipherals
+// 1.19.2	2024-05-01T21:37:27.0678801	Block States: advancedperipherals
 5e28ce1be9a6996d982641e5df1fa7162090b8cc assets/advancedperipherals/blockstates/block_reader.json
 f42bdde60f84fdb312f7cf3b2be461d9c11ebdc8 assets/advancedperipherals/blockstates/chat_box.json
 1227aa092fcf1327547ace6ccc9db230e45891b0 assets/advancedperipherals/blockstates/colony_integrator.json
@@ -13,15 +13,15 @@ ff12c7217911184266589813a2c8f9b0d46cfd65 assets/advancedperipherals/blockstates/
 726cf2599b0c765bcfacda88a1943be74f985877 assets/advancedperipherals/blockstates/redstone_integrator.json
 6b176e8fdb048f7b6678bfbc1c4baf2bcfa67a1f assets/advancedperipherals/blockstates/rs_bridge.json
 544ff1ecb58622350b58940036b4b1908e1146da assets/advancedperipherals/models/block/block_reader.json
-b28693973b6bbbb61e0c1ffc59e8ca98d8bb7e97 assets/advancedperipherals/models/block/chat_box.json
-8361da86b709e26f17374dfd46637940894a2212 assets/advancedperipherals/models/block/colony_integrator.json
-96ef564804fdc2b5184462747935f52baa35c651 assets/advancedperipherals/models/block/energy_detector.json
-41556ddf5c5e67def6efd8e2e0645718d950af25 assets/advancedperipherals/models/block/environment_detector.json
-ba233597a497c1032d884fc3058e27b9d965725e assets/advancedperipherals/models/block/geo_scanner.json
-fb58e0b712f1f6ce1b2ea4dcfa0747905cf6ed95 assets/advancedperipherals/models/block/inventory_manager.json
-75b59d2b73a96a27e3d4a1ed3b9a928b7dff102e assets/advancedperipherals/models/block/me_bridge.json
-a647b86b8a7862af738136c9375a5d27d3b08860 assets/advancedperipherals/models/block/nbt_storage.json
+dab55424ec184c5495c7ca11e5bbe77210e04c26 assets/advancedperipherals/models/block/chat_box.json
+7e207db9b2b170f52565c8ed23bcc92762be6c4d assets/advancedperipherals/models/block/colony_integrator.json
+1e9a2e3931bfe77f2d42a95c539b365c4517095d assets/advancedperipherals/models/block/energy_detector.json
+434c2505b18d1313c0377c6bf8d5e4dba93765cc assets/advancedperipherals/models/block/environment_detector.json
+51ab0a2a78453e711e6aa3c3020b9658bf379628 assets/advancedperipherals/models/block/geo_scanner.json
+32f7941037838f9d77c5c3a4eb3b56c8786e500e assets/advancedperipherals/models/block/inventory_manager.json
+674d6ee74ef7fd0360c0e1ea0b2e21734f67c096 assets/advancedperipherals/models/block/me_bridge.json
+65cdb0ff57aa8439c5d80eea5c741866da9af81e assets/advancedperipherals/models/block/nbt_storage.json
 36b6ac01be085492aa6298eeb89e6ecaa3cb6f82 assets/advancedperipherals/models/block/peripheral_casing.json
-40369caaaf2f593d786a9c64284647fed8ae3a47 assets/advancedperipherals/models/block/player_detector.json
-bed2ba2ba497ccde06c99712483fe220c277b4be assets/advancedperipherals/models/block/redstone_integrator.json
-019c10d5062b5e7ae3e641527b9badab7a50878d assets/advancedperipherals/models/block/rs_bridge.json
+120df29f21059aa9d4dff53bbb80953dee8d5214 assets/advancedperipherals/models/block/player_detector.json
+d08b8946e1eb01cc9c8af4fa297b582614d1034b assets/advancedperipherals/models/block/redstone_integrator.json
+15685a3c58f78db663609d56ee6fdb29652eef5f assets/advancedperipherals/models/block/rs_bridge.json

src/generated/resources/.cache/f95c7003282837dabaa33e3ffceec4e6865b5218

@@ -1,4 +1,4 @@
-// 1.19.2	2023-09-25T15:21:21.7713005	Block tags
-c4d65b1ce5b5b3ed603cbcc87cc47338be4406fe data/forge/tags/blocks/needs_wood_tool.json
+// 1.19.2	2024-05-01T21:24:42.041223	Block tags
+e1f71dcb4f9e7e36e29b0ad09d6520dc3adfa4a6 data/forge/tags/blocks/needs_wood_tool.json
 ef4684e10e5054e8cfd515dffa4a98169d281078 data/minecraft/tags/blocks/mineable/pickaxe.json
-26803b7d98247a3df6ee256ceb9509a2ad1ec2e5 data/minecraft/tags/blocks/needs_iron_tool.json
+8de9358ffeaa8d5f015774f70244a93b915427b8 data/minecraft/tags/blocks/needs_iron_tool.json

src/generated/resources/assets/advancedperipherals/models/block/chat_box.json

@@ -3,6 +3,7 @@
   "textures": {
     "all": "advancedperipherals:block/chat_box",
     "north": "advancedperipherals:block/chat_box_front",
-    "particle": "advancedperipherals:block/chat_box_front"
+    "particle": "advancedperipherals:block/chat_box_front",
+    "up": "advancedperipherals:block/chat_box_top"
   }
 }

src/generated/resources/assets/advancedperipherals/models/block/colony_integrator.json

@@ -2,8 +2,8 @@
   "parent": "minecraft:block/cube_all",
   "textures": {
     "all": "advancedperipherals:block/colony_integrator",
-    "down": "minecraft:block/oak_log_top",
-    "particle": "advancedperipherals:block/colony_integrator",
-    "up": "minecraft:block/oak_log_top"
+    "north": "advancedperipherals:block/colony_integrator_front",
+    "particle": "advancedperipherals:block/colony_integrator_front",
+    "up": "advancedperipherals:block/colony_integrator_top"
   }
 }

src/generated/resources/assets/advancedperipherals/models/block/energy_detector.json

@@ -2,8 +2,10 @@
   "parent": "minecraft:block/cube_all",
   "textures": {
     "all": "advancedperipherals:block/energy_detector",
+    "east": "advancedperipherals:block/energy_detector_east",
     "north": "advancedperipherals:block/energy_detector_front",
     "particle": "advancedperipherals:block/energy_detector_front",
-    "south": "advancedperipherals:block/energy_detector_back"
+    "south": "advancedperipherals:block/energy_detector_back",
+    "up": "advancedperipherals:block/energy_detector_top"
   }
 }

src/generated/resources/assets/advancedperipherals/models/block/environment_detector.json

@@ -3,6 +3,7 @@
   "textures": {
     "all": "advancedperipherals:block/environment_detector",
     "north": "advancedperipherals:block/environment_detector_front",
-    "particle": "advancedperipherals:block/environment_detector_front"
+    "particle": "advancedperipherals:block/environment_detector_front",
+    "up": "advancedperipherals:block/environment_detector_top"
   }
 }

src/generated/resources/assets/advancedperipherals/models/block/geo_scanner.json

@@ -3,6 +3,7 @@
   "textures": {
     "all": "advancedperipherals:block/geo_scanner",
     "north": "advancedperipherals:block/geo_scanner_front",
-    "particle": "advancedperipherals:block/geo_scanner_front"
+    "particle": "advancedperipherals:block/geo_scanner_front",
+    "up": "advancedperipherals:block/geo_scanner_top"
   }
 }

src/generated/resources/assets/advancedperipherals/models/block/inventory_manager.json

@@ -3,6 +3,7 @@
   "textures": {
     "all": "advancedperipherals:block/inventory_manager",
     "north": "advancedperipherals:block/inventory_manager_front",
-    "particle": "advancedperipherals:block/inventory_manager_front"
+    "particle": "advancedperipherals:block/inventory_manager_front",
+    "up": "advancedperipherals:block/inventory_manager_top"
   }
 }

src/generated/resources/assets/advancedperipherals/models/block/me_bridge.json

@@ -3,6 +3,7 @@
   "textures": {
     "all": "advancedperipherals:block/me_bridge",
     "north": "advancedperipherals:block/me_bridge_front",
-    "particle": "advancedperipherals:block/me_bridge_front"
+    "particle": "advancedperipherals:block/me_bridge_front",
+    "up": "advancedperipherals:block/me_bridge_top"
   }
 }

src/generated/resources/assets/advancedperipherals/models/block/nbt_storage.json

@@ -3,6 +3,7 @@
   "textures": {
     "all": "advancedperipherals:block/nbt_storage",
     "north": "advancedperipherals:block/nbt_storage_front",
-    "particle": "advancedperipherals:block/nbt_storage_front"
+    "particle": "advancedperipherals:block/nbt_storage_front",
+    "up": "advancedperipherals:block/nbt_storage_top"
   }
 }

src/generated/resources/assets/advancedperipherals/models/block/player_detector.json

@@ -1,12 +1,12 @@
 {
   "parent": "minecraft:block/cube_all",
   "textures": {
-    "all": "advancedperipherals:block/player_detector",
     "east": "advancedperipherals:block/player_detector_side",
     "north": "advancedperipherals:block/player_detector_front",
     "particle": "advancedperipherals:block/player_detector_front",
     "side": "advancedperipherals:block/player_detector_side",
     "south": "advancedperipherals:block/player_detector_side",
+    "up": "advancedperipherals:block/player_detector_top",
     "west": "advancedperipherals:block/player_detector_side"
   }
 }

src/generated/resources/assets/advancedperipherals/models/block/redstone_integrator.json

@@ -1,8 +1,13 @@
 {
   "parent": "minecraft:block/cube_all",
   "textures": {
-    "all": "advancedperipherals:block/redstone_integrator",
+    "down": "advancedperipherals:block/redstone_integrator_bottom",
+    "east": "advancedperipherals:block/redstone_integrator_side",
     "north": "advancedperipherals:block/redstone_integrator_front",
-    "particle": "advancedperipherals:block/redstone_integrator_front"
+    "particle": "advancedperipherals:block/redstone_integrator_front",
+    "side": "advancedperipherals:block/redstone_integrator_side",
+    "south": "advancedperipherals:block/redstone_integrator_side",
+    "up": "advancedperipherals:block/redstone_integrator_top",
+    "west": "advancedperipherals:block/redstone_integrator_side"
   }
 }

src/generated/resources/assets/advancedperipherals/models/block/rs_bridge.json

@@ -3,6 +3,7 @@
   "textures": {
     "all": "advancedperipherals:block/rs_bridge",
     "north": "advancedperipherals:block/rs_bridge_front",
-    "particle": "advancedperipherals:block/rs_bridge_front"
+    "particle": "advancedperipherals:block/rs_bridge_front",
+    "up": "advancedperipherals:block/rs_bridge_top"
   }
 }

src/generated/resources/data/forge/tags/blocks/needs_wood_tool.json

@@ -1,6 +1,5 @@
 {
   "values": [
-    "advancedperipherals:peripheral_casing",
-    "advancedperipherals:colony_integrator"
+    "advancedperipherals:peripheral_casing"
   ]
 }

src/generated/resources/data/minecraft/tags/blocks/needs_iron_tool.json

@@ -12,6 +12,7 @@
     "advancedperipherals:redstone_integrator",
     "advancedperipherals:block_reader",
     "advancedperipherals:geo_scanner",
+    "advancedperipherals:colony_integrator",
     "advancedperipherals:nbt_storage",
     "advancedperipherals:distance_detector"
   ]

src/main/java/de/srendi/advancedperipherals/common/data/BlockStatesAndModelsProvider.java

@@ -20,22 +20,19 @@ public BlockStatesAndModelsProvider(DataGenerator packOutput, ExistingFileHelper
 
     @Override
     protected void registerStatesAndModels() {
-        peripheralBlock(APBlocks.ENVIRONMENT_DETECTOR.get(), "front");
-        peripheralBlock(APBlocks.CHAT_BOX.get(), "front");
-        peripheralBlock(APBlocks.PLAYER_DETECTOR.get(), "side", "front");
-        peripheralBlock(APBlocks.ME_BRIDGE.get(), "front");
-        peripheralBlock(APBlocks.RS_BRIDGE.get(), "front");
-        peripheralBlock(APBlocks.ENERGY_DETECTOR.get(), "front", "back");
+        peripheralBlock(APBlocks.ENVIRONMENT_DETECTOR.get(), "front", "top");
+        peripheralBlock(APBlocks.CHAT_BOX.get(), "front", "top");
+        peripheralBlock(APBlocks.PLAYER_DETECTOR.get(), generateModel(APBlocks.PLAYER_DETECTOR.get(), false, "side", "front", "top"));
+        peripheralBlock(APBlocks.ME_BRIDGE.get(), "front", "top");
+        peripheralBlock(APBlocks.RS_BRIDGE.get(), "front", "top");
+        peripheralBlock(APBlocks.ENERGY_DETECTOR.get(), "front", "back", "top", "east");
         peripheralBlock(APBlocks.PERIPHERAL_CASING.get());
-        peripheralBlock(APBlocks.INVENTORY_MANAGER.get(), "front");
-        peripheralBlock(APBlocks.REDSTONE_INTEGRATOR.get(), "front");
+        peripheralBlock(APBlocks.INVENTORY_MANAGER.get(), "front", "top");
+        peripheralBlock(APBlocks.REDSTONE_INTEGRATOR.get(), generateModel(APBlocks.REDSTONE_INTEGRATOR.get(), false,"side", "front", "top", "bottom"));
         peripheralBlock(APBlocks.BLOCK_READER.get(), generateModel(APBlocks.BLOCK_READER.get(), false, "north", "south", "east", "west", "up", "down"));
-        peripheralBlock(APBlocks.GEO_SCANNER.get(), "front");
-        peripheralBlock(APBlocks.COLONY_INTEGRATOR.get(), generateModel(APBlocks.COLONY_INTEGRATOR.get())
-                .texture("particle", blockTexture(APBlocks.COLONY_INTEGRATOR.get()))
-                .texture("up", blockTexture(net.minecraft.world.level.block.Blocks.OAK_LOG, "top"))
-                .texture("down", blockTexture(net.minecraft.world.level.block.Blocks.OAK_LOG, "top")));
-        peripheralBlock(APBlocks.NBT_STORAGE.get(), "front");
+        peripheralBlock(APBlocks.GEO_SCANNER.get(), "front", "top");
+        peripheralBlock(APBlocks.COLONY_INTEGRATOR.get(), "front", "top");
+        peripheralBlock(APBlocks.NBT_STORAGE.get(), "front", "top");
     }
 
     private void peripheralBlock(Block block, ModelFile file) {
@@ -81,10 +78,14 @@ private BlockModelBuilder generateModel(Block block, boolean hasNormalSide, Stri
                 side = "north";
                 particleTexture = blockTexture(block, "front");
             }
-            if (side.equals("back")) side = "south";
+            if (side.equals("top"))
+                side = "up";
+            if (side.equals("bottom"))
+                side = "down";
+            if (side.equals("back"))
+                side = "south";
             builder.texture(side, blockTexture(block, sideTexture));
 
-
         }
         builder.texture("particle", particleTexture);
         return builder;

src/main/resources/assets/advancedperipherals/textures/block/block_reader_north.png.mcmeta

@@ -0,0 +1,6 @@
+{
+  "animation": {
+    "interpolate": true,
+    "frametime": 2
+  }
+}

src/main/resources/assets/advancedperipherals/textures/block/chat_box_front.png.mcmeta

@@ -0,0 +1,6 @@
+{
+  "animation": {
+    "interpolate": false,
+    "frametime": 2
+  }
+}

src/main/resources/assets/advancedperipherals/textures/block/colony_integrator_front.png.mcmeta

@@ -0,0 +1,6 @@
+{
+  "animation": {
+    "interpolate": false,
+    "frametime": 4
+  }
+}

src/main/resources/assets/advancedperipherals/textures/block/energy_detector_east.png.mcmeta

@@ -0,0 +1,6 @@
+{
+  "animation": {
+    "interpolate": false,
+    "frametime": 2
+  }
+}

src/main/resources/assets/advancedperipherals/textures/block/environment_detector_front.png.mcmeta

@@ -0,0 +1,6 @@
+{
+  "animation": {
+    "interpolate": false,
+    "frametime": 4
+  }
+}

src/main/resources/assets/advancedperipherals/textures/block/fluid_detector_front.png.mcmeta

@@ -0,0 +1,6 @@
+{
+  "animation": {
+    "interpolate": false,
+    "frametime": 2
+  }
+}

src/main/resources/assets/advancedperipherals/textures/block/gas_detector_front.png.mcmeta

@@ -0,0 +1,6 @@
+{
+  "animation": {
+    "interpolate": false,
+    "frametime": 2
+  }
+}

src/main/resources/assets/advancedperipherals/textures/block/geo_scanner_front.png.mcmeta

@@ -0,0 +1,6 @@
+{
+  "animation": {
+    "interpolate": true,
+    "frametime": 4
+  }
+}

src/main/resources/assets/advancedperipherals/textures/block/me_bridge_front.png.mcmeta

@@ -0,0 +1,6 @@
+{
+  "animation": {
+    "interpolate": false,
+    "frametime": 2
+  }
+}

src/main/resources/assets/advancedperipherals/textures/block/nbt_storage_front.png.mcmeta

@@ -0,0 +1,6 @@
+{
+  "animation": {
+    "interpolate": false,
+    "frametime": 2
+  }
+}

src/main/resources/assets/advancedperipherals/textures/block/redstone_integrator_front.png.mcmeta

@@ -0,0 +1,6 @@
+{
+  "animation": {
+    "interpolate": false,
+    "frametime": 2
+  }
+}

src/main/resources/assets/advancedperipherals/textures/block/rs_bridge_front.png.mcmeta

@@ -0,0 +1,6 @@
+{
+  "animation": {
+    "interpolate": false,
+    "frametime": 2
+  }
+}

src/testMod/java/de/srendi/advancedperipherals/gametest/TestGameTests.java

@@ -0,0 +1,17 @@
+package de.srendi.advancedperipherals.gametest;
+
+import net.minecraft.gametest.framework.GameTest;
+import net.minecraft.gametest.framework.GameTestHelper;
+import net.minecraftforge.gametest.GameTestHolder;
+import net.minecraftforge.gametest.PrefixGameTestTemplate;
+
+@GameTestHolder("advancedperipheralstest")
+public class TestGameTests {
+
+    @PrefixGameTestTemplate(false)
+    @GameTest(templateNamespace = "advancedperipheralstest")
+    public static void envDetectorTest(GameTestHelper helper) {
+        helper.succeed();
+    }
+
+}