fix bridge planks missing models/states, begin add new textures, remove unused imports

ashie404 · ashie404 · commit 0c4afb9fc57f · 2024-02-05T15:03:46.000-06:00
diff --git a/src/main/java/ashie404/javadungeons/worldgen/feature/CactiCanyonPillarsFeature.java b/src/main/java/ashie404/javadungeons/worldgen/feature/CactiCanyonPillarsFeature.java
@@ -4,26 +4,20 @@
 
 import com.mojang.serialization.Codec;
 
-import ashie404.javadungeons.JavaDungeons;
 import ashie404.javadungeons.content.CactiCanyonBlocks;
 import ashie404.javadungeons.worldgen.noise.FastNoiseLite;
-import ashie404.javadungeons.worldgen.noise.FastNoiseLite.CellularDistanceFunction;
 import ashie404.javadungeons.worldgen.noise.FastNoiseLite.FractalType;
 import ashie404.javadungeons.worldgen.noise.FastNoiseLite.NoiseType;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.Blocks;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.ChunkPos;
-import net.minecraft.util.math.MathConstants;
 import net.minecraft.util.math.MathHelper;
-import net.minecraft.util.math.random.Random;
 import net.minecraft.world.HeightLimitView;
 import net.minecraft.world.StructureWorldAccess;
 import net.minecraft.world.Heightmap.Type;
 import net.minecraft.world.chunk.Chunk;
 import net.minecraft.world.gen.chunk.BlockColumn;
-import net.minecraft.world.gen.chunk.ChunkGenerator;
-import net.minecraft.world.gen.feature.BasaltColumnsFeatureConfig;
 import net.minecraft.world.gen.feature.DefaultFeatureConfig;
 import net.minecraft.world.gen.feature.Feature;
 import net.minecraft.world.gen.feature.util.FeatureContext;
diff --git a/src/main/java/ashie404/javadungeons/worldgen/feature/DungeonsFeatures.java b/src/main/java/ashie404/javadungeons/worldgen/feature/DungeonsFeatures.java
@@ -6,12 +6,9 @@
 import net.minecraft.registry.RegistryKey;
 import net.minecraft.registry.RegistryKeys;
 import net.minecraft.world.gen.CountConfig;
-import net.minecraft.world.gen.feature.BasaltColumnsFeatureConfig;
-import net.minecraft.world.gen.feature.BlockColumnFeatureConfig;
 import net.minecraft.world.gen.feature.ConfiguredFeature;
 import net.minecraft.world.gen.feature.DefaultFeatureConfig;
 import net.minecraft.world.gen.feature.Feature;
-import net.minecraft.world.gen.feature.SimpleBlockFeatureConfig;
 
 public class DungeonsFeatures {
     // Configured feature registry keys
diff --git a/src/main/resources/assets/dungeons/blockstates/bridge_planks.json b/src/main/resources/assets/dungeons/blockstates/bridge_planks.json
@@ -1 +1,7 @@
-{"variants": {"": {"model": "dungeons:block/bridge_planks"}}}
+{
+    "variants": {
+        "type=bottom": { "model": "dungeons:block/bridge_planks" },
+        "type=top": { "model":    "dungeons:block/bridge_planks_top" },
+        "type=double": { "model": "dungeons:block/bridge_planks_double" }
+    }
+}
diff --git a/src/main/resources/assets/dungeons/blockstates/ss_bridge_planks.json b/src/main/resources/assets/dungeons/blockstates/ss_bridge_planks.json
@@ -1,5 +1,7 @@
 {
     "variants": {
-        "": {"model": "dungeons:block/soggy_swamp/bridge_planks"}
+        "type=bottom": { "model": "dungeons:block/soggy_swamp/bridge_planks" },
+        "type=top": { "model":    "dungeons:block/soggy_swamp/bridge_planks_top" },
+        "type=double": { "model": "dungeons:block/soggy_swamp/bridge_planks_double" }
     }
-}
+}
diff --git a/src/main/resources/assets/dungeons/models/block/bridge_planks.json b/src/main/resources/assets/dungeons/models/block/bridge_planks.json
@@ -1 +1 @@
-{"parent": "minecraft:block/slab_top", "textures": {"top": "dungeons:block/bridge_planks", "bottom": "dungeons:block/bridge_planks", "side": "dungeons:block/bridge_planks_side"}}
+{"parent": "minecraft:block/slab", "textures": {"top": "dungeons:block/bridge_planks", "bottom": "dungeons:block/bridge_planks", "side": "dungeons:block/bridge_planks_side"}}
diff --git a/src/main/resources/assets/dungeons/models/block/bridge_planks_double.json b/src/main/resources/assets/dungeons/models/block/bridge_planks_double.json
@@ -0,0 +1,7 @@
+{
+    "parent": "minecraft:block/cube_column",
+    "textures": {
+        "side": "dungeons:block/bridge_planks_side",
+        "end":  "dungeons:block/bridge_planks"
+    }
+}
diff --git a/src/main/resources/assets/dungeons/models/block/bridge_planks_top.json b/src/main/resources/assets/dungeons/models/block/bridge_planks_top.json
@@ -0,0 +1 @@
+{"parent": "minecraft:block/slab_top", "textures": {"top": "dungeons:block/bridge_planks", "bottom": "dungeons:block/bridge_planks", "side": "dungeons:block/bridge_planks_side"}}
diff --git a/src/main/resources/assets/dungeons/models/block/soggy_swamp/bridge_planks.json b/src/main/resources/assets/dungeons/models/block/soggy_swamp/bridge_planks.json
@@ -1 +1 @@
-{"parent": "minecraft:block/slab_top", "textures": {"top": "dungeons:block/soggy_swamp/bridge_planks", "bottom": "dungeons:block/soggy_swamp/bridge_planks", "side": "dungeons:block/soggy_swamp/bridge_planks_side"}}
+{"parent": "minecraft:block/slab", "textures": {"top": "dungeons:block/soggy_swamp/bridge_planks", "bottom": "dungeons:block/soggy_swamp/bridge_planks", "side": "dungeons:block/soggy_swamp/bridge_planks_side"}}
diff --git a/src/main/resources/assets/dungeons/models/block/soggy_swamp/bridge_planks_double.json b/src/main/resources/assets/dungeons/models/block/soggy_swamp/bridge_planks_double.json
@@ -0,0 +1,7 @@
+{
+    "parent": "minecraft:block/cube_column",
+    "textures": {
+        "side": "dungeons:block/soggy_swamp/bridge_planks_side",
+        "end":  "dungeons:block/soggy_swamp/bridge_planks"
+    }
+}
diff --git a/src/main/resources/assets/dungeons/models/block/soggy_swamp/bridge_planks_top.json b/src/main/resources/assets/dungeons/models/block/soggy_swamp/bridge_planks_top.json
@@ -0,0 +1 @@
+{"parent": "minecraft:block/slab_top", "textures": {"top": "dungeons:block/soggy_swamp/bridge_planks", "bottom": "dungeons:block/soggy_swamp/bridge_planks", "side": "dungeons:block/soggy_swamp/bridge_planks_side"}}
diff --git a/src/main/resources/assets/dungeons/textures/block/flowering_squid_coast_leaves.png b/src/main/resources/assets/dungeons/textures/block/flowering_squid_coast_leaves.png
diff --git a/src/main/resources/assets/dungeons/textures/block/squid_coast_leaves.png b/src/main/resources/assets/dungeons/textures/block/squid_coast_leaves.png

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"variants": {`
`3`		`- "": {"model": "dungeons:block/soggy_swamp/bridge_planks"}`
	`3`	`+ "type=bottom": { "model": "dungeons:block/soggy_swamp/bridge_planks" },`
	`4`	`+ "type=top": { "model": "dungeons:block/soggy_swamp/bridge_planks_top" },`
	`5`	`+ "type=double": { "model": "dungeons:block/soggy_swamp/bridge_planks_double" }`
`4`	`6`	`}`
`5`		`-}`
	`7`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-{"parent": "minecraft:block/slab_top", "textures": {"top": "dungeons:block/bridge_planks", "bottom": "dungeons:block/bridge_planks", "side": "dungeons:block/bridge_planks_side"}}`
	`1`	`+{"parent": "minecraft:block/slab", "textures": {"top": "dungeons:block/bridge_planks", "bottom": "dungeons:block/bridge_planks", "side": "dungeons:block/bridge_planks_side"}}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+{"parent": "minecraft:block/slab_top", "textures": {"top": "dungeons:block/bridge_planks", "bottom": "dungeons:block/bridge_planks", "side": "dungeons:block/bridge_planks_side"}}`