Update to 23w51b.

- Update to 23w51b

Author: gniftygnome

build.gradle

@@ -25,7 +25,7 @@ dependencies {
     includeMod "cloth-config", "me.shedaniel.cloth:cloth-config-fabric:${project.clothconfig_version}"
 
     if (findProject(':cinderscapes-worldgen') != null) {
-        includeMod "biolith", "com.terraformersmc:biolith:${biolith_version}"
+        includeMod "biolith", "com.terraformersmc:biolith-fabric:${biolith_version}"
     }
 
     afterEvaluate {

common/src/main/java/com/terraformersmc/cinderscapes/block/BrambleBerryBushBlock.java

@@ -13,18 +13,17 @@
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemStack;
-import net.minecraft.item.Items;
 import net.minecraft.sound.SoundCategory;
 import net.minecraft.sound.SoundEvents;
 import net.minecraft.util.ActionResult;
-import net.minecraft.util.Hand;
 import net.minecraft.util.hit.BlockHitResult;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Vec3d;
 import net.minecraft.util.shape.VoxelShape;
 import net.minecraft.world.BlockView;
 import net.minecraft.world.World;
 import net.minecraft.world.WorldView;
+import net.minecraft.world.event.GameEvent;
 
 public class BrambleBerryBushBlock extends SweetBerryBushBlock {
     private static final VoxelShape SMALL_SHAPE = Block.createCuboidShape(3.0D, 0.0D, 3.0D, 13.0D, 8.0D, 13.0D);
@@ -65,20 +64,21 @@ public VoxelShape getOutlineShape(BlockState state, BlockView world, BlockPos po
     }
 
     @Override
-    public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hit) {
-        int i = state.get(AGE);
-        boolean bl = i == 3;
-        if (!bl && player.getStackInHand(hand).getItem() == Items.BONE_MEAL) {
-            return ActionResult.PASS;
-        } else if (i > 1) {
-            int j = 1 + world.random.nextInt(2);
-            dropStack(world, pos, new ItemStack(CinderscapesItems.BRAMBLE_BERRIES, j + (bl ? 1 : 0)));
-            world.playSound(null, pos, SoundEvents.BLOCK_SWEET_BERRY_BUSH_PICK_BERRIES, SoundCategory.BLOCKS, 1.0F, 0.8F + world.random.nextFloat() * 0.4F);
-            world.setBlockState(pos, state.with(AGE, 1), 2);
-            return ActionResult.SUCCESS;
-        } else {
-            return super.onUse(state, world, pos, player, hand, hit);
+    public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, BlockHitResult hit) {
+        int age = state.get(AGE);
+
+        if (age > 1) {
+            int count = age - 1 + world.random.nextInt(2);
+            dropStack(world, pos, new ItemStack(CinderscapesItems.BRAMBLE_BERRIES, count));
+            world.playSound(null, pos, SoundEvents.BLOCK_SWEET_BERRY_BUSH_PICK_BERRIES, SoundCategory.BLOCKS, 1.0f, 0.8f + world.random.nextFloat() * 0.4f);
+            BlockState newState = state.with(AGE, 1);
+            world.setBlockState(pos, newState, 2);
+            world.emitGameEvent(GameEvent.BLOCK_CHANGE, pos, GameEvent.Emitter.of(player, newState));
+
+            return ActionResult.success(world.isClient);
         }
+
+        return super.onUse(state, world, pos, player, hit);
     }
 
     @Override

gradle.properties

@@ -4,10 +4,10 @@ fabric.loom.multiProjectOptimisation=true
 maven_group=com.terraformersmc
 archive_name=cinderscapes
 
-minecraft_version=1.20.3
-yarn_mappings=1.20.3+build.1
-loader_version=0.15.1
-fabric_version=0.91.1+1.20.3
+minecraft_version=23w51b
+yarn_mappings=23w51b+build.4
+loader_version=0.15.3
+fabric_version=0.93.1+1.20.5
 
 # Terraform modules
 terraform_biome_remapper_api_version=9.0.0
@@ -16,14 +16,14 @@ terraform_surfaces_api_version=9.0.0
 terraform_wood_api_version=9.0.0
 
 # Biolith for worldgen module and testing
-biolith_version=1.1.0-beta.1
+biolith_version=1.2.0-beta.1
 
 # TerraBlender for worldgen module and testing
-terrablender_version=1.20.3-3.3.0.2
+terrablender_version=1.20.4-3.3.0.5
 
 # Other Things
-clothconfig_version=12.0.111
-modmenu_version=9.0.0-pre.1
+clothconfig_version=13.0.121
+modmenu_version=9.0.0
 vistas_version=2.3.0
 
 # Project Metadata
@@ -37,14 +37,14 @@ default_release_type=stable
 # CurseForge Metadata
 curseforge_slug=cinderscapes
 curseforge_id=391429
-curseforge_game_versions=1.20.3, 1.20.4, Fabric, Quilt
+curseforge_game_versions=1.20.5-Snapshot, Fabric, Quilt
 curseforge_required_dependencies=fabric-api
 curseforge_optional_dependencies=
 
 # Modrinth Metadata
 modrinth_slug=cinderscapes
 modrinth_id=QC4wcUXZ
-modrinth_game_versions=1.20.3, 1.20.4
+modrinth_game_versions=23w51b
 modrinth_mod_loaders=fabric, quilt
 #modrinth_embedded_dependencies=biolith
 

src/main/resources/fabric.mod.json

@@ -37,7 +37,7 @@
   "depends": {
     "fabricloader": ">=0.15",
     "fabric-api": ">=0.77.0",
-    "minecraft": ">=1.20.3 <1.21"
+    "minecraft": ">=1.20.4 <1.21"
   },
   "breaks": {
     "bclib": "<3.0.8"

worldgen/build.gradle

@@ -8,6 +8,6 @@ dependencies {
     implementation project(path: ':cinderscapes-common')
 
     // Biolith and TerraBlender for the worldgen API modules
-    modImplementation "com.terraformersmc:biolith:${biolith_version}"
-    modCompileOnlyApi "com.github.glitchfiend:TerraBlender-fabric:${terrablender_version}"
+    modImplementation "com.terraformersmc:biolith-fabric:${biolith_version}"
+    modCompileOnly "com.github.glitchfiend:TerraBlender-fabric:${terrablender_version}"
 }

worldgen/src/main/resources/fabric.mod.json

@@ -21,6 +21,6 @@
     }
   },
   "depends": {
-    "biolith": "*"
+    "biolith": ">=1.2.0-beta.1"
   }
 }