Web Torch and Web String Blocks

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

@@ -0,0 +1,36 @@
+{
+  "multipart": [
+    {
+      "apply": {
+        "model": "galacticraft:block/web_string_top"
+      },
+      "when": {
+        "web_string_part": "top"
+      }
+    },
+    {
+      "apply": {
+        "model": "galacticraft:block/web_string_middle"
+      },
+      "when": {
+        "web_string_part": "middle"
+      }
+    },
+    {
+      "apply": {
+        "model": "galacticraft:block/web_string_bottom"
+      },
+      "when": {
+        "web_string_part": "bottom"
+      }
+    },
+    {
+      "apply": {
+        "model": "galacticraft:block/web_string_top_bottom"
+      },
+      "when": {
+        "web_string_part": "top_bottom"
+      }
+    }
+  ]
+}

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

@@ -0,0 +1,20 @@
+{
+  "multipart": [
+    {
+      "apply": {
+        "model": "galacticraft:block/web_torch"
+      },
+      "when": {
+        "top": "false"
+      }
+    },
+    {
+      "apply": {
+        "model": "galacticraft:block/web_torch_top"
+      },
+      "when": {
+        "top": "true"
+      }
+    }
+  ]
+}

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/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

@@ -239,6 +239,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";
@@ -252,7 +254,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

@@ -175,6 +175,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;
     }
 }

src/main/java/dev/galacticraft/mod/content/block/special/GCWebBlock.java

@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2019-2025 Team Galacticraft
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package dev.galacticraft.mod.content.block.special;
+
+import com.mojang.serialization.MapCodec;
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.level.BlockGetter;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.level.block.WebBlock;
+import net.minecraft.world.level.block.state.BlockBehaviour;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.phys.AABB;
+import net.minecraft.world.phys.shapes.CollisionContext;
+import net.minecraft.world.phys.shapes.VoxelShape;
+
+/// This class acts as a superclass for the WebTorch and WebString classes, providing common code for handling of
+/// the intersection between the player and the web string and web torches. This is so the player slows down, similar
+/// to the way that a player slows down in a normal web block. It differs to the MC WebBlock in that the collision
+/// box is based on the voxel shape as opposed to a full bounding box for a block. It still inherits the behaviour
+/// from the MC WebBlock though.
+
+public class GCWebBlock extends WebBlock {
+    public static final MapCodec<WebBlock> CODEC = simpleCodec(GCWebBlock::new);
+
+    @Override
+    public MapCodec<WebBlock> codec() {
+        return CODEC;
+    }
+
+    public GCWebBlock(BlockBehaviour.Properties properties) {
+        super(properties);
+    }
+
+    @Override
+    protected VoxelShape getShape(BlockState state, BlockGetter world, BlockPos pos, CollisionContext context) { return getShape(state); }
+
+    // Must override this method or an exception will be generated!
+    protected VoxelShape getShape(BlockState state) { return null; }
+
+    protected AABB getShapeInWorldCoordinates(BlockState state, BlockPos pos) {
+        AABB shape = getShape(state).bounds();
+        return new AABB(pos.getX() + shape.minX, pos.getY() + shape.minY, pos.getZ() + shape.minZ,
+                pos.getX() + shape.maxX, pos.getY() + shape.maxY, pos.getZ() + shape.maxZ);
+    }
+
+    @Override
+    protected void entityInside(BlockState state, Level level, BlockPos pos, Entity entityGoalInfo) {
+        AABB entityBB = entityGoalInfo.getBoundingBox();
+        AABB shapeBB = getShapeInWorldCoordinates(state, pos);
+        if(shapeBB.intersects(entityBB)) {
+            super.entityInside(state, level, pos, entityGoalInfo);
+        }
+    }
+}