stumbled around in the dark for a few hours

Kandiyaki · May 3, 2024 · 50fd2a1 · 50fd2a1
1 parent 7d57d7d
commit 50fd2a1
Show file tree

Hide file tree

Showing 8 changed files with 785 additions and 43 deletions.
diff --git a/common/src/main/java/net/hex_circles/Hex_circles.java b/common/src/main/java/net/hex_circles/Hex_circles.java
@@ -3,6 +3,7 @@
 import net.hex_circles.registry.Hex_circlesIotaTypeRegistry;
 import net.hex_circles.registry.Hex_circlesItemRegistry;
 import net.hex_circles.registry.Hex_circlesPatternRegistry;
+import net.hex_circles.registry.Hex_circlesBlockRegistry;
 import net.hex_circles.networking.Hex_circlesNetworking;
 import net.minecraft.util.Identifier;
 import org.apache.logging.log4j.LogManager;
@@ -20,7 +21,9 @@ public class Hex_circles {
     public static void init() {
         LOGGER.info("Hex Circles says hello!");
 
+
         Hex_circlesAbstractions.initPlatformSpecific();
+        Hex_circlesBlockRegistry.init();
         Hex_circlesItemRegistry.init();
         Hex_circlesIotaTypeRegistry.init();
         Hex_circlesPatternRegistry.init();

diff --git a/common/src/main/java/net/hex_circles/blocks/BlockDustRune.java b/common/src/main/java/net/hex_circles/blocks/BlockDustRune.java
@@ -1,15 +1,17 @@
 package net.hex_circles.blocks;
 
 import at.petrak.hexcasting.common.blocks.circles.BlockSlate;
-import net.minecraft.block.AbstractBlock.Settings;
 
 public class BlockDustRune extends BlockSlate {
 
 	public BlockDustRune(Settings p_53182_) {
 		super(p_53182_);
 	}
 
+	//TODO: write line connection stuff
+	//step 1: take the "facing" direction and rotate the model so it faces that way
+	//step 2: take the exit directions and figure out which model to use
+	//step 3: take the exit directions and rotate the texture so it touches all the connections
 
-
 
 }
diff --git a/common/src/main/java/net/hex_circles/registry/Hex_circlesBlockRegistry.java b/common/src/main/java/net/hex_circles/registry/Hex_circlesBlockRegistry.java
@@ -9,6 +9,7 @@
 import net.hex_circles.blocks.BlockDustRune;
 import net.minecraft.block.AbstractBlock;
 import net.minecraft.block.Block;
+import net.minecraft.block.Blocks;
 import net.minecraft.block.Material;
 import net.minecraft.block.entity.BlockEntity;
 import net.minecraft.block.entity.BlockEntityType;
@@ -32,6 +33,6 @@ public static void init() {
     // A new creative tab. Notice how it is one of the few things that are not deferred
 
     // During the loading phase, refrain from accessing suppliers' items (e.g. EXAMPLE_ITEM.get()), they will not be available
-    public static final RegistrySupplier<Block> CHALK_RUNE = BLOCKS.register("chalk_square_block", () -> new BlockDustRune(AbstractBlock.Settings.of(Material.AGGREGATE).nonOpaque()));
+    public static final RegistrySupplier<Block> CHALK_RUNE = BLOCKS.register("chalk_square_block", () -> new BlockDustRune(AbstractBlock.Settings.copy(Blocks.REDSTONE_WIRE).nonOpaque()));
 
 }
diff --git a/common/src/main/java/net/hex_circles/registry/Hex_circlesItemRegistry.java b/common/src/main/java/net/hex_circles/registry/Hex_circlesItemRegistry.java
@@ -25,10 +25,9 @@ public static void init() {
     }
 
     // A new creative tab. Notice how it is one of the few things that are not deferred
-    public static final ItemGroup CIRCLES_GROUP = CreativeTabRegistry.create(id("circles_group"), () -> new ItemStack(Hex_circlesItemRegistry.DUMMY_ITEM.get()));
+    public static final ItemGroup CIRCLES_GROUP = CreativeTabRegistry.create(id("circles_group"), () -> new ItemStack(Hex_circlesItemRegistry.CHALKSTICK_ITEM.get()));
 
     // During the loading phase, refrain from accessing suppliers' items (e.g. EXAMPLE_ITEM.get()), they will not be available
-    public static final RegistrySupplier<Item> DUMMY_ITEM = ITEMS.register("dummy_item", () -> new Item(new Item.Settings().group(CIRCLES_GROUP)));
     public static final RegistrySupplier<Item> CHALKSTICK_ITEM = ITEMS.register("amethyst_chalk", () -> new ItemChalkStick(CHALKCIRCLES_16STACK.group(CIRCLES_GROUP)));
     public static final RegistrySupplier<BlockItem> CHALKSQUARE_BLOCK_ITEM = ITEMS.register("chalk_square_block", () -> new BlockItem(Hex_circlesBlockRegistry.CHALK_RUNE.get(), CHALKCIRCLES_64STACK.group(CIRCLES_GROUP)));
 

diff --git a/common/src/main/resources/assets/hex_circles/blockstates/chalk_square_block.json b/common/src/main/resources/assets/hex_circles/blockstates/chalk_square_block.json
@@ -1,34 +1,42 @@
 {
   "variants": {
     "face=ceiling": {
-      "model": "hex_circles:block/chalk_square_block",
-      "uvlock": true,
+      "model": "hex_circles:block/chalk_dot",
+      "uvlock": false,
       "x": 180
     },
-    "face=floor": {
-      "model": "hex_circles:block/chalk_square_block",
-      "uvlock": true
-    },
+    "face=floor": {	
+	"multipart":[
+		{"when": {"north": "none", "south": "none","east": "none","west": "none"  },
+	  	"apply": {"model": "hex_circles:block/chalk_dot"}
+	},
+		{"when":{ "north": "side", "south": "side","east": "none","west": "none"  },
+	  	"apply": {"model": "hex_circles:block/chalk_line"}
+	},
+		{"when":{ "north": "none", "south": "none","east": "side","west": "side"  },
+	  	"apply": {"model": "hex_circles:block/chalk_line", "x": 90}
+	}
+	]},
     "face=wall,facing=east": {
-      "model": "hex_circles:block/chalk_square_block",
-      "uvlock": true,
+      "model": "hex_circles:block/chalk_dot",
+      "uvlock": false,
       "x": 90,
       "y": 90
     },
     "face=wall,facing=north": {
-      "model": "hex_circles:block/chalk_square_block",
-      "uvlock": true,
+      "model": "hex_circles:block/chalk_dot",
+      "uvlock": false,
       "x": 90
     },
     "face=wall,facing=south": {
-      "model": "hex_circles:block/chalk_square_block",
-      "uvlock": true,
+      "model": "hex_circles:block/chalk_dot",
+      "uvlock": false,
       "x": 90,
       "y": 180
     },
     "face=wall,facing=west": {
-      "model": "hex_circles:block/chalk_square_block",
-      "uvlock": true,
+      "model": "hex_circles:block/chalk_dot",
+      "uvlock": false,
       "x": 90,
       "y": 270
     }