From 87d4444f378f3ba06375c0215b00fc07d09cc95e Mon Sep 17 00:00:00 2001 From: Cat Core Date: Sun, 22 Dec 2024 14:43:32 +0100 Subject: [PATCH] Fix compiling errors and apply spotless --- .../impl/item/versioned/EarlyInitializer.java | 8 ++-- .../item/versioned/ItemModelsRemapper.java | 4 +- .../mixin/item/versioned/ItemAccessor.java | 34 --------------- .../impl/item/versioned/EarlyInitializer.java | 6 +-- .../fabric/impl/item/EarlyInitializer.java | 6 +-- .../fabric/mixin/item/ItemMixin.java | 4 +- .../fabric/test/registry/RegistryTest.java | 43 +++++++++++++++++++ .../legacyfabric/fabric/testing/TestMod.java | 12 ------ 8 files changed, 57 insertions(+), 60 deletions(-) delete mode 100644 legacy-fabric-item-api-v1/1.12.2/src/main/java/net/legacyfabric/fabric/mixin/item/versioned/ItemAccessor.java create mode 100644 legacyfabric-api/1.12.2/src/testmod/java/net/legacyfabric/fabric/test/registry/RegistryTest.java diff --git a/legacy-fabric-item-api-v1/1.12.2/src/main/java/net/legacyfabric/fabric/impl/item/versioned/EarlyInitializer.java b/legacy-fabric-item-api-v1/1.12.2/src/main/java/net/legacyfabric/fabric/impl/item/versioned/EarlyInitializer.java index d1f269117..a46ab3e57 100644 --- a/legacy-fabric-item-api-v1/1.12.2/src/main/java/net/legacyfabric/fabric/impl/item/versioned/EarlyInitializer.java +++ b/legacy-fabric-item-api-v1/1.12.2/src/main/java/net/legacyfabric/fabric/impl/item/versioned/EarlyInitializer.java @@ -25,8 +25,8 @@ import net.legacyfabric.fabric.api.registry.v2.RegistryIds; import net.legacyfabric.fabric.api.registry.v2.event.RegistryInitializedEvent; -import net.legacyfabric.fabric.api.registry.v2.registry.holder.Registry; -import net.legacyfabric.fabric.api.registry.v2.registry.holder.SyncedRegistry; +import net.legacyfabric.fabric.api.registry.v2.registry.holder.FabricRegistry; +import net.legacyfabric.fabric.api.registry.v2.registry.holder.SyncedFabricRegistry; public class EarlyInitializer implements PreLaunchEntrypoint { @Override @@ -34,8 +34,8 @@ public void onPreLaunch() { RegistryInitializedEvent.event(RegistryIds.ITEMS).register(EarlyInitializer::itemRegistryInit); } - private static void itemRegistryInit(Registry holder) { - SyncedRegistry registry = (SyncedRegistry) holder; + private static void itemRegistryInit(FabricRegistry holder) { + SyncedFabricRegistry registry = (SyncedFabricRegistry) holder; if (FabricLoader.getInstance().getEnvironmentType() == EnvType.CLIENT) registry.fabric$getRegistryRemapCallback().register(new ItemModelsRemapper()); } diff --git a/legacy-fabric-item-api-v1/1.12.2/src/main/java/net/legacyfabric/fabric/impl/item/versioned/ItemModelsRemapper.java b/legacy-fabric-item-api-v1/1.12.2/src/main/java/net/legacyfabric/fabric/impl/item/versioned/ItemModelsRemapper.java index e82792a61..8eb15661b 100644 --- a/legacy-fabric-item-api-v1/1.12.2/src/main/java/net/legacyfabric/fabric/impl/item/versioned/ItemModelsRemapper.java +++ b/legacy-fabric-item-api-v1/1.12.2/src/main/java/net/legacyfabric/fabric/impl/item/versioned/ItemModelsRemapper.java @@ -27,7 +27,7 @@ import net.legacyfabric.fabric.api.registry.v2.RegistryHelper; import net.legacyfabric.fabric.api.registry.v2.event.RegistryRemapCallback; -import net.legacyfabric.fabric.api.registry.v2.registry.holder.RegistryEntry; +import net.legacyfabric.fabric.api.registry.v2.registry.holder.FabricRegistryEntry; import net.legacyfabric.fabric.api.util.Identifier; import net.legacyfabric.fabric.mixin.item.versioned.ItemModelsAccessor; @@ -48,7 +48,7 @@ private ItemModels getModelRegistry() { } @Override - public void callback(Map> changedIdsMap) { + public void callback(Map> changedIdsMap) { ((ItemModelsAccessor) getModelRegistry()).getModelIds().clear(); for (Map.Entry> entry : modelIds.entrySet()) { diff --git a/legacy-fabric-item-api-v1/1.12.2/src/main/java/net/legacyfabric/fabric/mixin/item/versioned/ItemAccessor.java b/legacy-fabric-item-api-v1/1.12.2/src/main/java/net/legacyfabric/fabric/mixin/item/versioned/ItemAccessor.java deleted file mode 100644 index 37bcb308f..000000000 --- a/legacy-fabric-item-api-v1/1.12.2/src/main/java/net/legacyfabric/fabric/mixin/item/versioned/ItemAccessor.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright (c) 2020 - 2024 Legacy Fabric - * Copyright (c) 2016 - 2022 FabricMC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package net.legacyfabric.fabric.mixin.item.versioned; - -import java.util.Map; - -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.gen.Accessor; - -import net.minecraft.block.Block; -import net.minecraft.item.Item; - -@Mixin(Item.class) -public interface ItemAccessor { - @Accessor - static Map getBLOCK_ITEMS() { - return null; - } -} diff --git a/legacy-fabric-item-api-v1/1.7.10/src/main/java/net/legacyfabric/fabric/impl/item/versioned/EarlyInitializer.java b/legacy-fabric-item-api-v1/1.7.10/src/main/java/net/legacyfabric/fabric/impl/item/versioned/EarlyInitializer.java index 79448f1eb..c44f37473 100644 --- a/legacy-fabric-item-api-v1/1.7.10/src/main/java/net/legacyfabric/fabric/impl/item/versioned/EarlyInitializer.java +++ b/legacy-fabric-item-api-v1/1.7.10/src/main/java/net/legacyfabric/fabric/impl/item/versioned/EarlyInitializer.java @@ -23,7 +23,7 @@ import net.legacyfabric.fabric.api.registry.v2.RegistryIds; import net.legacyfabric.fabric.api.registry.v2.event.RegistryInitializedEvent; -import net.legacyfabric.fabric.api.registry.v2.registry.holder.Registry; +import net.legacyfabric.fabric.api.registry.v2.registry.holder.FabricRegistry; public class EarlyInitializer implements PreLaunchEntrypoint { @Override @@ -31,7 +31,7 @@ public void onPreLaunch() { RegistryInitializedEvent.event(RegistryIds.ITEMS).register(EarlyInitializer::itemRegistryInit); } - private static void itemRegistryInit(Registry holder) { - Registry registry = (Registry) holder; + private static void itemRegistryInit(FabricRegistry holder) { + FabricRegistry registry = (FabricRegistry) holder; } } diff --git a/legacy-fabric-item-api-v1/common/src/main/java/net/legacyfabric/fabric/impl/item/EarlyInitializer.java b/legacy-fabric-item-api-v1/common/src/main/java/net/legacyfabric/fabric/impl/item/EarlyInitializer.java index f33d072c5..0b8c6d074 100644 --- a/legacy-fabric-item-api-v1/common/src/main/java/net/legacyfabric/fabric/impl/item/EarlyInitializer.java +++ b/legacy-fabric-item-api-v1/common/src/main/java/net/legacyfabric/fabric/impl/item/EarlyInitializer.java @@ -23,7 +23,7 @@ import net.legacyfabric.fabric.api.registry.v2.RegistryIds; import net.legacyfabric.fabric.api.registry.v2.event.RegistryInitializedEvent; -import net.legacyfabric.fabric.api.registry.v2.registry.holder.Registry; +import net.legacyfabric.fabric.api.registry.v2.registry.holder.FabricRegistry; public class EarlyInitializer implements PreLaunchEntrypoint { @Override @@ -31,8 +31,8 @@ public void onPreLaunch() { RegistryInitializedEvent.event(RegistryIds.ITEMS).register(EarlyInitializer::itemRegistryInit); } - private static void itemRegistryInit(Registry holder) { - Registry registry = (Registry) holder; + private static void itemRegistryInit(FabricRegistry holder) { + FabricRegistry registry = (FabricRegistry) holder; registry.fabric$getBeforeAddedCallback().register((rawId, id, item) -> item.setTranslationKey(id.toTranslationKey())); } diff --git a/legacy-fabric-item-api-v1/common/src/main/java/net/legacyfabric/fabric/mixin/item/ItemMixin.java b/legacy-fabric-item-api-v1/common/src/main/java/net/legacyfabric/fabric/mixin/item/ItemMixin.java index 915f9423c..f1b0d9d09 100644 --- a/legacy-fabric-item-api-v1/common/src/main/java/net/legacyfabric/fabric/mixin/item/ItemMixin.java +++ b/legacy-fabric-item-api-v1/common/src/main/java/net/legacyfabric/fabric/mixin/item/ItemMixin.java @@ -29,7 +29,7 @@ import net.legacyfabric.fabric.api.registry.v2.RegistryHelper; import net.legacyfabric.fabric.api.registry.v2.RegistryIds; -import net.legacyfabric.fabric.api.registry.v2.registry.holder.Registry; +import net.legacyfabric.fabric.api.registry.v2.registry.holder.FabricRegistry; @Mixin(Item.class) public class ItemMixin { @@ -39,6 +39,6 @@ public class ItemMixin { @Inject(method = "setup", at = @At("RETURN")) private static void registerRegistry(CallbackInfo ci) { - RegistryHelper.addRegistry(RegistryIds.ITEMS, (Registry) REGISTRY); + RegistryHelper.addRegistry(RegistryIds.ITEMS, (FabricRegistry) REGISTRY); } } diff --git a/legacyfabric-api/1.12.2/src/testmod/java/net/legacyfabric/fabric/test/registry/RegistryTest.java b/legacyfabric-api/1.12.2/src/testmod/java/net/legacyfabric/fabric/test/registry/RegistryTest.java new file mode 100644 index 000000000..d3078041e --- /dev/null +++ b/legacyfabric-api/1.12.2/src/testmod/java/net/legacyfabric/fabric/test/registry/RegistryTest.java @@ -0,0 +1,43 @@ +/* + * Copyright (c) 2020 - 2024 Legacy Fabric + * Copyright (c) 2016 - 2022 FabricMC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package net.legacyfabric.fabric.test.registry; + +import net.minecraft.item.Item; +import net.minecraft.item.itemgroup.ItemGroup; + +import net.fabricmc.api.ModInitializer; + +import net.legacyfabric.fabric.api.registry.v2.RegistryHelper; +import net.legacyfabric.fabric.api.resource.ItemModelRegistry; +import net.legacyfabric.fabric.api.util.Identifier; + +public class RegistryTest implements ModInitializer { + @Override + public void onInitialize() { + this.registerItems(); + } + + private void registerItems() { + Item testItem = new Item().setItemGroup(ItemGroup.FOOD); + RegistryHelper.register( + Item.REGISTRY, + new Identifier("legacy-fabric-api", "test_item"), testItem + ); + ItemModelRegistry.registerItemModel(testItem, new Identifier("legacy-fabric-api:test_item")); + } +} diff --git a/legacyfabric-api/1.12.2/src/testmod/java/net/legacyfabric/fabric/testing/TestMod.java b/legacyfabric-api/1.12.2/src/testmod/java/net/legacyfabric/fabric/testing/TestMod.java index d6be83ef4..3e113e40c 100644 --- a/legacyfabric-api/1.12.2/src/testmod/java/net/legacyfabric/fabric/testing/TestMod.java +++ b/legacyfabric-api/1.12.2/src/testmod/java/net/legacyfabric/fabric/testing/TestMod.java @@ -18,14 +18,9 @@ package net.legacyfabric.fabric.testing; -import net.minecraft.item.Item; -import net.minecraft.item.itemgroup.ItemGroup; import net.fabricmc.api.ModInitializer; -import net.legacyfabric.fabric.api.registry.v2.RegistryHelper; -import net.legacyfabric.fabric.api.resource.ItemModelRegistry; -import net.legacyfabric.fabric.api.util.Identifier; public class TestMod implements ModInitializer { @Override @@ -50,12 +45,5 @@ private void registerItem() { // net.legacyfabric.fabric.api.registry.v1.RegistryHelper.registerBlock(block, identifier); // net.legacyfabric.fabric.api.registry.v1.RegistryHelper.registerItem(new BlockItem(block), identifier); // } - - Item testItem = new Item().setItemGroup(ItemGroup.FOOD); - RegistryHelper.register( - Item.REGISTRY, - new Identifier("legacy-fabric-api", "test_item"), testItem - ); - ItemModelRegistry.registerItemModel(testItem, new Identifier("legacy-fabric-api:test_item")); } }