Backport 0.15.9 to 1.20.1

Author: cassiancc

build.gradle

@@ -1,8 +1,8 @@
 plugins {
-    id 'dev.architectury.loom' version '1.6-SNAPSHOT' apply false
+    id 'dev.architectury.loom' version '1.7-SNAPSHOT' apply false
     id 'architectury-plugin' version '3.4-SNAPSHOT'
     id 'com.github.johnrengelman.shadow' version '8.1.1' apply false
-    id "io.github.pacifistmc.forgix" version "1.2.9-local.7"
+    id "io.github.pacifistmc.forgix" version "1.2.9-local.10"
 }
 
 architectury {
@@ -11,12 +11,20 @@ architectury {
 
 allprojects {
     group = rootProject.maven_group
-    version = rootProject.mod_version
-}
+    version = mod_version + "+" + minecraft_version}
 
 forgix {
     group = "cc.cassian.pyrite"
     mergedJarName = "pyrite-${version}.jar"
+    forge {
+        projectName = "forge"
+        jarLocation = "build/libs/pyrite-forge-${version}.jar"
+    }
+
+    fabric {
+        projectName = "fabric"
+        jarLocation = "build/libs/pyrite-fabric-${version}.jar"
+    }
 }
 
 subprojects {

common/src/main/java/cc/cassian/pyrite/Pyrite.java

@@ -1,6 +1,7 @@
 package cc.cassian.pyrite;
 
 import cc.cassian.pyrite.functions.ModHelpers;
+import cc.cassian.pyrite.functions.ModLists;
 import net.minecraft.block.*;
 import net.minecraft.particle.DustParticleEffect;
 import net.minecraft.particle.ParticleTypes;
@@ -12,11 +13,11 @@
 import static cc.cassian.pyrite.functions.ModHelpers.*;
 
 public class Pyrite {
-	public final static String MOD_ID = "pyrite";
+	public static final String MOD_ID = "pyrite";
 	public static final Logger LOGGER = LogManager.getLogger(MOD_ID);
 
-
-    public static void init() {
+	public static void init() {
+		ModLists.populateLinkedHashMaps();
 		// Framed Glass
 		createPyriteBlock("framed_glass","glass", 2.0f, MapColor.CLEAR, 0);
 		// Framed Glass Pane
@@ -25,7 +26,8 @@ public static void init() {
 		createPyriteBlock("switchable_glass", "switchable_glass", Blocks.GLASS);
 		// Cobblestone Bricks
 		generateBrickSet("cobblestone_brick", Blocks.COBBLESTONE, MapColor.STONE_GRAY, true);
-		// Smooth Stone Bricks
+		// Smooth Stone Set
+		createPyriteBlock("smooth_stone_stairs", "stairs", Blocks.SMOOTH_STONE);
 		generateBrickSet("smooth_stone_brick", Blocks.SMOOTH_STONE, MapColor.STONE_GRAY, true);
 		// Granite Bricks
 		generateBrickSet("granite_brick", Blocks.GRANITE, MapColor.DIRT_BROWN, true);
@@ -35,10 +37,13 @@ public static void init() {
 		generateBrickSet("diorite_brick", Blocks.DIORITE, MapColor.OFF_WHITE, true);
 		// Calcite Bricks
 		generateBrickSet("calcite_brick", Blocks.CALCITE, MapColor.OFF_WHITE, true);
+		// Mossy Tuff Bricks
 		// Mossy Deepslate Bricks
-		generateBrickSet("mossy_deepslate_brick", Blocks.DEEPSLATE_BRICKS, MapColor.BLACK);
+		generateBrickSet("mossy_deepslate_brick", Blocks.DEEPSLATE_BRICKS);
 		// Sandstone Bricks
-		generateBrickSet("sandstone_brick", Blocks.SANDSTONE, MapColor.PALE_YELLOW);
+		generateBrickSet("sandstone_brick", Blocks.SANDSTONE);
+		// Terracotta Bricks
+		generateBrickSet("terracotta_brick", Blocks.TERRACOTTA);
 		// Grass Set
 		generateTurfSets();
 		// Nether Brick Fence Gate
@@ -48,10 +53,10 @@ public static void init() {
 		// Torch Levers
 		createTorchLever("torch_lever", Blocks.TORCH, ParticleTypes.FLAME);
 		createTorchLever("redstone_torch_lever", Blocks.SOUL_TORCH, DustParticleEffect.DEFAULT);
-		createTorchLever("soul_torch_lever", Blocks.TORCH, ParticleTypes.SOUL_FIRE_FLAME);
+		createTorchLever("soul_torch_lever", Blocks.SOUL_TORCH, ParticleTypes.SOUL_FIRE_FLAME);
 		// Lamps
-		createPyriteBlock("lit_redstone_lamp", "block", Blocks.REDSTONE_LAMP, 15);
-		createPyriteBlock("glowstone_lamp","block", 0.3f, MapColor.YELLOW, 15);
+		createPyriteBlock("lit_redstone_lamp", "lamp", Blocks.REDSTONE_LAMP, 15);
+		createPyriteBlock("glowstone_lamp","lamp", 0.3f, MapColor.YELLOW, 15);
 		// Classic Features
 		createPyriteBlock("glowing_obsidian","obsidian", 50f, MapColor.RED, 15);
 		createPyriteBlock("nostalgia_glowing_obsidian","obsidian", 50f, MapColor.RED, 15);
@@ -68,21 +73,19 @@ public static void init() {
 		// Modded Crafting Tables
 		if (ModHelpers.isModLoaded("aether")) {
 			createPyriteBlock("skyroot_crafting_table","crafting", Blocks.CRAFTING_TABLE);
-			createPyriteBlock( "holystone_wall_gate","fence_gate", Blocks.STONE);
-			createPyriteBlock( "mossy_holystone_wall_gate","fence_gate", Blocks.STONE);
-			createPyriteBlock( "holystone_brick_wall_gate","fence_gate", Blocks.STONE);
-			createPyriteBlock( "icestone_wall_gate","fence_gate", Blocks.STONE);
-			createPyriteBlock( "aerogel_wall_gate","fence_gate", Blocks.STONE);
-			createPyriteBlock( "carved_wall_gate","fence_gate", Blocks.STONE);
-			createPyriteBlock( "angelic_wall_gate","fence_gate", Blocks.STONE);
-			createPyriteBlock( "hellfire_wall_gate","fence_gate", Blocks.STONE);
-
-
+			createPyriteBlock( "holystone_wall_gate","wall_gate", Blocks.STONE, BlockSetType.STONE);
+			createPyriteBlock( "mossy_holystone_wall_gate","wall_gate", Blocks.STONE, BlockSetType.STONE);
+			createPyriteBlock( "holystone_brick_wall_gate","wall_gate", Blocks.STONE, BlockSetType.STONE);
+			createPyriteBlock( "icestone_wall_gate","wall_gate", Blocks.STONE, BlockSetType.STONE);
+			createPyriteBlock( "aerogel_wall_gate","wall_gate", Blocks.STONE, BlockSetType.STONE);
+			createPyriteBlock( "carved_wall_gate","wall_gate", Blocks.STONE, BlockSetType.STONE);
+			createPyriteBlock( "angelic_wall_gate","wall_gate", Blocks.STONE, BlockSetType.STONE);
+			createPyriteBlock( "hellfire_wall_gate","wall_gate", Blocks.STONE, BlockSetType.STONE);
 		}
-		// Red Mushroom Blocks
+		// Red Mushroom Wood Set
 		createPyriteBlock("red_mushroom_stem", "log", Blocks.MUSHROOM_STEM);
 		createWoodSet("red_mushroom", MapColor.RED, 0);
-		// Brown Mushroom Blocks
+		// Brown Mushroom Wood Set
 		createPyriteBlock("brown_mushroom_stem", "log", Blocks.MUSHROOM_STEM);
 		createWoodSet("brown_mushroom", MapColor.BROWN, 0);
 		// Azalea Wood Set
@@ -106,9 +109,9 @@ public static void init() {
 				createPyriteBlock(dye+"_concrete_powder", "concrete_powder", Blocks.WHITE_CONCRETE_POWDER, color, blockLux);
 			}
 			// Dyed Concrete Stairs
-			createPyriteBlock( dye+"_concrete_stairs", "stairs", Blocks.WHITE_CONCRETE, color, blockLux);
+			createPyriteBlock(dye+"_concrete_stairs", "stairs", Blocks.WHITE_CONCRETE, color, blockLux);
 			// Dyed Concrete Slab
-			createPyriteBlock( dye+"_concrete_slab", "slab", Blocks.WHITE_CONCRETE, color, blockLux);
+			createPyriteBlock(dye+"_concrete_slab", "slab", Blocks.WHITE_CONCRETE, color, blockLux);
 			//Dyed Planks and plank products
 			createWoodSet(dye + "_stained", color, blockLux);
 			// Dyed Bricks and brick products
@@ -123,18 +126,20 @@ public static void init() {
 			generateBrickSet(dye+"_terracotta_brick", Blocks.TERRACOTTA, color, blockLux);
 			// Dyed Torches
 			createTorch(dye+"_torch", getTorchParticle(dye));
+			if (dyeIndex > 15) {
+				// Dyed Stained Glass
+				createPyriteBlock(dye+"_stained_glass","stained_framed_glass", 0.3f, color, blockLux);
+				// Dyed Stained Glass Pane
+				createPyriteBlock(dye+"_stained_glass_pane","stained_framed_glass_pane", 0.3f, color, blockLux);
+			}
 			// Dyed Lamps
-			createPyriteBlock(dye + "_lamp","block", 0.3f, color, 15);
+			createPyriteBlock(dye + "_lamp","lamp", 0.3f, color, 15);
 			// Dyed Framed Glass
 			createPyriteBlock(dye+"_framed_glass","stained_framed_glass", 2.0f, color, blockLux);
 			// Dyed Framed Glass Pane
 			createPyriteBlock( dye+"_framed_glass_pane","stained_framed_glass_pane", 2.0f, color, blockLux);
 			// Dyed Torch Levers
 			createTorchLever(dye+"_torch_lever", Blocks.TORCH, getTorchParticle(dye));
-
-
-
-
 		}
 		// Autogenerate Wall Gates
 		for (Block wallsBlock : getVanillaWalls()) {
@@ -145,11 +150,7 @@ public static void init() {
 				block = block + "_wall";
 			}
 			//Create block.
-			createPyriteBlock(block + "_gate","fence_gate", wallsBlock);
+			createPyriteBlock(block + "_gate","wall_gate", wallsBlock, BlockSetType.STONE);
 		}
 	}
-
-
-
-
 }

common/src/main/java/cc/cassian/pyrite/blocks/WallGateBlock.java

@@ -0,0 +1,34 @@
+package cc.cassian.pyrite.blocks;
+
+import net.minecraft.block.*;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Direction;
+import net.minecraft.util.shape.VoxelShape;
+import net.minecraft.world.BlockView;
+
+public class WallGateBlock extends FenceGateBlock {
+
+    protected static final VoxelShape Z_AXIS_SHAPE;
+    protected static final VoxelShape X_AXIS_SHAPE;
+    protected static final VoxelShape IN_WALL_Z_AXIS_SHAPE;
+    protected static final VoxelShape IN_WALL_X_AXIS_SHAPE;
+
+    public WallGateBlock(Settings settings) {
+        super(settings, WoodType.CRIMSON);
+    }
+
+    public VoxelShape getOutlineShape(BlockState state, BlockView world, BlockPos pos, ShapeContext context) {
+        if (state.get(IN_WALL)) {
+            return state.get(FACING).getAxis() == Direction.Axis.X ? IN_WALL_X_AXIS_SHAPE : IN_WALL_Z_AXIS_SHAPE;
+        } else {
+            return state.get(FACING).getAxis() == Direction.Axis.X ? X_AXIS_SHAPE : Z_AXIS_SHAPE;
+        }
+    }
+
+    static {
+        Z_AXIS_SHAPE = Block.createCuboidShape(0.0F, 2.0F, 6.0F, 16.0F, 13.0F, 10.0F);
+        X_AXIS_SHAPE = Block.createCuboidShape(6.0F, 2.0F, 0.0F, 10.0F, 13.0F, 16.0F);
+        IN_WALL_Z_AXIS_SHAPE = Block.createCuboidShape(0.0F, 0.0F, 6.0F, 16.0F, 13.0F, 10.0F);
+        IN_WALL_X_AXIS_SHAPE = Block.createCuboidShape(6.0F, 0.0F, 0.0F, 10.0F, 13.0F, 16.0F);
+    }
+}