Merge branch 'architectury-1.17.1' into architectury-1.18.1

UnlikePaladin · Aug 30, 2023 · 95b4e6d · 95b4e6d
2 parents e6422fa + 9fce57a
commit 95b4e6d
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 6 deletions.
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
@@ -201,8 +201,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
@@ -61,6 +61,7 @@ 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();
 
         PaladinFurnitureMod.DYE_KITS = FabricItemGroupBuilder.create(
                         new Identifier(MOD_ID, "dye_kits"))
@@ -89,7 +90,6 @@ public void onInitialize() {
         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/...n/java/com/unlikepaladin/pfm/compat/cookingforblockheads/forge/FridgeBlockEntityBalm.java b/...n/java/com/unlikepaladin/pfm/compat/cookingforblockheads/forge/FridgeBlockEntityBalm.java
@@ -34,7 +34,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, BalmBlockEntityContract {
     private final DefaultKitchenItemProvider itemProvider;
 

diff --git 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();
         ItemGroupRegistryForge.registerItemGroups();
         MinecraftForge.EVENT_BUS.register(EntityRegistryForge.class);
         MinecraftForge.EVENT_BUS.register(BlockItemRegistryForge.class);
@@ -41,7 +42,6 @@ public PaladinFurnitureModForge() {
         NetworkRegistryForge.registerPackets();
         LateBlockRegistryForge.addDynamicBlockRegistration(Block.class);
         LateBlockRegistryForge.addDynamicBlockRegistration(Item.class);
-        this.commonInit();
         PaladinFurnitureMod.isClient = FMLEnvironment.dist == Dist.CLIENT;
     }
 }
diff --git a/gradle.properties b/gradle.properties
@@ -4,7 +4,7 @@ minecraft_version=1.18.1
 enabled_platforms=fabric,forge
 
 archives_base_name=paladin-furniture-mod
-mod_version=1.2.0
+mod_version=1.2.0-rc3
 maven_group=com.unlikepaladin
 
 architectury_version=3.9.66