Crystals 1.2.3 Release

Killarexe · Killarexe · commit 36d26afeb0d9 · 2024-08-12T12:30:09.000+02:00
Patch generation crash issue

Patched icon on metadata for NeoForge

Tweaks crystals generation
diff --git a/.architectury-transformer/debug.log b/.architectury-transformer/debug.log
@@ -0,0 +1 @@
+[Architectury Transformer DEBUG] Closed File Systems for /home/killar/projects/java/Crystals/common/build/libs/common-1.2.3.jar
diff --git a/common/src/main/java/github/killarexe/crystals/worldgen/feature/CrystalFeature.java b/common/src/main/java/github/killarexe/crystals/worldgen/feature/CrystalFeature.java
@@ -9,7 +9,8 @@
 import net.minecraft.core.Direction;
 import net.minecraft.util.RandomSource;
 import net.minecraft.world.level.WorldGenLevel;
-import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.Blocks;
+import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
 import net.minecraft.world.level.levelgen.feature.Feature;
 import net.minecraft.world.level.levelgen.feature.FeaturePlaceContext;
@@ -27,48 +28,37 @@ public boolean place(FeaturePlaceContext<CrystalFeatureConfig> featurePlaceConte
 		WorldGenLevel level = featurePlaceContext.level();
 		CrystalFeatureConfig config = featurePlaceContext.config();
 		BlockPos origin = featurePlaceContext.origin();
-		
 		TargetBlockState targetBlockState = config.target();
-		
 		RandomSource random = level.getRandom();
-		
-		if(!level.getBlockState(origin).isAir()) {
+		BlockState currentState = level.getBlockState(origin);
+		boolean isWaterLogged = currentState.is(Blocks.WATER);
+
+		if(!(currentState.isAir() || isWaterLogged)) {
 			return false;
 		}
-		
+
 		Optional<Direction> direction = getDirection(origin, targetBlockState, level, random);
 		if(direction.isPresent()) {
-			try {
-				level.setBlock(origin, targetBlockState.state.setValue(BlockStateProperties.FACING, direction.get()), Block.UPDATE_ALL_IMMEDIATE);
-				return true;
-			}catch (Exception e) {
-				e.printStackTrace();
-			}
+			level.setBlock(origin, targetBlockState.state.setValue(BlockStateProperties.FACING, direction.get()).setValue(BlockStateProperties.WATERLOGGED, isWaterLogged), 3);
+			level.getChunk(origin).markPosForPostprocessing(origin);
+			return true;
 		}
 		return false;
 	}
-	
+
 	private Optional<Direction> getDirection(BlockPos origin, TargetBlockState targetBlockState, WorldGenLevel level, RandomSource source) {
-		ArrayList<Direction> availableDirections = new ArrayList<Direction>();
+		ArrayList<Direction> availableDirections = new ArrayList<>();
 		RuleTest rule = targetBlockState.target;
-		if(rule.test(level.getBlockState(origin.north()), source)) {
-			availableDirections.add(Direction.SOUTH);
-		}
-		if(rule.test(level.getBlockState(origin.south()), source)) {
-			availableDirections.add(Direction.NORTH);
-		}
-		if(rule.test(level.getBlockState(origin.west()), source)) {
-			availableDirections.add(Direction.EAST);
-		}
-		if(rule.test(level.getBlockState(origin.east()), source)) {
-			availableDirections.add(Direction.WEST);
-		}
-		if(rule.test(level.getBlockState(origin.above()), source)) {
-			availableDirections.add(Direction.DOWN);
-		}
-		if(rule.test(level.getBlockState(origin.below()), source)) {
-			availableDirections.add(Direction.UP);
+
+		for (Direction direction : Direction.values()) {
+			BlockPos adjacentPos = origin.relative(direction);
+			if (level.hasChunkAt(adjacentPos)) {
+				if (rule.test(level.getBlockState(adjacentPos), source)) {
+					availableDirections.add(direction.getOpposite());
+				}
+			}
 		}
+
 		if(availableDirections.isEmpty()) {
 			return Optional.empty();
 		}
diff --git a/common/src/main/resources/data/crystals/worldgen/placed_feature/diamond_crystals.json b/common/src/main/resources/data/crystals/worldgen/placed_feature/diamond_crystals.json
@@ -6,7 +6,7 @@
       "height": {
         "type": "minecraft:uniform",
         "min_inclusive": {
-          "above_bottom": -63
+          "absolute": -63
         },
         "max_inclusive": {
           "absolute": 16
@@ -15,14 +15,7 @@
     },
     {
       "type": "minecraft:count_on_every_layer",
-      "count": {
-        "type": "minecraft:uniform",
-        "min_inclusive": 191,
-        "max_inclusive": 255
-      }
-    },
-    {
-      "type": "minecraft:in_square"
+      "count": 15
     },
     {
       "type": "minecraft:biome"
diff --git a/common/src/main/resources/data/crystals/worldgen/placed_feature/emerald_crystals.json b/common/src/main/resources/data/crystals/worldgen/placed_feature/emerald_crystals.json
@@ -9,20 +9,13 @@
           "above_bottom": 19
         },
         "max_inclusive": {
-          "absolute": 128
+          "absolute": 127
         }
       }
     },
     {
       "type": "minecraft:count_on_every_layer",
-      "count": {
-        "type": "minecraft:uniform",
-        "min_inclusive": 191,
-        "max_inclusive": 255
-      }
-    },
-    {
-      "type": "minecraft:in_square"
+      "count": 15
     },
     {
       "type": "minecraft:biome"
diff --git a/common/src/main/resources/data/crystals/worldgen/placed_feature/glowstone_crystals.json b/common/src/main/resources/data/crystals/worldgen/placed_feature/glowstone_crystals.json
@@ -15,14 +15,7 @@
     },
     {
       "type": "minecraft:count_on_every_layer",
-      "count": {
-        "type": "minecraft:uniform",
-        "min_inclusive": 223,
-        "max_inclusive": 255
-      }
-    },
-    {
-      "type": "minecraft:in_square"
+      "count": 30
     },
     {
       "type": "minecraft:biome"
diff --git a/common/src/main/resources/data/crystals/worldgen/placed_feature/lapis_crystals.json b/common/src/main/resources/data/crystals/worldgen/placed_feature/lapis_crystals.json
@@ -15,14 +15,7 @@
     },
     {
       "type": "minecraft:count_on_every_layer",
-      "count": {
-        "type": "minecraft:uniform",
-        "min_inclusive": 223,
-        "max_inclusive": 255
-      }
-    },
-    {
-      "type": "minecraft:in_square"
+      "count": 15
     },
     {
       "type": "minecraft:biome"
diff --git a/common/src/main/resources/data/crystals/worldgen/placed_feature/quartz_crystals.json b/common/src/main/resources/data/crystals/worldgen/placed_feature/quartz_crystals.json
@@ -15,14 +15,7 @@
     },
     {
       "type": "minecraft:count_on_every_layer",
-      "count": {
-        "type": "minecraft:uniform",
-        "min_inclusive": 223,
-        "max_inclusive": 255
-      }
-    },
-    {
-      "type": "minecraft:in_square"
+      "count": 30
     },
     {
       "type": "minecraft:biome"
diff --git a/common/src/main/resources/data/crystals/worldgen/placed_feature/redstone_crystals.json b/common/src/main/resources/data/crystals/worldgen/placed_feature/redstone_crystals.json
@@ -15,14 +15,7 @@
     },
     {
       "type": "minecraft:count_on_every_layer",
-      "count": {
-        "type": "minecraft:uniform",
-        "min_inclusive": 191,
-        "max_inclusive": 255
-      }
-    },
-    {
-      "type": "minecraft:in_square"
+      "count": 15
     },
     {
       "type": "minecraft:biome"
diff --git a/gradle.properties b/gradle.properties
@@ -8,7 +8,7 @@ enabled_platforms=fabric,neoforge
 minecraft_version=1.21
 
 mod_id=crystals
-mod_version=1.2.2
+mod_version=1.2.3
 mod_license=CC-BY-4.0
 mod_name=Crystals
 mod_description=A simple mod witch adds crystals ores.
@@ -20,7 +20,7 @@ maven_group=github.killarexe
 
 # Fabric Settings
 fabric_loader_version=0.15.11
-fabric_api_version=0.100.1+1.21
+fabric_api_version=0.102.0+1.21
 
 # Neoforge Settings
 neoforge_version=21.0.0-beta
diff --git a/neoforge/src/main/resources/META-INF/neoforge.mods.toml b/neoforge/src/main/resources/META-INF/neoforge.mods.toml
@@ -9,7 +9,7 @@ version="${mod_version}"
 displayName="${mod_name}"
 updateJSONURL="https://raw.githubusercontent.com/Killarexe/Crystals/master/neoforge/update.json"
 displayURL="${mod_url}"
-logoFile="title.png"
+logoFile="assets/crystals/icon.png"
 authors="Killar"
 displayTest="MATCH_VERSION"
 description='''${mod_description}'''
@@ -26,4 +26,4 @@ modId="minecraft"
 type="required"
 versionRange="${minecraft_version_range}"
 ordering="NONE"
-side="BOTH"
+side="BOTH"
diff --git a/neoforge/update.json b/neoforge/update.json
@@ -3,8 +3,14 @@
 	"1.20.6": {
 		"1.2.1": "Ported to NeoForge"
 	},
+	"1.21": {
+		"1.2.2": "Update to Minecraft 1.21",
+		"1.2.3": "Improve crystal generation. Add Russian translation credits to Alexender317"
+	},
 	"promos": {
 		"1.20.6-latest": "1.2.1",
-		"1.20.6-recommended": "1.2.1"
+		"1.20.6-recommended": "1.2.1",
+		"1.21-latest": "1.2.3",
+		"1.21-recommended": "1.2.3"
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+[Architectury Transformer DEBUG] Closed File Systems for /home/killar/projects/java/Crystals/common/build/libs/common-1.2.3.jar`
Original file line number	Diff line number	Diff line change
`@@ -9,20 +9,13 @@`
`9`	`9`	`"above_bottom": 19`
`10`	`10`	`},`
`11`	`11`	`"max_inclusive": {`
`12`		`- "absolute": 128`
	`12`	`+ "absolute": 127`
`13`	`13`	`}`
`14`	`14`	`}`
`15`	`15`	`},`
`16`	`16`	`{`
`17`	`17`	`"type": "minecraft:count_on_every_layer",`
`18`		`- "count": {`
`19`		`- "type": "minecraft:uniform",`
`20`		`- "min_inclusive": 191,`
`21`		`- "max_inclusive": 255`
`22`		`- }`
`23`		`- },`
`24`		`- {`
`25`		`- "type": "minecraft:in_square"`
	`18`	`+ "count": 15`
`26`	`19`	`},`
`27`	`20`	`{`
`28`	`21`	`"type": "minecraft:biome"`