diff --git a/common/src/main/java/com/unlikepaladin/pfm/runtime/assets/PFMLangProvider.java b/common/src/main/java/com/unlikepaladin/pfm/runtime/assets/PFMLangProvider.java index dcb158dd8..11da5bf2c 100644 --- a/common/src/main/java/com/unlikepaladin/pfm/runtime/assets/PFMLangProvider.java +++ b/common/src/main/java/com/unlikepaladin/pfm/runtime/assets/PFMLangProvider.java @@ -206,8 +206,6 @@ public static String translate(String key, Object ... args) { } } - //TODO: check if the mod version's different and regen assets - //TODO: Waterlog chairs and tables only public void generateTranslationForLampBlock(BufferedWriter writer) { for (WoodVariant variant : WoodVariantRegistry.getVariants()) { for (DyeColor color : DyeColor.values()) { diff --git a/fabric/src/main/java/com/unlikepaladin/pfm/fabric/PaladinFurnitureModFabric.java b/fabric/src/main/java/com/unlikepaladin/pfm/fabric/PaladinFurnitureModFabric.java index 24fc4e2b0..f6388b4d4 100644 --- a/fabric/src/main/java/com/unlikepaladin/pfm/fabric/PaladinFurnitureModFabric.java +++ b/fabric/src/main/java/com/unlikepaladin/pfm/fabric/PaladinFurnitureModFabric.java @@ -69,12 +69,12 @@ public void onInitialize() { GENERAL_LOGGER.error("Failed to initialize Paladin's Furniture configuration, default values will be used instead"); GENERAL_LOGGER.error("", e); } + this.commonInit(); EntityRegistryFabric.registerEntities(); PaladinFurnitureModFabric.initializeItemGroup(); BlockItemRegistryFabric.registerItems(); BlockItemRegistryFabric.registerBlocks(); - this.commonInit(); //PFMRuntimeResources.prepareAsyncResourceGen(); No async gen because Forge won't behave, blame it. PFMRuntimeResources.ready = true; StatisticsRegistryFabric.registerStatistics(); diff --git a/fabric/src/main/java/com/unlikepaladin/pfm/mixin/fabric/PFMTitleScreenMixin.java b/fabric/src/main/java/com/unlikepaladin/pfm/mixin/fabric/PFMTitleScreenMixin.java index 57b8a4310..bb2bdf513 100644 --- a/fabric/src/main/java/com/unlikepaladin/pfm/mixin/fabric/PFMTitleScreenMixin.java +++ b/fabric/src/main/java/com/unlikepaladin/pfm/mixin/fabric/PFMTitleScreenMixin.java @@ -4,7 +4,7 @@ import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.screen.ConfirmScreen; import net.minecraft.client.gui.screen.TitleScreen; -import net.minecraft.text.TranslatableText; +import net.minecraft.text.Text; import net.minecraft.util.Formatting; import net.minecraft.util.Util; import org.spongepowered.asm.mixin.Mixin; @@ -50,9 +50,9 @@ public class PFMTitleScreenMixin { MinecraftClient.getInstance().stop(); } }, - new TranslatableText("pfm.compat.failure.title").formatted(Formatting.RED), - new TranslatableText(reason), - new TranslatableText("pfm.compat.failure.indiumNotFound"), - new TranslatableText("menu.quit"))); + Text.translatable("pfm.compat.failure.title").formatted(Formatting.RED), + Text.translatable(reason), + Text.translatable("pfm.compat.failure.indiumNotFound"), + Text.translatable("menu.quit"))); } } diff --git a/forge/src/main/java/com/unlikepaladin/pfm/compat/cookingforblockheads/forge/FridgeBlockEntityBalm.java b/forge/src/main/java/com/unlikepaladin/pfm/compat/cookingforblockheads/forge/FridgeBlockEntityBalm.java index bd55e9369..b41af3771 100644 --- a/forge/src/main/java/com/unlikepaladin/pfm/compat/cookingforblockheads/forge/FridgeBlockEntityBalm.java +++ b/forge/src/main/java/com/unlikepaladin/pfm/compat/cookingforblockheads/forge/FridgeBlockEntityBalm.java @@ -31,7 +31,6 @@ import java.util.*; -//TODO: oven and freezer support, make the freezer always provide ice, custom crafting counter public class FridgeBlockEntityBalm extends FridgeBlockEntity implements BalmContainerProvider, BalmProviderHolder, BlockEntityContract { private final DefaultKitchenItemProvider itemProvider; @@ -103,6 +102,7 @@ private void addCapabilities(BalmProvider provider, Map, LazyOp } else if (provider.getProviderClass() == EnergyStorage.class) { capabilities.put(ForgeCapabilities.ENERGY, LazyOptional.of(() -> new ForgeEnergyStorage((EnergyStorage)provider.getInstance()))); } + } @Override diff --git a/forge/src/main/java/com/unlikepaladin/pfm/forge/PaladinFurnitureModForge.java b/forge/src/main/java/com/unlikepaladin/pfm/forge/PaladinFurnitureModForge.java index e035232b7..89c96caeb 100644 --- a/forge/src/main/java/com/unlikepaladin/pfm/forge/PaladinFurnitureModForge.java +++ b/forge/src/main/java/com/unlikepaladin/pfm/forge/PaladinFurnitureModForge.java @@ -29,6 +29,7 @@ public PaladinFurnitureModForge() { GENERAL_LOGGER.error("Failed to initialize Paladin's Furniture configuration, default values will be used instead"); GENERAL_LOGGER.error("", e); } + this.commonInit(); MinecraftForge.EVENT_BUS.register(EntityRegistryForge.class); MinecraftForge.EVENT_BUS.register(BlockItemRegistryForge.class); MinecraftForge.EVENT_BUS.register(StatisticsRegistryForge.class); @@ -39,7 +40,6 @@ public PaladinFurnitureModForge() { MinecraftForge.EVENT_BUS.register(NetworkRegistryForge.class); NetworkRegistryForge.registerPackets(); LateBlockRegistryForge.addDynamicBlockRegistration(); - this.commonInit(); PaladinFurnitureMod.isClient = FMLEnvironment.dist == Dist.CLIENT; FMLJavaModLoadingContext.get().getModEventBus().addListener(ItemGroupRegistryForge::registerItemGroups); FMLJavaModLoadingContext.get().getModEventBus().addListener(ItemGroupRegistryForge::addToVanillaItemGroups); diff --git a/gradle.properties b/gradle.properties index 2d3eb8e74..b2c1a7756 100755 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ minecraft_version=1.20.1 enabled_platforms=fabric,forge archives_base_name=paladin-furniture-mod -mod_version=1.2.0-rc2 +mod_version=1.2.0-rc3 maven_group=com.unlikepaladin architectury_version=9.1.12