Merge branch 'master' into 1.19

# Conflicts:
#	gradle.properties

.github/workflows/main.yml

@@ -18,12 +18,6 @@ jobs:
           key: ${{ runner.os }}-gradle-${{ hashFiles('**/gradle-wrapper.properties') }}
           restore-keys: |
             ${{ runner.os }}-gradle-
-      - name: Checkout FrozenLib
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-          repository: FrozenBlock/FrozenLib
-          path: 'FrozenLib'
       - name: Checkout Repository
         uses: actions/checkout@v3
         with:
@@ -40,8 +34,13 @@ jobs:
         run: chmod +x ./gradlew
       - name: Build
         run: ./gradlew build -PuseThirdPartyMods=false
-      #- name: Capture Build Artifacts
-      #  uses: actions/upload-artifact@v3
-      #  with:
-      #    name: WilderWild-Artifacts-${{ steps.ref.outputs.branch }}
-      #    path: build/libs/
+      - name: Extract current branch name
+        shell: bash
+        # bash pattern expansion to grab branch name without slashes
+        run: ref="${GITHUB_REF#refs/heads/}" && echo "::set-output name=branch::${ref////-}"
+        id: ref
+      - name: Capture Build Artifacts
+        uses: actions/upload-artifact@v3
+        with:
+          name: WilderWild-Artifacts-${{ steps.ref.outputs.branch }}
+          path: build/libs/

gradle.properties

@@ -23,7 +23,7 @@
 	fabric_asm_version=v2.3
 
 # External Mods
-	frozenlib_version=1.1
+	frozenlib_version=1.1.1
 	modmenu_version=4.0.4
 	cloth_config_version=8.2.88
 	copperpipes_version=1.11

settings.gradle

@@ -16,7 +16,7 @@ pluginManagement {
 rootProject.name = "Wilder Wild"
 
 
-def allowLocalFrozenLibUse = true
+def allowLocalFrozenLibUse = false
 def allowFrozenLibInConsoleMode = false
 def FrozenLibPath = '../FrozenLib'
 def FrozenLibPathGitHub = '/WilderWild/Frozenlib'

src/main/java/net/frozenblock/wilderwild/item/CopperHorn.java

@@ -1,7 +1,6 @@
 package net.frozenblock.wilderwild.item;
 
 import net.frozenblock.lib.sound.FrozenSoundPackets;
-import net.frozenblock.lib.sound.StartingSounds;
 import net.frozenblock.wilderwild.WilderWild;
 import net.frozenblock.wilderwild.registry.RegisterItems;
 import net.minecraft.core.Holder;

src/main/java/net/frozenblock/wilderwild/misc/mod_compat/simple_copper_pipes/WilderCopperPipesEntrypoint.java

@@ -4,7 +4,6 @@
 import net.frozenblock.wilderwild.WilderWild;
 import net.frozenblock.wilderwild.entity.AncientHornProjectile;
 import net.frozenblock.wilderwild.misc.server.EasyPacket;
-import net.frozenblock.wilderwild.registry.RegisterBlocks;
 import net.frozenblock.wilderwild.registry.RegisterItems;
 import net.frozenblock.wilderwild.registry.RegisterSounds;
 import net.lunade.copper.CopperPipeEntrypoint;

src/main/java/net/frozenblock/wilderwild/misc/mod_compat/terrablender/BlenderInitializer.java

@@ -1,9 +1,7 @@
 package net.frozenblock.wilderwild.misc.mod_compat.terrablender;
 
 import net.frozenblock.wilderwild.WilderWild;
-import net.frozenblock.wilderwild.world.gen.SharedWorldgen;
 import terrablender.api.Regions;
-import terrablender.api.SurfaceRuleManager;
 import terrablender.api.TerraBlenderApi;
 
 public final class BlenderInitializer implements TerraBlenderApi {

src/main/java/net/frozenblock/wilderwild/mixin/client/easter/AlexDolphinRenderer.java

@@ -25,7 +25,7 @@ public class AlexDolphinRenderer {
     @Inject(method = "getTextureLocation(Lnet/minecraft/world/entity/animal/Dolphin;)Lnet/minecraft/resources/ResourceLocation;", at = @At("RETURN"), cancellable = true)
     public void getTextureLocation(Dolphin dolphinEntity, CallbackInfoReturnable<ResourceLocation> cir) {
         String string = ChatFormatting.stripFormatting(dolphinEntity.getName().getString());
-        if (Objects.equals(string, "AlexTheDolphin0")) {
+        if (string != null && string.equalsIgnoreCase("AlexTheDolphin0")) {
             cir.setReturnValue(ALEX_DOLPHIN);
         }
     }

src/main/java/net/frozenblock/wilderwild/mixin/client/easter/Treetrain1GoatRenderer.java

@@ -26,7 +26,7 @@ public class Treetrain1GoatRenderer {
     @Inject(method = "getTextureLocation(Lnet/minecraft/world/entity/animal/goat/Goat;)Lnet/minecraft/resources/ResourceLocation;", at = @At("RETURN"), cancellable = true)
     public void getTextureLocation(Goat goatEntity, CallbackInfoReturnable<ResourceLocation> cir) {
         String string = ChatFormatting.stripFormatting(goatEntity.getName().getString());
-        if (Objects.equals(string, "Treetrain1")) {
+        if (Objects.equals(string, "Treetrain1") || Objects.equals(string, "Treetrain")) {
             cir.setReturnValue(TREETRAIN1_GOAT);
         }
     }

src/main/java/net/frozenblock/wilderwild/mixin/client/easter/XfrtrexSusFrogRenderer.java

@@ -26,7 +26,7 @@ public class XfrtrexSusFrogRenderer {
     @Inject(method = "getTextureLocation(Lnet/minecraft/world/entity/animal/frog/Frog;)Lnet/minecraft/resources/ResourceLocation;", at = @At("RETURN"), cancellable = true)
     public void getTextureLocation(Frog frogEntity, CallbackInfoReturnable<ResourceLocation> cir) {
         String string = ChatFormatting.stripFormatting(frogEntity.getName().getString());
-        if (Objects.equals(string, "Xfrtrex")) {
+        if (string != null && string.equalsIgnoreCase("Xfrtrex")) {
             cir.setReturnValue(SUS_TEXTURE);
         }
     }

src/main/java/net/frozenblock/wilderwild/mixin/server/SculkSpreaderChargeCursorMixin.java

@@ -5,13 +5,11 @@
 import net.frozenblock.wilderwild.registry.RegisterBlocks;
 import net.frozenblock.wilderwild.registry.RegisterProperties;
 import net.frozenblock.wilderwild.tag.WilderBlockTags;
-import net.minecraft.Util;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.core.Vec3i;
 import net.minecraft.util.RandomSource;
 import net.minecraft.world.level.LevelAccessor;
-import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.SculkBehaviour;
 import net.minecraft.world.level.block.SculkSpreader;
 import net.minecraft.world.level.block.SculkVeinBlock;

src/main/java/net/frozenblock/wilderwild/world/gen/SharedWorldgen.java

@@ -2,7 +2,6 @@
 
 import com.google.common.collect.ImmutableList;
 import net.frozenblock.lib.worldgen.biome.api.parameters.*;
-import net.frozenblock.wilderwild.misc.config.ClothConfigInteractionHandler;
 import net.frozenblock.wilderwild.registry.RegisterWorldgen;
 import net.frozenblock.wilderwild.world.gen.noise.WilderNoise;
 import net.minecraft.world.level.biome.Biomes;