Update Version

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+**1.0.12**
+* Allow Disabling Beds Setting Spawn
+
+**1.0.11**
+* Fix Loading On Client Without ModMenu
+* Fix Loading On Server
+
 **1.0.10**
 * Add Note Block Screen Tweak
 

gradle.properties

@@ -3,20 +3,20 @@ org.gradle.jvmargs = -Xmx1G
 
 # Fabric Properties
 	# check these on https://fabricmc.net/use
-	minecraft_version = 1.16.2
+	minecraft_version = 1.16.4
 	curseforge_id = 368420
-	simple_minecraft_version = 1.16.2
-	yarn_build = 21
-	fabric_loader_version = 0.9.2+build.206
+	simple_minecraft_version = 1.16.4
+	yarn_build = 7
+	fabric_loader_version = 0.10.8
 
 # Mod Properties
-	mod_version = 1.0.10
+	mod_version = 1.0.12
 	maven_group = com.thebrokenrail
 	archives_base_name = slightlyvanilla
 
 # Dependencies
 	# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
-	fabric_api_version = 0.19.0+build.398-1.16
+	fabric_api_version = 0.28.1+1.16
 	modmenu_version = 1.14.6+build.31
 	cloth_config_version = 4.7.0-unstable
 	autoconfig_version = 3.2.0-unstable

src/main/java/com/thebrokenrail/slightlyvanilla/ModConfig.java

@@ -21,6 +21,7 @@ public class ModConfig implements ConfigData {
     public boolean disableInstantNetherPortalInCreative = true;
     @Environment(EnvType.CLIENT)
     public boolean noteBlockScreen = true;
+    public boolean bedsSetSpawn = true;
 
     public static class ThrowableOption {
         public boolean player;

src/main/java/com/thebrokenrail/slightlyvanilla/client/ModMenu.java

@@ -0,0 +1,18 @@
+package com.thebrokenrail.slightlyvanilla.client;
+
+import com.thebrokenrail.slightlyvanilla.ModConfig;
+import io.github.prospector.modmenu.api.ConfigScreenFactory;
+import io.github.prospector.modmenu.api.ModMenuApi;
+import me.sargunvohra.mcmods.autoconfig1u.AutoConfig;
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
+import net.minecraft.client.gui.screen.Screen;
+
+@SuppressWarnings("unused")
+@Environment(EnvType.CLIENT)
+public class ModMenu implements ModMenuApi {
+    @Override
+    public ConfigScreenFactory<?> getModConfigScreenFactory() {
+        return (ConfigScreenFactory<Screen>) screen -> AutoConfig.getConfigScreen(ModConfig.class, screen).get();
+    }
+}

src/main/java/com/thebrokenrail/slightlyvanilla/client/SlightlyVanillaClient.java

@@ -1,30 +1,20 @@
 package com.thebrokenrail.slightlyvanilla.client;
 
 import com.thebrokenrail.slightlyvanilla.SlightlyVanilla;
-import com.thebrokenrail.slightlyvanilla.ModConfig;
 import com.thebrokenrail.slightlyvanilla.entity.SlimeballEntity;
 import com.thebrokenrail.slightlyvanilla.entity.SpawnEggEntity;
-import io.github.prospector.modmenu.api.ConfigScreenFactory;
-import io.github.prospector.modmenu.api.ModMenuApi;
-import me.sargunvohra.mcmods.autoconfig1u.AutoConfig;
 import net.fabricmc.api.ClientModInitializer;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.fabricmc.fabric.api.client.rendereregistry.v1.EntityRendererRegistry;
-import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.render.entity.FlyingItemEntityRenderer;
 
 @SuppressWarnings("unused")
 @Environment(EnvType.CLIENT)
-public class SlightlyVanillaClient implements ClientModInitializer, ModMenuApi {
+public class SlightlyVanillaClient implements ClientModInitializer {
     @Override
     public void onInitializeClient() {
         EntityRendererRegistry.INSTANCE.register(SlightlyVanilla.SLIMEBALL_ENTITY, (entityRenderDispatcher, context) -> new FlyingItemEntityRenderer<SlimeballEntity>(entityRenderDispatcher, context.getItemRenderer()));
         EntityRendererRegistry.INSTANCE.register(SlightlyVanilla.SPAWN_EGG_ENTITY, (entityRenderDispatcher, context) -> new FlyingItemEntityRenderer<SpawnEggEntity>(entityRenderDispatcher, context.getItemRenderer()));
     }
-
-    @Override
-    public ConfigScreenFactory<?> getModConfigScreenFactory() {
-        return (ConfigScreenFactory<Screen>) screen -> AutoConfig.getConfigScreen(ModConfig.class, screen).get();
-    }
 }

src/main/java/com/thebrokenrail/slightlyvanilla/mixin/MixinAbstractTraderEntity.java

@@ -2,7 +2,7 @@ package com.thebrokenrail.slightlyvanilla.mixin;
 
 import com.thebrokenrail.slightlyvanilla.SlightlyVanilla;
 import net.minecraft.entity.EntityType;
-import net.minecraft.entity.passive.AbstractTraderEntity;
+import net.minecraft.entity.passive.MerchantEntity;
 import net.minecraft.entity.passive.PassiveEntity;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.world.World;
@@ -12,7 +12,7 @@ import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 @SuppressWarnings("unused")
-@Mixin(AbstractTraderEntity.class)
+@Mixin(MerchantEntity.class)
 public abstract class MixinAbstractTraderEntity extends PassiveEntity {
     protected MixinAbstractTraderEntity(EntityType<? extends PassiveEntity> entityType, World world) {
         super(entityType, world);

src/main/java/com/thebrokenrail/slightlyvanilla/mixin/MixinServerPlayerEntity.java

@@ -0,0 +1,20 @@
+package com.thebrokenrail.slightlyvanilla.mixin;
+
+import com.thebrokenrail.slightlyvanilla.SlightlyVanilla;
+import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.registry.RegistryKey;
+import net.minecraft.world.World;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Redirect;
+
+@Mixin(ServerPlayerEntity.class)
+public class MixinServerPlayerEntity {
+    @Redirect(at = @At(value = "INVOKE", target = "Lnet/minecraft/server/network/ServerPlayerEntity;setSpawnPoint(Lnet/minecraft/util/registry/RegistryKey;Lnet/minecraft/util/math/BlockPos;FZZ)V"), method = "trySleep")
+    public void setSpawnPoint(ServerPlayerEntity obj, RegistryKey<World> dimension, BlockPos pos, float angle, boolean spawnPointSet, boolean bl) {
+        if (SlightlyVanilla.getConfig().bedsSetSpawn) {
+            obj.setSpawnPoint(dimension, pos, angle, spawnPointSet, bl);
+        }
+    }
+}

src/main/resources/assets/slightlyvanilla/lang/en_us.json

@@ -13,6 +13,7 @@
     "text.autoconfig.slightlyvanilla.option.allowLeashingVillagers":  "Allow Leashing Villagers",
     "text.autoconfig.slightlyvanilla.option.disableInstantNetherPortalInCreative": "Disable Instant Nether Portal In Creative",
     "text.autoconfig.slightlyvanilla.option.noteBlockScreen": "Add Note Block Screen",
+    "text.autoconfig.slightlyvanilla.option.bedsSetSpawn": "Beds Set Spawn",
     "entity.slightlyvanilla.slimeball": "Slimeball",
     "entity.slightlyvanilla.spawn_egg": "Spawn Egg",
     "text.slightlyvanilla.noteblock_screen_slider": "Note: %s (%s)",

src/main/resources/fabric.mod.json

@@ -23,7 +23,7 @@
             "com.thebrokenrail.slightlyvanilla.client.SlightlyVanillaClient"
         ],
         "modmenu": [
-            "com.thebrokenrail.slightlyvanilla.client.SlightlyVanillaClient"
+            "com.thebrokenrail.slightlyvanilla.client.ModMenu"
         ]
     },
     "mixins": [

src/main/resources/slightlyvanilla.mixins.json

@@ -3,17 +3,18 @@
     "package": "com.thebrokenrail.slightlyvanilla.mixin",
     "compatibilityLevel": "JAVA_8",
     "client": [
+        "MixinClientPlayerInteractionManager",
         "MixinClientPlayNetworkHandler",
         "ScreenHandlerAccessor"
     ],
     "mixins": [
         "MixinAbstractTraderEntity",
-        "MixinClientPlayerInteractionManager",
         "MixinItem",
         "MixinLootableContainerBlockEntity",
         "MixinNetherPortalBlockAreaHelper",
         "MixinPlayerEntity",
         "MixinRespawnAnchorBlock",
+        "MixinServerPlayerEntity",
         "MixinSpawnEggItem"
     ],
     "injectors": {