22w19a

FrozenBlock · May 12, 2022 · 674a98c · 674a98c · MerpisMe · May 13, 2022
1 parent 5c6ea72
commit 674a98c
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 11 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,12 +1,13 @@
 # Done to increase the memory available to gradle.
-org.gradle.jvmargs=-Xmx4G
+org.gradle.jvmargs=-Xmx4G -XX:+UseZGC
 # Done to possibly help with build times.
 org.gradle.parallel=true
+org.gradle.caching=true
 
 # Fabric Properties
 	# check these on https://fabricmc.net/develop
-	minecraft_version=22w18a
-	yarn_mappings=22w18a+build.6
+	minecraft_version=22w19a
+	yarn_mappings=22w19a+build.1
 	loader_version=0.14.5
 
 # Mod Properties
@@ -15,4 +16,4 @@ org.gradle.parallel=true
 	archives_base_name = wilderwild
 
 # Dependencies
-	fabric_version=0.52.1+1.19
+	fabric_version=0.52.2+1.19
diff --git a/src/main/java/net/frozenblock/wilderwild/block/OsseousSculkBlock.java b/src/main/java/net/frozenblock/wilderwild/block/OsseousSculkBlock.java
@@ -66,13 +66,13 @@ public static void convertToSculk(WorldAccess world, BlockPos pos) {
                     BlockState stateReplace = world.getBlockState(newPos.offset(direction));
                     BlockState stateSetTo = null;
                     if (stateReplace.isOf(Blocks.SCULK_VEIN)) {
-                        stateSetTo=stateReplace.with(AbstractLichenBlock.getProperty(direction.getOpposite()), true);
+                        stateSetTo=stateReplace.with(MultifaceGrowthBlock.getProperty(direction.getOpposite()), true);
                     }
                     if (stateReplace.isAir()) {
-                        stateSetTo=Blocks.SCULK_VEIN.getDefaultState().with(AbstractLichenBlock.getProperty(direction.getOpposite()), true);
+                        stateSetTo=Blocks.SCULK_VEIN.getDefaultState().with(MultifaceGrowthBlock.getProperty(direction.getOpposite()), true);
                     }
                     if (stateReplace==Blocks.WATER.getDefaultState()) {
-                        stateSetTo=Blocks.SCULK_VEIN.getDefaultState().with(AbstractLichenBlock.getProperty(direction.getOpposite()), true).with(Properties.WATERLOGGED, true);
+                        stateSetTo=Blocks.SCULK_VEIN.getDefaultState().with(MultifaceGrowthBlock.getProperty(direction.getOpposite()), true).with(Properties.WATERLOGGED, true);
                     }
                     if (stateSetTo!=null) { world.setBlockState(newPos.offset(direction), stateSetTo, 3); }
                 }

diff --git a/src/main/java/net/frozenblock/wilderwild/block/PollenBlock.java b/src/main/java/net/frozenblock/wilderwild/block/PollenBlock.java
@@ -13,7 +13,7 @@
 import net.minecraft.world.World;
 import net.minecraft.world.WorldView;
 
-public class PollenBlock extends AbstractLichenBlock {
+public class PollenBlock extends MultifaceGrowthBlock {
     private final LichenGrower grower = new LichenGrower(this);
     public PollenBlock(Settings settings) {
         super(settings);

diff --git a/src/main/java/net/frozenblock/wilderwild/mixin/SonicBoomTaskMixin.java b/src/main/java/net/frozenblock/wilderwild/mixin/SonicBoomTaskMixin.java
@@ -62,7 +62,7 @@ public void keepRunning(ServerWorld serverWorld, WardenEntity wardenEntity, long
 
                 wardenEntity.playSound(SoundEvents.ENTITY_WARDEN_SONIC_BOOM, 3.0F, 1.0F);
                 if (!blocked) {
-                    target.damage(DamageSource.SONIC_BOOM, 10.0F);
+                    target.damage(DamageSource.method_43964(wardenEntity), 10.0F);
                     double d = 0.5D * (1.0D - target.getAttributeValue(EntityAttributes.GENERIC_KNOCKBACK_RESISTANCE));
                     double e = 2.5D * (1.0D - target.getAttributeValue(EntityAttributes.GENERIC_KNOCKBACK_RESISTANCE));
                     target.addVelocity(vec3d3.getX() * e, vec3d3.getY() * d, vec3d3.getZ() * e);

diff --git a/src/main/java/net/frozenblock/wilderwild/mixin/worldgen/DefaultBiomeFeaturesMixin.java b/src/main/java/net/frozenblock/wilderwild/mixin/worldgen/DefaultBiomeFeaturesMixin.java
@@ -50,6 +50,8 @@ public static void addSwampFeatures(GenerationSettings.Builder builder) {
     @Overwrite
     public static void addTallBirchTrees(GenerationSettings.Builder builder) {
     }
+    /** @author FrozenBlock
+     * @reason Replaced with new Taiga Trees */
     @Overwrite
     public static void addTaigaTrees(GenerationSettings.Builder builder) {
     }

diff --git a/src/main/java/net/frozenblock/wilderwild/registry/RegisterBlocks.java b/src/main/java/net/frozenblock/wilderwild/registry/RegisterBlocks.java
@@ -121,7 +121,7 @@ public abstract class RegisterBlocks {
     );
 
 
-    public static final AbstractLichenBlock POLLEN_BLOCK = registerLichenBlock("pollen", 
+    public static final MultifaceGrowthBlock POLLEN_BLOCK = registerMultifaceBlock("pollen",
             new PollenBlock(FabricBlockSettings
             .copyOf(Blocks.GRASS)
             .collidable(false)
@@ -169,7 +169,7 @@ private static HollowedLogBlock createHollowedLogBlock(MapColor topMapColor, Map
                 .strength(2.0F).sounds(BlockSoundGroup.WOOD));
     }
 
-    private static AbstractLichenBlock registerLichenBlock(String name, AbstractLichenBlock block, ItemGroup group) {
+    private static MultifaceGrowthBlock registerMultifaceBlock(String name, MultifaceGrowthBlock block, ItemGroup group) {
         registerBlockItem(name, block, group);
         return Registry.register(Registry.BLOCK, new Identifier(WilderWild.MOD_ID, name), block);
     }