Merge pull request #272 from nexusnode/bugfixes

Adding of certain items
nexusnode · Mar 5, 2024 · 9d3bd15 · 9d3bd15
2 parents 11fc10d + c342226
commit 9d3bd15
Show file tree

Hide file tree

Showing 292 changed files with 26,243 additions and 105 deletions.
diff --git a/...re/src/main/resources/assets/craftingdead/textures/item/m1garand_ammunition.png b/...re/src/main/resources/assets/craftingdead/textures/item/m1garand_ammunition.png
diff --git a/...ated/resources/assets/craftingdeaddecoration/blockstates/abandoned_campfire_with_pot.json b/...ated/resources/assets/craftingdeaddecoration/blockstates/abandoned_campfire_with_pot.json
@@ -0,0 +1,19 @@
+{
+  "variants": {
+    "facing=north": {
+      "model": "craftingdeaddecoration:block/abandoned_campfire_with_pot"
+    },
+    "facing=south": {
+      "model": "craftingdeaddecoration:block/abandoned_campfire_with_pot",
+      "y": 180
+    },
+    "facing=west": {
+      "model": "craftingdeaddecoration:block/abandoned_campfire_with_pot",
+      "y": 270
+    },
+    "facing=east": {
+      "model": "craftingdeaddecoration:block/abandoned_campfire_with_pot",
+      "y": 90
+    }
+  }
+}
diff --git a/...ated/resources/assets/craftingdeaddecoration/models/item/abandoned_campfire_with_pot.json b/...ated/resources/assets/craftingdeaddecoration/models/item/abandoned_campfire_with_pot.json
@@ -0,0 +1,3 @@
+{
+  "parent": "craftingdeaddecoration:block/abandoned_campfire_with_pot"
+}
diff --git a/crafting-dead-decoration/src/main/java/com/craftingdead/decoration/client/RenderLayers.java b/crafting-dead-decoration/src/main/java/com/craftingdead/decoration/client/RenderLayers.java
@@ -100,17 +100,34 @@ static void register() {
     translucent(DecorationBlocks.QUARTZ_GLASS);
     translucent(DecorationBlocks.VIBRANT_QUARTZ_GLASS);
 
-    cutout(DecorationBlocks.SLEEPING_BAG_CLOSED);
-    cutout(DecorationBlocks.SLEEPING_BAG_CLOSED_BLACK);
-    cutout(DecorationBlocks.SLEEPING_BAG_CLOSED_BLUE);
-    cutout(DecorationBlocks.SLEEPING_BAG_CLOSED_DARKGREEN);
-    cutout(DecorationBlocks.SLEEPING_BAG_CLOSED_ORANGE);
-    cutout(DecorationBlocks.SLEEPING_BAG_CLOSED_PINK);
-    cutout(DecorationBlocks.SLEEPING_BAG_CLOSED_PURPLE);
-    cutout(DecorationBlocks.SLEEPING_BAG_CLOSED_RED);
-    cutout(DecorationBlocks.SLEEPING_BAG_CLOSED_YELLOW);
+    translucent(DecorationBlocks.SLEEPING_BAG_CLOSED);
+    translucent(DecorationBlocks.SLEEPING_BAG_CLOSED_BLACK);
+    translucent(DecorationBlocks.SLEEPING_BAG_CLOSED_BLUE);
+    translucent(DecorationBlocks.SLEEPING_BAG_CLOSED_DARKGREEN);
+    translucent(DecorationBlocks.SLEEPING_BAG_CLOSED_ORANGE);
+    translucent(DecorationBlocks.SLEEPING_BAG_CLOSED_PINK);
+    translucent(DecorationBlocks.SLEEPING_BAG_CLOSED_PURPLE);
+    translucent(DecorationBlocks.SLEEPING_BAG_CLOSED_RED);
+    translucent(DecorationBlocks.SLEEPING_BAG_CLOSED_YELLOW);
 
-    cutout(DecorationBlocks.BOX_OF_BULLETS);
+    translucent(DecorationBlocks.SLEEPING_BAG_OPEN);
+    translucent(DecorationBlocks.SLEEPING_BAG_OPEN_BLACK);
+    translucent(DecorationBlocks.SLEEPING_BAG_OPEN_BLUE);
+    translucent(DecorationBlocks.SLEEPING_BAG_OPEN_DARKGREEN);
+    translucent(DecorationBlocks.SLEEPING_BAG_OPEN_ORANGE);
+    translucent(DecorationBlocks.SLEEPING_BAG_OPEN_PINK);
+    translucent(DecorationBlocks.SLEEPING_BAG_OPEN_PURPLE);
+    translucent(DecorationBlocks.SLEEPING_BAG_OPEN_RED);
+    translucent(DecorationBlocks.SLEEPING_BAG_OPEN_YELLOW);
+
+    cutout(DecorationBlocks.BOXES_OF_BULLETS);
+
+    translucent(DecorationBlocks.FENCE);
+    translucent(DecorationBlocks.SEWER_OPENING);
+    translucent(DecorationBlocks.HL2_GLASS);
+    translucent(DecorationBlocks.HL2_TRASH);
+    translucent(DecorationBlocks.HL2_TRASH_2);
+    translucent(DecorationBlocks.WALL_BUSH);
   }
 
   private static void cutout(Supplier<? extends Block> block) {

diff --git a/...coration/src/main/java/com/craftingdead/decoration/data/DecorationBlockModelProvider.java b/...coration/src/main/java/com/craftingdead/decoration/data/DecorationBlockModelProvider.java
@@ -21,6 +21,7 @@
 import java.util.Set;
 import com.craftingdead.decoration.CraftingDeadDecoration;
 import com.craftingdead.decoration.world.level.block.DecorationBlocks;
+import java.util.Map;
 import net.minecraft.data.DataGenerator;
 import net.minecraft.world.level.block.Block;
 import net.minecraftforge.client.model.generators.BlockModelProvider;

diff --git a/...coration/src/main/java/com/craftingdead/decoration/data/DecorationBlockStateProvider.java b/...coration/src/main/java/com/craftingdead/decoration/data/DecorationBlockStateProvider.java
@@ -186,6 +186,9 @@ protected void registerStatesAndModels() {
     this.horizontalBlock(DecorationBlocks.SLEEPING_BAG_OPEN_PURPLE);
     this.horizontalBlock(DecorationBlocks.SLEEPING_BAG_OPEN_RED);
     this.horizontalBlock(DecorationBlocks.SLEEPING_BAG_OPEN_YELLOW);
+
+    // HL2Pack
+    this.horizontalBlock(DecorationBlocks.HEALTH_CHARGER);
   }
 
   private void simpleBlock(RegistryObject<? extends Block> block) {

diff --git a/...dead-decoration/src/main/java/com/craftingdead/decoration/world/item/DecorationItems.java b/...dead-decoration/src/main/java/com/craftingdead/decoration/world/item/DecorationItems.java
@@ -1028,6 +1028,11 @@ public ItemStack makeIcon() {
           () -> new BlockItem(DecorationBlocks.ABANDONED_CAMPFIRE.get(),
               new Item.Properties().tab(TAB)));
 
+  public static final RegistryObject<Item> ABANDONED_CAMPFIRE_WITH_POT =
+      deferredRegister.register("abandoned_campfire_with_pot",
+          () -> new BlockItem(DecorationBlocks.ABANDONED_CAMPFIRE_WITH_POT.get(),
+              new Item.Properties().tab(TAB)));
+
   public static final RegistryObject<Item> SLEEPING_BAG_CLOSED =
       deferredRegister.register("sleeping_bag_closed",
           () -> new BlockItem(DecorationBlocks.SLEEPING_BAG_CLOSED.get(),
@@ -1102,9 +1107,83 @@ public ItemStack makeIcon() {
           () -> new BlockItem(DecorationBlocks.SLEEPING_BAG_OPEN_YELLOW.get(),
               new Item.Properties().tab(TAB)));
 
-  public static final RegistryObject<Item> BOX_OF_BULLETS =
+  public static final RegistryObject<Item> BOXES_OF_BULLETS =
       deferredRegister.register("box_of_bullets",
-          () -> new BlockItem(DecorationBlocks.BOX_OF_BULLETS.get(),
+          () -> new BlockItem(DecorationBlocks.BOXES_OF_BULLETS.get(),
+              new Item.Properties().tab(TAB)));
+
+  public static final RegistryObject<Item> BOXES_OF_SHOTGUN_SHELLS_RED =
+      deferredRegister.register("boxes_of_shotgun_shells_red",
+          () -> new BlockItem(DecorationBlocks.BOXES_OF_SHOTGUN_SHELLS_RED.get(),
+              new Item.Properties().tab(TAB)));
+  public static final RegistryObject<Item> BOXES_OF_SHOTGUN_SHELLS_GREEN =
+      deferredRegister.register("boxes_of_shotgun_shells_green",
+          () -> new BlockItem(DecorationBlocks.BOXES_OF_SHOTGUN_SHELLS_GREEN.get(),
+              new Item.Properties().tab(TAB)));
+  public static final RegistryObject<Item> BOXES_OF_SHOTGUN_SHELLS_BLUE =
+      deferredRegister.register("boxes_of_shotgun_shells_blue",
+          () -> new BlockItem(DecorationBlocks.BOXES_OF_SHOTGUN_SHELLS_BLUE.get(),
+              new Item.Properties().tab(TAB)));
+
+  public static final RegistryObject<Item> SEWER_OPENING =
+      deferredRegister.register("brown_stained_glass",
+          () -> new BlockItem(DecorationBlocks.SEWER_OPENING.get(),
+              new Item.Properties().tab(TAB)));
+
+  public static final RegistryObject<Item> HL2_GLASS =
+      deferredRegister.register("glass",
+          () -> new BlockItem(DecorationBlocks.HL2_GLASS.get(),
+              new Item.Properties().tab(TAB)));
+
+  public static final RegistryObject<Item> HL2_TRASH =
+      deferredRegister.register("lime_stained_glass",
+          () -> new BlockItem(DecorationBlocks.HL2_TRASH.get(),
+              new Item.Properties().tab(TAB)));
+
+  public static final RegistryObject<Item> HL2_TRASH_2 =
+      deferredRegister.register("pink_stained_glass",
+          () -> new BlockItem(DecorationBlocks.HL2_TRASH_2.get(),
+              new Item.Properties().tab(TAB)));
+
+  public static final RegistryObject<Item> WALL_BUSH =
+      deferredRegister.register("lime_stained_glass_pane",
+          () -> new BlockItem(DecorationBlocks.WALL_BUSH.get(),
+              new Item.Properties().tab(TAB)));
+
+  public static final RegistryObject<Item> COBBLESTONE =
+      deferredRegister.register("cobblestone",
+          () -> new BlockItem(DecorationBlocks.COBBLESTONE.get(),
+              new Item.Properties().tab(TAB)));
+
+  public static final RegistryObject<Item> SMALL_FENCE =
+      deferredRegister.register("nether_brick_fence",
+          () -> new BlockItem(DecorationBlocks.SMALL_FENCE.get(),
+              new Item.Properties().tab(TAB)));
+
+  //HL2Pack Items
+  public static final RegistryObject<Item> HEALTH_CHARGER =
+      deferredRegister.register("acacia_button",
+          () -> new BlockItem(DecorationBlocks.HEALTH_CHARGER.get(),
+              new Item.Properties().tab(TAB)));
+
+  public static final RegistryObject<Item> FENCE =
+      deferredRegister.register("acacia_fence_gate",
+          () -> new BlockItem(DecorationBlocks.FENCE.get(),
+              new Item.Properties().tab(TAB)));
+
+  public static final RegistryObject<Item> METAL_DUCT =
+      deferredRegister.register("acacia_stairs",
+          () -> new BlockItem(DecorationBlocks.METAL_DUCT.get(),
+              new Item.Properties().tab(TAB)));
+
+  public static final RegistryObject<Item> PAINTING_1 =
+      deferredRegister.register("black_stained_glass_pane",
+          () -> new BlockItem(DecorationBlocks.PAINTING_1.get(),
+              new Item.Properties().tab(TAB)));
+
+  public static final RegistryObject<Item> CRATE =
+      deferredRegister.register("dead_brain_coral",
+          () -> new BlockItem(DecorationBlocks.CRATE.get(),
               new Item.Properties().tab(TAB)));
 
   // AE12 Glass

diff --git a/...d-decoration/src/main/java/com/craftingdead/decoration/world/level/block/BlockShapes.java b/...d-decoration/src/main/java/com/craftingdead/decoration/world/level/block/BlockShapes.java
@@ -33,8 +33,11 @@ public class BlockShapes {
   public static final Function<Direction, VoxelShape> FUSE_BOX =
       rotatedOrientableShape(Block.box(1, 0, 13, 15, 20, 16));
 
-  public static final Function<Direction, VoxelShape> BOX_OF_BULLETS =
+  public static final Function<Direction, VoxelShape> BOXES_OF_BULLETS =
       rotatedOrientableShape(Block.box(2, 0, 4, 14, 6, 14));
+
+  public static final Function<Direction, VoxelShape> BOXES_OF_SHOTGUN_SHELLS =
+      rotatedOrientableShape(Block.box(2, 0, 2, 14, 2, 14));
 
   public static final Function<Direction, VoxelShape> POSTER =
       rotatedOrientableShape(Block.box(0, 0, 15, 16, 16, 16));
@@ -128,6 +131,10 @@ public class BlockShapes {
       rotatedOrientableShape(Block.box(5.5D, 3.0D, 11.0D, 10.5D, 13.0D, 16.0D));
 
   public static final Function<Direction, VoxelShape> ABANDONED_CAMPFIRE =
+      rotatedOrientableShape(Shapes.or(
+          Block.box(2, 0, 2, 14, 2, 14)));
+
+  public static final Function<Direction, VoxelShape> ABANDONED_CAMPFIRE_WITH_POT =
       rotatedOrientableShape(Shapes.or(
           Block.box(2, 0, 2, 14, 2, 14),
           Block.box(1, 0, 7.5, 15, 14, 8.5)));
@@ -384,9 +391,21 @@ public class BlockShapes {
   public static final Function<Direction, VoxelShape> DOUBLE_TALL_BLOCK =
       unitOrientableShape(Block.box(0, 0, 0, 16, 32, 16));
 
-  public static final Function<Direction, VoxelShape> SLEEPING_BAG = 
-      unitOrientableShape(Block.box(1, 0, 1, 15, 2, 31));
+  public static final Function<Direction, VoxelShape> SLEEPING_BAG =
+      rotatedOrientableShape(Shapes.or(Block.box(1, 0, 1, 15, 2, 31)));
 
+  public static final Function<Direction, VoxelShape> FENCE =
+      rotatedOrientableShape(Shapes.or(Block.box(-16, 0, 6, 32, 32, 9)));
+
+  public static final Function<Direction, VoxelShape> SMALL_FENCE =
+      rotatedOrientableShape(Shapes.or(Block.box(4, 0, 0, 8, 20, 16)));
+
+  public static final Function<Direction, VoxelShape> WALL_BUSH =
+      rotatedOrientableShape(Shapes.or(Block.box(-16, 0, 0, 32, 32, 3)));
+
+  public static final Function<Direction, VoxelShape> METAL_DUCT =
+      rotatedOrientableShape(Shapes.or(Block.box(0, 0, -16, 16, 25, 16)));
+
   public static final Function<Direction, VoxelShape> BLOCK =
       unitOrientableShape(Shapes.block());