Merge pull request #26 from NoSanityHere/1.20.1-fabric

update dependencies and fix some things

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version '1.4-SNAPSHOT'
+	id 'fabric-loom' version '1.6-SNAPSHOT'
 	id 'maven-publish'
 }
 

gradle.properties

@@ -4,10 +4,10 @@
 
 	minecraft_version = 1.20.1
 	yarn_mappings = 1.20.1+build.10
-	loader_version = 0.15.0
+	loader_version = 0.16.0
 
 	fabric_version= 0.90.0+1.20.1
-	geckolib_version = 4.2.4
+	geckolib_version = 4.4.7
 	yacl_version = 3.2.1+1.20
 	limlib_version = 11.0.0b
 	modmenu_version = 7.2.2

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/java/org/vfast/backrooms/BackroomsMod.java

@@ -4,7 +4,6 @@
 import net.fabricmc.fabric.api.entity.event.v1.ServerEntityWorldChangeEvents;
 import net.fabricmc.fabric.api.event.player.AttackEntityCallback;
 import net.fabricmc.loader.api.FabricLoader;
-import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.util.ActionResult;
 import org.vfast.backrooms.blocks.BackroomsBlocks;
 import org.vfast.backrooms.blocks.entity.BackroomsBlockEntities;
@@ -16,16 +15,12 @@
 import org.vfast.backrooms.world.biome.BackroomsBiomes;
 import org.vfast.backrooms.world.BackroomsDimensions;
 import org.vfast.backrooms.world.chunk.BackroomsChunkGenerators;
-import net.ludocrypt.limlib.api.LimlibTravelling;
 import net.minecraft.entity.effect.StatusEffectInstance;
 import net.minecraft.entity.effect.StatusEffects;
 import net.minecraft.text.Text;
-import net.minecraft.util.math.Vec3d;
-import net.minecraft.util.math.Vec3i;
-import net.minecraft.util.math.random.Random;
-import net.minecraft.world.TeleportTarget;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import software.bernie.example.GeckoLibMod;
 import software.bernie.geckolib.GeckoLib;
 
 import java.util.Arrays;
@@ -70,6 +65,7 @@ public void onInitialize() {
 		BackroomsSounds.registerSoundEvents();
 		BackroomsBiomes.registerBiomes();
 		BackroomsChunkGenerators.registerChunkGenerators();
+		System.setProperty(GeckoLibMod.DISABLE_EXAMPLES_PROPERTY_KEY, "true");
 		GeckoLib.initialize();
 		BackroomsEntities.registerMobs();
 		registerEvents();

src/main/java/org/vfast/backrooms/mixin/EntityMixin.java

@@ -4,13 +4,16 @@
 import net.minecraft.entity.Entity;
 import net.minecraft.server.command.CommandOutput;
 import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.server.world.ServerWorld;
 import net.minecraft.util.Nameable;
 import net.minecraft.util.math.Vec3d;
 import net.minecraft.util.math.Vec3i;
 import net.minecraft.util.math.random.Random;
 import net.minecraft.world.TeleportTarget;
 import net.minecraft.world.entity.EntityLike;
+import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@@ -19,12 +22,17 @@
 
 @Mixin(Entity.class)
 public abstract class EntityMixin implements Nameable, EntityLike, CommandOutput {
+    @Shadow
+    @Final
+    protected Random random;
     @Inject(method = "tick", at = @At("TAIL"))
     private void onTick(CallbackInfo ci) {
-        Random rand = ((Entity)(Object)this).getWorld().getRandom();
-        if ((((Entity)(Object)this).isInsideWall() && rand.nextBetween(1, 50) == 50) || (rand.nextBetween(1, 36000) == 36000 && ((Entity)(Object)this).isPlayer() && ((Entity)(Object)this).getWorld() != ((Entity)(Object)this).getServer().getWorld(BackroomsDimensions.LEVEL_ZERO_KEY) && !(((ServerPlayerEntity)((Entity)(Object)this)).isCreative() || ((ServerPlayerEntity)((Entity)(Object)this)).isSpectator()))) {
-            LimlibTravelling.travelTo(((Entity)(Object)this), ((Entity)(Object)this).getServer().getWorld(BackroomsDimensions.LEVEL_ZERO_KEY), new TeleportTarget(
-                            Vec3d.of(new Vec3i(rand.nextBetween(((Entity)(Object)this).getBlockX()-200, ((Entity)(Object)this).getBlockX()+200), 2, rand.nextBetween(((Entity)(Object)this).getBlockZ()-200, ((Entity)(Object)this).getBlockZ()+200))),
+        Entity This = ((Entity)(Object)this);
+        if (!(This.getWorld() instanceof ServerWorld world)) return;
+        if (world == world.getServer().getWorld(BackroomsDimensions.LEVEL_ZERO_KEY)) return;
+        if ((This.isInsideWall() && random.nextBetween(1, 50) == 50) || (This.isPlayer() && !(((ServerPlayerEntity)This).isCreative() || This.isSpectator()) && random.nextBetween(1, 36000) == 36000)) {
+            LimlibTravelling.travelTo(This, world.getServer().getWorld(BackroomsDimensions.LEVEL_ZERO_KEY), new TeleportTarget(
+                            Vec3d.of(new Vec3i(random.nextBetween(This.getBlockX()-200, This.getBlockX()+200), 2, random.nextBetween(This.getBlockZ()-200, This.getBlockZ()+200))),
                             Vec3d.ZERO, 0.0f, 0.0f),
                     BackroomsSounds.CAMERA_CLICK, 5.0f, 1.0f);
         }

src/main/resources/assets/backrooms/models/item/smiler_spawn_egg.json

@@ -0,0 +1,3 @@
+{
+  "parent": "minecraft:item/template_spawn_egg"
+}

src/main/resources/fabric.mod.json

@@ -31,11 +31,11 @@
     "backrooms.mixins.json"
   ],
   "depends": {
-    "fabricloader": ">=0.13.0",
-    "minecraft": ">=1.20.1",
+    "fabricloader": ">=0.16.0",
+    "minecraft": "=1.20.1",
     "java": ">=17",
     "fabric-api": "*",
-    "geckolib": ">=4.2",
+    "geckolib": ">=4.4",
     "limlib": ">=11.0.0b+1.20.1"
   },
   "recommends": {