Web Torch and Web String Blocks

src/main/generated/assets/galacticraft/blockstates/web_string.json

@@ -0,0 +1,16 @@
+{
+  "variants": {
+    "web_string_part=bottom": {
+      "model": "galacticraft:block/web_string_bottom"
+    },
+    "web_string_part=middle": {
+      "model": "galacticraft:block/web_string_middle"
+    },
+    "web_string_part=top": {
+      "model": "galacticraft:block/web_string_top"
+    },
+    "web_string_part=top_bottom": {
+      "model": "galacticraft:block/web_string_top_bottom"
+    }
+  }
+}

src/main/generated/assets/galacticraft/blockstates/web_torch.json

@@ -0,0 +1,10 @@
+{
+  "variants": {
+    "top=false": {
+      "model": "galacticraft:block/web_torch"
+    },
+    "top=true": {
+      "model": "galacticraft:block/web_torch_top"
+    }
+  }
+}

src/main/generated/assets/galacticraft/lang/en_us.json

@@ -386,6 +386,8 @@
   "block.galacticraft.venus_tin_ore": "Venus Tin Ore",
   "block.galacticraft.volcanic_rock": "Volcanic Rock",
   "block.galacticraft.walkway": "Walkway",
+  "block.galacticraft.web_string": "Web String",
+  "block.galacticraft.web_torch": "Web Torch",
   "block.galacticraft.white_candle_moon_cheese_wheel": "Moon Cheese Wheel with White Candle",
   "block.galacticraft.white_glass_fluid_pipe": "White Stained Glass Fluid Pipe",
   "block.galacticraft.wire_walkway": "Wire Walkway",

src/main/generated/assets/galacticraft/models/block/web_string_bottom.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cross",
+  "textures": {
+    "cross": "galacticraft:block/web_string_bottom"
+  }
+}

src/main/generated/assets/galacticraft/models/block/web_string_middle.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cross",
+  "textures": {
+    "cross": "galacticraft:block/web_string_middle"
+  }
+}

src/main/generated/assets/galacticraft/models/block/web_string_top.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cross",
+  "textures": {
+    "cross": "galacticraft:block/web_string_top"
+  }
+}

src/main/generated/assets/galacticraft/models/block/web_string_top_bottom.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cross",
+  "textures": {
+    "cross": "galacticraft:block/web_string_top_bottom"
+  }
+}

src/main/generated/assets/galacticraft/models/block/web_torch.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cross",
+  "textures": {
+    "cross": "galacticraft:block/web_torch"
+  }
+}

src/main/generated/assets/galacticraft/models/block/web_torch_top.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cross",
+  "textures": {
+    "cross": "galacticraft:block/web_torch_top"
+  }
+}

src/main/generated/assets/galacticraft/models/item/web_string.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "galacticraft:block/web_string_middle"
+  }
+}

src/main/generated/assets/galacticraft/models/item/web_torch.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "galacticraft:block/web_torch"
+  }
+}

src/main/generated/data/galacticraft/advancement/recipes/decorations/web_torch.json

@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "galacticraft:web_torch"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    },
+    "has_web_string": {
+      "conditions": {
+        "items": [
+          {
+            "items": "galacticraft:web_string"
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_web_string"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "galacticraft:web_torch"
+    ]
+  }
+}

src/main/generated/data/galacticraft/loot_table/blocks/web_string.json

@@ -0,0 +1,20 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "galacticraft:web_string"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ]
+}

src/main/generated/data/galacticraft/loot_table/blocks/web_torch.json

@@ -0,0 +1,20 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "galacticraft:web_torch"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ]
+}

src/main/generated/data/galacticraft/recipe/web_torch.json

@@ -0,0 +1,16 @@
+{
+  "type": "minecraft:crafting_shapeless",
+  "category": "misc",
+  "ingredients": [
+    {
+      "item": "galacticraft:web_string"
+    },
+    {
+      "item": "galacticraft:glowstone_torch"
+    }
+  ],
+  "result": {
+    "count": 1,
+    "id": "galacticraft:web_torch"
+  }
+}

src/main/java/dev/galacticraft/mod/Constant.java

@@ -222,6 +222,8 @@ interface Block {
         String WALKWAY = "walkway";
         String WIRE_WALKWAY = "wire_walkway";
         String FLUID_PIPE_WALKWAY = "fluid_pipe_walkway";
+        String WEB_TORCH = "web_torch";
+        String WEB_STRING = "web_string";
 
         //  Environment
         String GLOWSTONE_TORCH = "glowstone_torch";
@@ -235,7 +237,6 @@ interface Block {
         String UNLIT_SOUL_LANTERN = "unlit_soul_lantern";
         String CAVERNOUS_VINES = "cavernous_vines";
         String CAVERNOUS_VINES_PLANT = "cavernous_vines_plant";
-        String WEB_TORCH = "web_torch";
         String FALLEN_METEOR = "fallen_meteor";
         String SLIMELING_EGG = "slimeling_egg";
         String CREEPER_EGG = "creeper_egg";

src/main/java/dev/galacticraft/mod/GalacticraftClient.java

@@ -174,6 +174,8 @@ public void onInitializeClient() {
         BlockRenderLayerMap.INSTANCE.putBlock(GCBlocks.GLOWSTONE_LANTERN, RenderType.cutout());
         BlockRenderLayerMap.INSTANCE.putBlock(GCBlocks.UNLIT_LANTERN, RenderType.cutout());
         BlockRenderLayerMap.INSTANCE.putBlock(GCBlocks.UNLIT_SOUL_LANTERN, RenderType.cutout());
+        BlockRenderLayerMap.INSTANCE.putBlock(GCBlocks.WEB_TORCH, RenderType.cutout());
+        BlockRenderLayerMap.INSTANCE.putBlock(GCBlocks.WEB_STRING, RenderType.cutout());
         BlockRenderLayerMap.INSTANCE.putBlock(GCBlocks.CAVERNOUS_VINES, RenderType.cutout());
         BlockRenderLayerMap.INSTANCE.putBlock(GCBlocks.CAVERNOUS_VINES_PLANT, RenderType.cutout());
         BlockRenderLayerMap.INSTANCE.putBlock(GCBlocks.OLIVINE_CLUSTER, RenderType.cutout());

src/main/java/dev/galacticraft/mod/content/GCBlocks.java

@@ -373,6 +373,10 @@ public class GCBlocks {
     public static final Block UNLIT_WALL_TORCH = BLOCKS.register(Constant.Block.UNLIT_WALL_TORCH, new UnlitWallTorchBlock(Blocks.WALL_TORCH, BlockBehaviour.Properties.ofFullCopy(UNLIT_TORCH).dropsLike(UNLIT_TORCH)));
     public static final Block UNLIT_SOUL_WALL_TORCH = BLOCKS.register(Constant.Block.UNLIT_SOUL_WALL_TORCH, new UnlitWallTorchBlock(Blocks.SOUL_WALL_TORCH, BlockBehaviour.Properties.ofFullCopy(UNLIT_SOUL_TORCH).dropsLike(UNLIT_SOUL_TORCH)));
 
+    // WEB TORCH & WEB STRING
+    public static final Block WEB_TORCH = BLOCKS.registerWithItem(Constant.Block.WEB_TORCH, new WebTorchBlock(BlockBehaviour.Properties.of().mapColor(MapColor.WOOL).sound(SoundType.COBWEB).noCollission().strength(3.0F).pushReaction(PushReaction.DESTROY).lightLevel(state -> 10)));
+    public static final Block WEB_STRING = BLOCKS.registerWithItem(Constant.Block.WEB_STRING, new WebStringBlock(BlockBehaviour.Properties.of().mapColor(MapColor.WOOL).sound(SoundType.COBWEB).noCollission().strength(3.0F).pushReaction(PushReaction.DESTROY)));
+
     // LANTERNS - Don't use registerWithItem in order for the torches to be before the lanterns
     public static final Block GLOWSTONE_LANTERN = BLOCKS.register(Constant.Block.GLOWSTONE_LANTERN, new GlowstoneLanternBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.LANTERN)));
     public static final Block UNLIT_LANTERN = BLOCKS.register(Constant.Block.UNLIT_LANTERN, new UnlitLanternBlock(Blocks.LANTERN, BlockBehaviour.Properties.ofFullCopy(Blocks.LANTERN).lightLevel(state -> 0)));
@@ -399,7 +403,7 @@ private static boolean never(BlockState blockState, BlockGetter blockGetter, Blo
         return false;
     }
 
-    private static ToIntFunction<BlockState> litBlockEmission(int i) {
-        return blockState -> blockState.getValue(BlockStateProperties.LIT) ? i : 0;
+    private static ToIntFunction<BlockState> litBlockEmission(int intensity) {
+        return blockState -> blockState.getValue(BlockStateProperties.LIT) ? intensity : 0;
     }
 }