Update to 1.17-pre1

src/main/java/eu/midnightdust/betterbeds/BetterBedsClient.java

@@ -1,17 +1,17 @@
-package eu.midnightdust.betterbeds;
-
-import net.fabricmc.api.ClientModInitializer;
-import net.fabricmc.fabric.api.resource.ResourceManagerHelper;
-import net.fabricmc.loader.api.FabricLoader;
-import net.minecraft.util.Identifier;
-
-public class BetterBedsClient implements ClientModInitializer {
-
-    public void onInitializeClient() {
-
-        FabricLoader.getInstance().getModContainer("betterbeds").ifPresent(modContainer -> {
-            ResourceManagerHelper.registerBuiltinResourcePack(new Identifier("betterbeds:fancybeds"), "resourcepacks/fancybeds", modContainer, false);
-            ResourceManagerHelper.registerBuiltinResourcePack(new Identifier("betterbeds:connectedbeds"), "resourcepacks/connectedbeds", modContainer, false);
-        });
-    }
-}
+package eu.midnightdust.betterbeds;
+
+import net.fabricmc.api.ClientModInitializer;
+import net.fabricmc.fabric.api.resource.ResourceManagerHelper;
+import net.fabricmc.fabric.api.resource.ResourcePackActivationType;
+import net.fabricmc.loader.api.FabricLoader;
+import net.minecraft.util.Identifier;
+
+public class BetterBedsClient implements ClientModInitializer {
+
+    public void onInitializeClient() {
+        FabricLoader.getInstance().getModContainer("betterbeds").ifPresent(modContainer -> {
+            ResourceManagerHelper.registerBuiltinResourcePack(new Identifier("betterbeds:fancybeds"),  modContainer, ResourcePackActivationType.NORMAL);
+            ResourceManagerHelper.registerBuiltinResourcePack(new Identifier("betterbeds:connectedbeds"),  modContainer, ResourcePackActivationType.NORMAL);
+        });
+    }
+}

src/main/java/eu/midnightdust/betterbeds/mixin/MixinBedBlock.java

@@ -1,27 +1,27 @@
-package eu.midnightdust.betterbeds.mixin;
-
-import net.minecraft.block.*;
-import net.minecraft.util.math.Direction;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
-
-@Mixin(value = BedBlock.class, priority = 2000)
-public abstract class MixinBedBlock extends HorizontalFacingBlock {
-
-    protected MixinBedBlock(Settings settings) {
-        super(settings);
-    }
-
-    @Inject(at = @At("RETURN"), method = "getRenderType", cancellable = true)
-    private void getRenderType(BlockState state, CallbackInfoReturnable<BlockRenderType> cir) {
-        cir.setReturnValue(BlockRenderType.MODEL);
-    }
-
-    @Override
-    @SuppressWarnings("deprecation")
-    public boolean isSideInvisible(BlockState state, BlockState neighborState, Direction offset) {
-        return neighborState.getBlock() instanceof BedBlock;
-    }
-}
+package eu.midnightdust.betterbeds.mixin;
+
+import net.minecraft.block.*;
+import net.minecraft.util.math.Direction;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+@Mixin(value = BedBlock.class, priority = 2000)
+public abstract class MixinBedBlock extends HorizontalFacingBlock {
+
+    protected MixinBedBlock(Settings settings) {
+        super(settings);
+    }
+
+    @Inject(at = @At("RETURN"), method = "getRenderType", cancellable = true)
+    private void getRenderType(BlockState state, CallbackInfoReturnable<BlockRenderType> cir) {
+        cir.setReturnValue(BlockRenderType.MODEL);
+    }
+
+    @Override
+    @SuppressWarnings("deprecation")
+    public boolean isSideInvisible(BlockState state, BlockState neighborState, Direction offset) {
+        return neighborState.getBlock() instanceof BedBlock;
+    }
+}

src/main/java/eu/midnightdust/betterbeds/mixin/MixinBlockEntityRendererDispatcher.java

@@ -1,30 +1,25 @@
-package eu.midnightdust.betterbeds.mixin;
-
-import com.google.common.collect.Maps;
-import net.minecraft.block.BedBlock;
-import net.minecraft.block.BlockRenderType;
-import net.minecraft.block.BlockState;
-import net.minecraft.block.HorizontalFacingBlock;
-import net.minecraft.block.entity.BlockEntityType;
-import net.minecraft.client.render.block.entity.BlockEntityRenderDispatcher;
-import net.minecraft.client.render.block.entity.BlockEntityRenderer;
-import net.minecraft.util.math.Direction;
-import org.spongepowered.asm.mixin.Final;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Overwrite;
-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;
-
-import java.util.Map;
-
-@Mixin(BlockEntityRenderDispatcher.class)
-public abstract class MixinBlockEntityRendererDispatcher {
-    @Shadow @Final private Map<BlockEntityType<?>, BlockEntityRenderer<?>> renderers;
-
-    @Inject(method = "<init>()V", at = @At("TAIL"))
-    private void init(CallbackInfo info) {
-        renderers.remove(BlockEntityType.BED);
-    }
-}
+package eu.midnightdust.betterbeds.mixin;
+
+import net.minecraft.block.entity.BlockEntity;
+import net.minecraft.block.entity.BlockEntityType;
+import net.minecraft.client.render.block.entity.BlockEntityRendererFactories;
+import net.minecraft.client.render.block.entity.BlockEntityRendererFactory;
+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;
+
+import java.util.Map;
+
+@Mixin(BlockEntityRendererFactories.class)
+public abstract class MixinBlockEntityRendererDispatcher {
+
+    @Shadow @Final private static Map<BlockEntityType<?>, BlockEntityRendererFactory<?>> FACTORIES;
+
+    @Inject(method = "register", at = @At("TAIL"))
+    private static <T extends BlockEntity>  void bb$onRegister(BlockEntityType<? extends T> type, BlockEntityRendererFactory<T> factory, CallbackInfo ci) {
+        FACTORIES.remove(BlockEntityType.BED);
+    }
+}

src/main/resources/resourcepacks/connectedbeds/license.txt

@@ -1,10 +1,10 @@
-The MIT License
-Copyright © 2019 Motschen
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
-and to permit persons to whom the Software is furnished to do so, subject to the following conditions: The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+The MIT License
+Copyright © 2019 Motschen
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
+and to permit persons to whom the Software is furnished to do so, subject to the following conditions: The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

src/main/resources/resourcepacks/connectedbeds/pack.mcmeta

@@ -1,6 +1,6 @@
-{
-  "pack": {
-    "pack_format": 6,
-    "description": "§2Allows beds to connect <3"
-  }
-}
+{
+  "pack": {
+    "pack_format": 7,
+    "description": "§2Allows beds to connect <3"
+  }
+}

src/main/resources/resourcepacks/fancybeds/license.txt

@@ -1,10 +1,10 @@
-The MIT License
-Copyright © 2019 Motschen
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
-and to permit persons to whom the Software is furnished to do so, subject to the following conditions: The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+The MIT License
+Copyright © 2019 Motschen
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
+and to permit persons to whom the Software is furnished to do so, subject to the following conditions: The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

src/main/resources/resourcepacks/fancybeds/pack.mcmeta

@@ -1,6 +1,6 @@
-{
-  "pack": {
-    "pack_format": 6,
-    "description": "§2Makes beds look more fancy"
-  }
-}
+{
+  "pack": {
+    "pack_format": 7,
+    "description": "§2Makes beds look more fancy"
+  }
+}