Add more pilot types

aesefficio · Aug 23, 2023 · 403116c · 403116c
1 parent 320cebe
commit 403116c
Show file tree

Hide file tree

Showing 78 changed files with 5,308 additions and 180 deletions.
diff --git a/src/main/java/net/aaw/bellsandwhistles/block/ModBlocks.java b/src/main/java/net/aaw/bellsandwhistles/block/ModBlocks.java
@@ -26,8 +26,6 @@ public static <T extends Block, P> NonNullFunction<BlockBuilder<T, P>, BlockBuil
     }
     public static final DeferredRegister<Block> BLOCKS =
             DeferredRegister.create(ForgeRegistries.BLOCKS, BellsAndWhistles.MOD_ID);
-    public static final RegistryObject<Block> METAL_PILOT = registerBlock("metal_pilot",
-            () -> new PilotBlock(BlockBehaviour.Properties.copy(Blocks.IRON_BLOCK).noOcclusion()));
     public static final RegistryObject<Block> ANDESITE_GRAB_RAILS = registerBlock("andesite_grab_rails",
             () -> new MetalGrabRailsBlock(BlockBehaviour.Properties.copy(Blocks.LADDER).sound(SoundType.METAL).noOcclusion()));
     public static final RegistryObject<Block> BRASS_GRAB_RAILS = registerBlock("brass_grab_rails",
@@ -42,6 +40,42 @@ public static <T extends Block, P> NonNullFunction<BlockBuilder<T, P>, BlockBuil
     public static final RegistryObject<Block> COPPER_BOGIE_STEPS = registerBlock("copper_bogie_steps",
             () -> new MetalBogieStepsBlock(BlockBehaviour.Properties.copy(Blocks.LADDER).sound(SoundType.METAL).noOcclusion()));
 
+    public static final RegistryObject<Block> METAL_PILOT = registerBlock("metal_pilot",
+            () -> new PilotBlock(BlockBehaviour.Properties.copy(Blocks.IRON_BLOCK).noOcclusion()));
+    public static final RegistryObject<Block> ANDESITE_PILOT = registerBlock("andesite_pilot",
+            () -> new PilotBlock(BlockBehaviour.Properties.copy(Blocks.IRON_BLOCK).noOcclusion()));
+    public static final RegistryObject<Block> BRASS_PILOT = registerBlock("brass_pilot",
+            () -> new PilotBlock(BlockBehaviour.Properties.copy(Blocks.IRON_BLOCK).noOcclusion()));
+    public static final RegistryObject<Block> COPPER_PILOT = registerBlock("copper_pilot",
+            () -> new PilotBlock(BlockBehaviour.Properties.copy(Blocks.IRON_BLOCK).noOcclusion()));
+    public static final RegistryObject<Block> POLISHED_ANDESITE_PILOT = registerBlock("polished_andesite_pilot",
+            () -> new PilotBlock(BlockBehaviour.Properties.copy(Blocks.IRON_BLOCK).noOcclusion()));
+    public static final RegistryObject<Block> POLISHED_ASURINE_PILOT = registerBlock("polished_asurine_pilot",
+            () -> new PilotBlock(BlockBehaviour.Properties.copy(Blocks.IRON_BLOCK).noOcclusion()));
+    public static final RegistryObject<Block> POLISHED_CALCITE_PILOT = registerBlock("polished_calcite_pilot",
+            () -> new PilotBlock(BlockBehaviour.Properties.copy(Blocks.IRON_BLOCK).noOcclusion()));
+    public static final RegistryObject<Block> POLISHED_CRIMSITE_PILOT = registerBlock("polished_crimsite_pilot",
+            () -> new PilotBlock(BlockBehaviour.Properties.copy(Blocks.IRON_BLOCK).noOcclusion()));
+    public static final RegistryObject<Block> POLISHED_DEEPSLATE_PILOT = registerBlock("polished_deepslate_pilot",
+            () -> new PilotBlock(BlockBehaviour.Properties.copy(Blocks.IRON_BLOCK).noOcclusion()));
+    public static final RegistryObject<Block> POLISHED_DIORITE_PILOT = registerBlock("polished_diorite_pilot",
+            () -> new PilotBlock(BlockBehaviour.Properties.copy(Blocks.IRON_BLOCK).noOcclusion()));
+    public static final RegistryObject<Block> POLISHED_DRIPSTONE_PILOT = registerBlock("polished_dripstone_pilot",
+            () -> new PilotBlock(BlockBehaviour.Properties.copy(Blocks.IRON_BLOCK).noOcclusion()));
+    public static final RegistryObject<Block> POLISHED_GRANITE_PILOT = registerBlock("polished_granite_pilot",
+            () -> new PilotBlock(BlockBehaviour.Properties.copy(Blocks.IRON_BLOCK).noOcclusion()));
+    public static final RegistryObject<Block> POLISHED_LIMESTONE_PILOT = registerBlock("polished_limestone_pilot",
+            () -> new PilotBlock(BlockBehaviour.Properties.copy(Blocks.IRON_BLOCK).noOcclusion()));
+    public static final RegistryObject<Block> POLISHED_OCHRUM_PILOT = registerBlock("polished_ochrum_pilot",
+            () -> new PilotBlock(BlockBehaviour.Properties.copy(Blocks.IRON_BLOCK).noOcclusion()));
+    public static final RegistryObject<Block> POLISHED_SCORCHIA_PILOT = registerBlock("polished_scorchia_pilot",
+            () -> new PilotBlock(BlockBehaviour.Properties.copy(Blocks.IRON_BLOCK).noOcclusion()));
+    public static final RegistryObject<Block> POLISHED_SCORIA_PILOT = registerBlock("polished_scoria_pilot",
+            () -> new PilotBlock(BlockBehaviour.Properties.copy(Blocks.IRON_BLOCK).noOcclusion()));
+    public static final RegistryObject<Block> POLISHED_TUFF_PILOT = registerBlock("polished_tuff_pilot",
+            () -> new PilotBlock(BlockBehaviour.Properties.copy(Blocks.IRON_BLOCK).noOcclusion()));
+    public static final RegistryObject<Block> POLISHED_VERIDIUM_PILOT = registerBlock("polished_veridium_pilot",
+            () -> new PilotBlock(BlockBehaviour.Properties.copy(Blocks.IRON_BLOCK).noOcclusion()));
 
     private static <T extends Block>RegistryObject<Item> registerBlockItem(String name, RegistryObject<T> block) {
         return ModItems.ITEMS.register(name, () -> new BlockItem(block.get(), new Item.Properties()));

diff --git a/src/main/java/net/aaw/bellsandwhistles/item/ModCreativeModeTabs.java b/src/main/java/net/aaw/bellsandwhistles/item/ModCreativeModeTabs.java
@@ -21,14 +21,31 @@ public class ModCreativeModeTabs {
                     .displayItems((pParameters, pOutput) -> {
                         pOutput.accept(ModItems.WOODEN_WHISTLE.get());
                         pOutput.accept(ModItems.BRASS_WHISTLE.get());
-                        pOutput.accept(ModBlocks.METAL_PILOT.get());
+                        pOutput.accept(ModItems.EVANGELION_DISC.get());
                         pOutput.accept(ModBlocks.ANDESITE_GRAB_RAILS.get());
                         pOutput.accept(ModBlocks.BRASS_GRAB_RAILS.get());
                         pOutput.accept(ModBlocks.COPPER_GRAB_RAILS.get());
                         pOutput.accept(ModBlocks.ANDESITE_BOGIE_STEPS.get());
                         pOutput.accept(ModBlocks.BRASS_BOGIE_STEPS.get());
                         pOutput.accept(ModBlocks.COPPER_BOGIE_STEPS.get());
-                        pOutput.accept(ModItems.EVANGELION_DISC.get());
+                        pOutput.accept(ModBlocks.METAL_PILOT.get());
+                        pOutput.accept(ModBlocks.ANDESITE_PILOT.get());
+                        pOutput.accept(ModBlocks.BRASS_PILOT.get());
+                        pOutput.accept(ModBlocks.COPPER_PILOT.get());
+                        pOutput.accept(ModBlocks.POLISHED_ANDESITE_PILOT.get());
+                        pOutput.accept(ModBlocks.POLISHED_GRANITE_PILOT.get());
+                        pOutput.accept(ModBlocks.POLISHED_DIORITE_PILOT.get());
+                        pOutput.accept(ModBlocks.POLISHED_DEEPSLATE_PILOT.get());
+                        pOutput.accept(ModBlocks.POLISHED_DRIPSTONE_PILOT.get());
+                        pOutput.accept(ModBlocks.POLISHED_TUFF_PILOT.get());
+                        pOutput.accept(ModBlocks.POLISHED_CALCITE_PILOT.get());
+                        pOutput.accept(ModBlocks.POLISHED_LIMESTONE_PILOT.get());
+                        pOutput.accept(ModBlocks.POLISHED_SCORIA_PILOT.get());
+                        pOutput.accept(ModBlocks.POLISHED_SCORCHIA_PILOT.get());
+                        pOutput.accept(ModBlocks.POLISHED_CRIMSITE_PILOT.get());
+                        pOutput.accept(ModBlocks.POLISHED_OCHRUM_PILOT.get());
+                        pOutput.accept(ModBlocks.POLISHED_VERIDIUM_PILOT.get());
+                        pOutput.accept(ModBlocks.POLISHED_ASURINE_PILOT.get());
                     })
                     .build());
 

diff --git a/src/main/resources/assets/bellsandwhistles/blockstates/andesite_pilot.json b/src/main/resources/assets/bellsandwhistles/blockstates/andesite_pilot.json
@@ -0,0 +1,19 @@
+{
+  "variants": {
+    "facing=east": {
+      "model": "bellsandwhistles:block/pilots/andesite_pilot",
+      "y": 90
+    },
+    "facing=north": {
+      "model": "bellsandwhistles:block/pilots/andesite_pilot"
+    },
+    "facing=south": {
+      "model": "bellsandwhistles:block/pilots/andesite_pilot",
+      "y": 180
+    },
+    "facing=west": {
+      "model": "bellsandwhistles:block/pilots/andesite_pilot",
+      "y": 270
+    }
+  }
+}
diff --git a/src/main/resources/assets/bellsandwhistles/blockstates/brass_pilot.json b/src/main/resources/assets/bellsandwhistles/blockstates/brass_pilot.json
@@ -0,0 +1,19 @@
+{
+  "variants": {
+    "facing=east": {
+      "model": "bellsandwhistles:block/pilots/brass_pilot",
+      "y": 90
+    },
+    "facing=north": {
+      "model": "bellsandwhistles:block/pilots/brass_pilot"
+    },
+    "facing=south": {
+      "model": "bellsandwhistles:block/pilots/brass_pilot",
+      "y": 180
+    },
+    "facing=west": {
+      "model": "bellsandwhistles:block/pilots/brass_pilot",
+      "y": 270
+    }
+  }
+}
diff --git a/src/main/resources/assets/bellsandwhistles/blockstates/copper_pilot.json b/src/main/resources/assets/bellsandwhistles/blockstates/copper_pilot.json
@@ -0,0 +1,19 @@
+{
+  "variants": {
+    "facing=east": {
+      "model": "bellsandwhistles:block/pilots/copper_pilot",
+      "y": 90
+    },
+    "facing=north": {
+      "model": "bellsandwhistles:block/pilots/copper_pilot"
+    },
+    "facing=south": {
+      "model": "bellsandwhistles:block/pilots/copper_pilot",
+      "y": 180
+    },
+    "facing=west": {
+      "model": "bellsandwhistles:block/pilots/copper_pilot",
+      "y": 270
+    }
+  }
+}
diff --git a/src/main/resources/assets/bellsandwhistles/blockstates/metal_pilot.json b/src/main/resources/assets/bellsandwhistles/blockstates/metal_pilot.json
@@ -1,18 +1,18 @@
 {
   "variants": {
     "facing=east": {
-      "model": "bellsandwhistles:block/metal_pilot",
+      "model": "bellsandwhistles:block/pilots/metal_pilot",
       "y": 90
     },
     "facing=north": {
-      "model": "bellsandwhistles:block/metal_pilot"
+      "model": "bellsandwhistles:block/pilots/metal_pilot"
     },
     "facing=south": {
-      "model": "bellsandwhistles:block/metal_pilot",
+      "model": "bellsandwhistles:block/pilots/metal_pilot",
       "y": 180
     },
     "facing=west": {
-      "model": "bellsandwhistles:block/metal_pilot",
+      "model": "bellsandwhistles:block/pilots/metal_pilot",
       "y": 270
     }
   }

diff --git a/src/main/resources/assets/bellsandwhistles/blockstates/polished_andesite_pilot.json b/src/main/resources/assets/bellsandwhistles/blockstates/polished_andesite_pilot.json
@@ -0,0 +1,19 @@
+{
+  "variants": {
+    "facing=east": {
+      "model": "bellsandwhistles:block/pilots/polished_andesite_pilot",
+      "y": 90
+    },
+    "facing=north": {
+      "model": "bellsandwhistles:block/pilots/polished_andesite_pilot"
+    },
+    "facing=south": {
+      "model": "bellsandwhistles:block/pilots/polished_andesite_pilot",
+      "y": 180
+    },
+    "facing=west": {
+      "model": "bellsandwhistles:block/pilots/polished_andesite_pilot",
+      "y": 270
+    }
+  }
+}
diff --git a/src/main/resources/assets/bellsandwhistles/blockstates/polished_asurine_pilot.json b/src/main/resources/assets/bellsandwhistles/blockstates/polished_asurine_pilot.json
@@ -0,0 +1,19 @@
+{
+  "variants": {
+    "facing=east": {
+      "model": "bellsandwhistles:block/pilots/polished_asurine_pilot",
+      "y": 90
+    },
+    "facing=north": {
+      "model": "bellsandwhistles:block/pilots/polished_asurine_pilot"
+    },
+    "facing=south": {
+      "model": "bellsandwhistles:block/pilots/polished_asurine_pilot",
+      "y": 180
+    },
+    "facing=west": {
+      "model": "bellsandwhistles:block/pilots/polished_asurine_pilot",
+      "y": 270
+    }
+  }
+}
diff --git a/src/main/resources/assets/bellsandwhistles/blockstates/polished_calcite_pilot.json b/src/main/resources/assets/bellsandwhistles/blockstates/polished_calcite_pilot.json
@@ -0,0 +1,19 @@
+{
+  "variants": {
+    "facing=east": {
+      "model": "bellsandwhistles:block/pilots/polished_calcite_pilot",
+      "y": 90
+    },
+    "facing=north": {
+      "model": "bellsandwhistles:block/pilots/polished_calcite_pilot"
+    },
+    "facing=south": {
+      "model": "bellsandwhistles:block/pilots/polished_calcite_pilot",
+      "y": 180
+    },
+    "facing=west": {
+      "model": "bellsandwhistles:block/pilots/polished_calcite_pilot",
+      "y": 270
+    }
+  }
+}
diff --git a/src/main/resources/assets/bellsandwhistles/blockstates/polished_crimsite_pilot.json b/src/main/resources/assets/bellsandwhistles/blockstates/polished_crimsite_pilot.json
@@ -0,0 +1,19 @@
+{
+  "variants": {
+    "facing=east": {
+      "model": "bellsandwhistles:block/pilots/polished_crimsite_pilot",
+      "y": 90
+    },
+    "facing=north": {
+      "model": "bellsandwhistles:block/pilots/polished_crimsite_pilot"
+    },
+    "facing=south": {
+      "model": "bellsandwhistles:block/pilots/polished_crimsite_pilot",
+      "y": 180
+    },
+    "facing=west": {
+      "model": "bellsandwhistles:block/pilots/polished_crimsite_pilot",
+      "y": 270
+    }
+  }
+}
diff --git a/src/main/resources/assets/bellsandwhistles/blockstates/polished_deepslate_pilot.json b/src/main/resources/assets/bellsandwhistles/blockstates/polished_deepslate_pilot.json
@@ -0,0 +1,19 @@
+{
+  "variants": {
+    "facing=east": {
+      "model": "bellsandwhistles:block/pilots/polished_deepslate_pilot",
+      "y": 90
+    },
+    "facing=north": {
+      "model": "bellsandwhistles:block/pilots/polished_deepslate_pilot"
+    },
+    "facing=south": {
+      "model": "bellsandwhistles:block/pilots/polished_deepslate_pilot",
+      "y": 180
+    },
+    "facing=west": {
+      "model": "bellsandwhistles:block/pilots/polished_deepslate_pilot",
+      "y": 270
+    }
+  }
+}
diff --git a/src/main/resources/assets/bellsandwhistles/blockstates/polished_diorite_pilot.json b/src/main/resources/assets/bellsandwhistles/blockstates/polished_diorite_pilot.json
@@ -0,0 +1,19 @@
+{
+  "variants": {
+    "facing=east": {
+      "model": "bellsandwhistles:block/pilots/polished_diorite_pilot",
+      "y": 90
+    },
+    "facing=north": {
+      "model": "bellsandwhistles:block/pilots/polished_diorite_pilot"
+    },
+    "facing=south": {
+      "model": "bellsandwhistles:block/pilots/polished_diorite_pilot",
+      "y": 180
+    },
+    "facing=west": {
+      "model": "bellsandwhistles:block/pilots/polished_diorite_pilot",
+      "y": 270
+    }
+  }
+}
diff --git a/src/main/resources/assets/bellsandwhistles/blockstates/polished_dripstone_pilot.json b/src/main/resources/assets/bellsandwhistles/blockstates/polished_dripstone_pilot.json
@@ -0,0 +1,19 @@
+{
+  "variants": {
+    "facing=east": {
+      "model": "bellsandwhistles:block/pilots/polished_dripstone_pilot",
+      "y": 90
+    },
+    "facing=north": {
+      "model": "bellsandwhistles:block/pilots/polished_dripstone_pilot"
+    },
+    "facing=south": {
+      "model": "bellsandwhistles:block/pilots/polished_dripstone_pilot",
+      "y": 180
+    },
+    "facing=west": {
+      "model": "bellsandwhistles:block/pilots/polished_dripstone_pilot",
+      "y": 270
+    }
+  }
+}
diff --git a/src/main/resources/assets/bellsandwhistles/blockstates/polished_granite_pilot.json b/src/main/resources/assets/bellsandwhistles/blockstates/polished_granite_pilot.json
@@ -0,0 +1,19 @@
+{
+  "variants": {
+    "facing=east": {
+      "model": "bellsandwhistles:block/pilots/polished_granite_pilot",
+      "y": 90
+    },
+    "facing=north": {
+      "model": "bellsandwhistles:block/pilots/polished_granite_pilot"
+    },
+    "facing=south": {
+      "model": "bellsandwhistles:block/pilots/polished_granite_pilot",
+      "y": 180
+    },
+    "facing=west": {
+      "model": "bellsandwhistles:block/pilots/polished_granite_pilot",
+      "y": 270
+    }
+  }
+}
diff --git a/src/main/resources/assets/bellsandwhistles/blockstates/polished_limestone_pilot.json b/src/main/resources/assets/bellsandwhistles/blockstates/polished_limestone_pilot.json
@@ -0,0 +1,19 @@
+{
+  "variants": {
+    "facing=east": {
+      "model": "bellsandwhistles:block/pilots/polished_limestone_pilot",
+      "y": 90
+    },
+    "facing=north": {
+      "model": "bellsandwhistles:block/pilots/polished_limestone_pilot"
+    },
+    "facing=south": {
+      "model": "bellsandwhistles:block/pilots/polished_limestone_pilot",
+      "y": 180
+    },
+    "facing=west": {
+      "model": "bellsandwhistles:block/pilots/polished_limestone_pilot",
+      "y": 270
+    }
+  }
+}
diff --git a/src/main/resources/assets/bellsandwhistles/blockstates/polished_ochrum_pilot.json b/src/main/resources/assets/bellsandwhistles/blockstates/polished_ochrum_pilot.json
@@ -0,0 +1,19 @@
+{
+  "variants": {
+    "facing=east": {
+      "model": "bellsandwhistles:block/pilots/polished_ochrum_pilot",
+      "y": 90
+    },
+    "facing=north": {
+      "model": "bellsandwhistles:block/pilots/polished_ochrum_pilot"
+    },
+    "facing=south": {
+      "model": "bellsandwhistles:block/pilots/polished_ochrum_pilot",
+      "y": 180
+    },
+    "facing=west": {
+      "model": "bellsandwhistles:block/pilots/polished_ochrum_pilot",
+      "y": 270
+    }
+  }
+}