Merge branch 'architectury-1.19.3' into architectury-1.19.4

# Conflicts: # common/src/main/java/com/unlikepaladin/pfm/runtime/data/PFMTagProvider.java # fabric/src/main/java/com/unlikepaladin/pfm/compat/farmersdelight/fabric/PFMFarmersDelightImpl.java # forge/src/main/java/com/unlikepaladin/pfm/compat/farmersdelight/forge/PFMFarmersDelightImpl.java
UnlikePaladin · Aug 15, 2023 · 17375fb · 17375fb
2 parents 3213279 + 1825da4
commit 17375fb
Show file tree

Hide file tree

Showing 18 changed files with 70 additions and 54 deletions.
diff --git a/common/src/main/java/com/unlikepaladin/pfm/blocks/BasicChairBlock.java b/common/src/main/java/com/unlikepaladin/pfm/blocks/BasicChairBlock.java
@@ -1,7 +1,7 @@
 package com.unlikepaladin.pfm.blocks;
 
 import com.unlikepaladin.pfm.data.FurnitureBlock;
-import com.unlikepaladin.pfm.data.Tags;
+import com.unlikepaladin.pfm.data.PFMTags;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.Material;
@@ -128,7 +128,7 @@ public BlockState getStateForNeighborUpdate(BlockState state, Direction directio
     }
 
     public boolean canTuck(BlockState state) {
-        return state.isIn(Tags.getTuckableBlocks());
+        return state.isIn(PFMTags.TUCKABLE_BLOCKS);
     }
 
     @Override

diff --git a/common/src/main/java/com/unlikepaladin/pfm/compat/farmersdelight/PFMFarmersDelight.java b/common/src/main/java/com/unlikepaladin/pfm/compat/farmersdelight/PFMFarmersDelight.java
@@ -1,11 +1,17 @@
 package com.unlikepaladin.pfm.compat.farmersdelight;
 
 import com.unlikepaladin.pfm.compat.PFMModCompatibility;
+import com.unlikepaladin.pfm.data.PFMTags;
 import dev.architectury.injectables.annotations.ExpectPlatform;
+import net.minecraft.block.Block;
+import net.minecraft.registry.tag.TagKey;
+import net.minecraft.util.Identifier;
 
 public abstract class PFMFarmersDelight implements PFMModCompatibility {
     @ExpectPlatform
     public static PFMFarmersDelight getInstance() {
         throw new AssertionError();
     };
+
+    protected static final TagKey<Block> HEAT_SOURCES = PFMTags.createTag(new Identifier("farmersdelight", "heat_sources"));
 }
diff --git a/common/src/main/java/com/unlikepaladin/pfm/data/PFMTags.java b/common/src/main/java/com/unlikepaladin/pfm/data/PFMTags.java
@@ -0,0 +1,15 @@
+package com.unlikepaladin.pfm.data;
+
+import dev.architectury.injectables.annotations.ExpectPlatform;
+import net.minecraft.block.Block;
+import net.minecraft.registry.tag.TagKey;
+import net.minecraft.util.Identifier;
+
+public class PFMTags {
+    public static TagKey<Block> TUCKABLE_BLOCKS = createTag(new Identifier("pfm", "tuckable_blocks"));
+
+    @ExpectPlatform
+    public static TagKey<Block> createTag(Identifier identifier) {
+        throw new AssertionError();
+    }
+}
diff --git a/common/src/main/java/com/unlikepaladin/pfm/data/Tags.java b/common/src/main/java/com/unlikepaladin/pfm/data/Tags.java
diff --git a/common/src/main/java/com/unlikepaladin/pfm/runtime/data/PFMTagProvider.java b/common/src/main/java/com/unlikepaladin/pfm/runtime/data/PFMTagProvider.java
@@ -10,7 +10,7 @@
 import com.unlikepaladin.pfm.compat.PFMModCompatibility;
 import com.unlikepaladin.pfm.data.FurnitureBlock;
 import com.unlikepaladin.pfm.data.PFMTag;
-import com.unlikepaladin.pfm.data.Tags;
+import com.unlikepaladin.pfm.data.PFMTags;
 import com.unlikepaladin.pfm.registry.PaladinFurnitureModBlocksItems;
 import com.unlikepaladin.pfm.runtime.PFMDataGen;
 import com.unlikepaladin.pfm.runtime.PFMRuntimeResources;
@@ -213,7 +213,7 @@ protected void generateTags() {
         getOrCreateTagBuilder(BlockTags.CLIMBABLE)
                 .add(simpleBunkLadders);
 
-        getOrCreateTagBuilder(Tags.getTuckableBlocks())
+        getOrCreateTagBuilder(PFMTags.TUCKABLE_BLOCKS)
                 .add(woodBasicTables)
                 .add(stoneBasicTables)
                 .add(woodClassicTables)

diff --git a/common/src/main/resources/assets/pfm/lang/en_us.json b/common/src/main/resources/assets/pfm/lang/en_us.json
@@ -1089,6 +1089,8 @@
   "block.pfm.warped_herringbone_planks": "Warped Herringbone Planks",
   "block.pfm.crimson_herringbone_planks": "Crimson Herringbone Planks",
   "block.pfm.mangrove_herringbone_planks": "Mangrove Herringbone Planks",
+  "block.pfm.cherry_herringbone_planks": "Cherry Herringbone Planks",
+  "block.pfm.bamboo_herringbone_planks": "Bamboo Herringbone Planks",
 
   "block.pfm.raw_concrete": "Raw Concrete",
   "block.pfm.raw_concrete_powder": "Raw Concrete Powder",

diff --git a/common/src/main/resources/pfm_background.png b/common/src/main/resources/pfm_background.png
diff --git a/...c/main/java/com/unlikepaladin/pfm/compat/farmersdelight/fabric/PFMFarmersDelightImpl.java b/...c/main/java/com/unlikepaladin/pfm/compat/farmersdelight/fabric/PFMFarmersDelightImpl.java
@@ -28,7 +28,7 @@ public void generateTags() {
         List<Block> stoves = new ArrayList<>(StoveBlock.streamStoves().map(FurnitureBlock::getBlock).toList());
         stoves.addAll(IronStoveBlock.streamIronStoves().map(FurnitureBlock::getBlock).toList());
         stoves.add(PaladinFurnitureModBlocksItems.KITCHEN_STOVETOP);
-        PFMTagProvider.getOrCreateTagBuilder(TagsRegistry.HEAT_SOURCES)
+        PFMTagProvider.getOrCreateTagBuilder(HEAT_SOURCES)
                 .addKey(stoves.stream().map(block -> Registries.BLOCK.getKey(block).or(null).get()).toArray(RegistryKey[]::new));
     }
 

diff --git a/fabric/src/main/java/com/unlikepaladin/pfm/data/fabric/PFMTagsImpl.java b/fabric/src/main/java/com/unlikepaladin/pfm/data/fabric/PFMTagsImpl.java
@@ -0,0 +1,12 @@
+package com.unlikepaladin.pfm.data.fabric;
+
+import net.minecraft.block.Block;
+import net.minecraft.registry.RegistryKeys;
+import net.minecraft.registry.tag.TagKey;
+import net.minecraft.util.Identifier;
+
+public class PFMTagsImpl {
+    public static TagKey<Block> createTag(Identifier identifier) {
+        return TagKey.of(RegistryKeys.BLOCK, identifier);
+    }
+}
diff --git a/...ic/src/main/java/com/unlikepaladin/pfm/data/fabric/PaladinFurnitureModDataEntrypoint.java b/...ic/src/main/java/com/unlikepaladin/pfm/data/fabric/PaladinFurnitureModDataEntrypoint.java
@@ -3,7 +3,6 @@
 import com.unlikepaladin.pfm.blocks.DinnerChairBlock;
 import com.unlikepaladin.pfm.blocks.*;
 import com.unlikepaladin.pfm.data.FurnitureBlock;
-import com.unlikepaladin.pfm.data.Tags;
 import com.unlikepaladin.pfm.registry.PaladinFurnitureModBlocksItems;
 import com.unlikepaladin.pfm.runtime.data.FurnitureRecipeJsonFactory;
 import net.fabricmc.fabric.api.datagen.v1.DataGeneratorEntrypoint;

diff --git a/fabric/src/main/java/com/unlikepaladin/pfm/data/fabric/TagsImpl.java b/fabric/src/main/java/com/unlikepaladin/pfm/data/fabric/TagsImpl.java
diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json
@@ -9,7 +9,8 @@
   ],
   "contact": {
     "homepage": "https://www.curseforge.com/minecraft/mc-mods/paladins-furniture",
-    "sources": "https://github.com/UnlikePaladin/paladins-furniture"
+    "sources": "https://github.com/UnlikePaladin/paladins-furniture",
+    "issues": "https://github.com/UnlikePaladin/paladins-furniture/issues"
   },
   "contributors": [
     "lzyzl6",
@@ -52,5 +53,12 @@
   },
   "suggests": {
     "patchouli": "*"
+  },
+  "modmenu": {
+    "links": {
+      "modmenu.discord": "https://discord.gg/zbMDUPB",
+      "modmenu.kofi": "https://ko-fi.com/unlikepaladin",
+      "modmenu.modrinth": "https://modrinth.com/mod/paladins-furniture/"
+    }
   }
 }
diff --git a/...rc/main/java/com/unlikepaladin/pfm/compat/farmersdelight/forge/PFMFarmersDelightImpl.java b/...rc/main/java/com/unlikepaladin/pfm/compat/farmersdelight/forge/PFMFarmersDelightImpl.java
@@ -28,7 +28,7 @@ public void generateTags() {
         List<Block> stoves = new ArrayList<>(StoveBlock.streamStoves().map(FurnitureBlock::getBlock).toList());
         stoves.addAll(IronStoveBlock.streamIronStoves().map(FurnitureBlock::getBlock).toList());
         stoves.add(PaladinFurnitureModBlocksItems.KITCHEN_STOVETOP);
-        PFMTagProvider.getOrCreateTagBuilder(ModTags.HEAT_SOURCES)
+        PFMTagProvider.getOrCreateTagBuilder(HEAT_SOURCES)
                 .addKey(stoves.stream().map(block -> Registries.BLOCK.getKey(block).or(null).get()).toArray(RegistryKey[]::new));
     }
 

diff --git a/forge/src/main/java/com/unlikepaladin/pfm/data/forge/PFMTagsImpl.java b/forge/src/main/java/com/unlikepaladin/pfm/data/forge/PFMTagsImpl.java
@@ -0,0 +1,12 @@
+package com.unlikepaladin.pfm.data.forge;
+
+import net.minecraft.block.Block;
+import net.minecraft.registry.tag.BlockTags;
+import net.minecraft.registry.tag.TagKey;
+import net.minecraft.util.Identifier;
+
+public class PFMTagsImpl {
+    public static TagKey<Block> createTag(Identifier identifier) {
+        return BlockTags.create(new Identifier("pfm", "tuckable_blocks"));
+    }
+}
diff --git a/forge/src/main/java/com/unlikepaladin/pfm/data/forge/TagsImpl.java b/forge/src/main/java/com/unlikepaladin/pfm/data/forge/TagsImpl.java
diff --git a/forge/src/main/java/com/unlikepaladin/pfm/forge/PaladinFurnitureModForge.java b/forge/src/main/java/com/unlikepaladin/pfm/forge/PaladinFurnitureModForge.java
@@ -2,7 +2,7 @@
 
 import com.unlikepaladin.pfm.PaladinFurnitureMod;
 import com.unlikepaladin.pfm.config.PaladinFurnitureModConfig;
-import com.unlikepaladin.pfm.data.forge.TagsImpl;
+import com.unlikepaladin.pfm.data.forge.PFMTagsImpl;
 import com.unlikepaladin.pfm.registry.BlockItemRegistry;
 import com.unlikepaladin.pfm.registry.dynamic.forge.LateBlockRegistryForge;
 import com.unlikepaladin.pfm.registry.forge.*;
@@ -29,7 +29,6 @@ public PaladinFurnitureModForge() {
             GENERAL_LOGGER.error("Failed to initialize Paladin's Furniture configuration, default values will be used instead");
             GENERAL_LOGGER.error("", e);
         }
-        TagsImpl.TUCKABLE_BLOCKS = BlockTags.create(new Identifier("pfm", "tuckable_blocks"));
         MinecraftForge.EVENT_BUS.register(EntityRegistryForge.class);
         MinecraftForge.EVENT_BUS.register(BlockItemRegistryForge.class);
         MinecraftForge.EVENT_BUS.register(StatisticsRegistryForge.class);

diff --git a/forge/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml
@@ -11,6 +11,7 @@ authors = "UnlikePaladin"
 description = '''
 A Brand-New Furniture mod for Modern Minecraft where things are functional!
 '''
+itemIcon = "pfm:oak_chair"
 logoFile = "icon.png"
 credits = "Translators: lzyzl6, MIHONO, WrenXing"
 
@@ -26,4 +27,8 @@ modId = "minecraft"
 mandatory = true
 versionRange = "[1.19.4,1.20)"
 ordering = "NONE"
-side = "BOTH"
+side = "BOTH"
+
+[modproperties.pfm]
+catalogueBackground="pfm_background.png"
+catalogueImageIcon=""
diff --git a/gradle.properties b/gradle.properties
@@ -4,7 +4,7 @@ minecraft_version=1.19.4
 enabled_platforms=fabric,forge
 
 archives_base_name=paladin-furniture-mod
-mod_version=1.2.0
+mod_version=1.2.0-rc2
 maven_group=com.unlikepaladin
 
 architectury_version=5.12.42