Add rose gold block & update translations

xYundy · Apr 2, 2024 · 6853876 · 6853876
1 parent 12e8345
commit 6853876
Show file tree

Hide file tree

Showing 22 changed files with 138 additions and 17 deletions.
diff --git a/src/main/generated/.cache/9adbe1c44971b18122390f472ecf7bb970889f75 b/src/main/generated/.cache/9adbe1c44971b18122390f472ecf7bb970889f75
@@ -1,12 +1,15 @@
-// 1.20.1	2024-04-02T21:38:24.042888	Squared Additions/Model Definitions
-71776dfec5b5f01ce4a9d3b3e000c3bf53bd5bf5 assets/squaredadditions/models/item/copper_shovel.json
-d12673ccac5079afad74fa93feb5535be7cbcb26 assets/squaredadditions/models/item/emerald_shovel.json
+// 1.20.1	2024-04-02T21:58:30.934128	Squared Additions/Model Definitions
+3ceb6fe4e90e966a3f55f5738ca042b18f9a0ca1 assets/squaredadditions/models/block/rose_gold_block.json
 6f15bf8607ada3d987a355d2f2a351969840e7e1 assets/squaredadditions/models/item/emerald_sword.json
 cbae0d76c7081cc2a6373ced0f6186dc4551aa9d assets/squaredadditions/models/item/emerald_axe.json
+f6d93aff2c2a7ee3e0f25897e8bd9c986ae407d5 assets/squaredadditions/blockstates/rose_gold_block.json
 176ad04c6ba42342adc0e6c5fd107be0e63c65b6 assets/squaredadditions/models/item/emerald_hoe.json
-9011be1ee37f6ae56b0d484b34eac096b9f6e907 assets/squaredadditions/models/item/emerald_pickaxe.json
-5dc59b79a3e713f07045de3613f4ed4b3e29befc assets/squaredadditions/models/item/copper_sword.json
 0aa7b4259ef0cf273586e6aa78649b2887b01a87 assets/squaredadditions/models/item/rose_gold_ingot.json
+5dc59b79a3e713f07045de3613f4ed4b3e29befc assets/squaredadditions/models/item/copper_sword.json
+71776dfec5b5f01ce4a9d3b3e000c3bf53bd5bf5 assets/squaredadditions/models/item/copper_shovel.json
+39afaac6b756f9390a49ed7cc14c1988f5027523 assets/squaredadditions/models/item/rose_gold_block.json
+d12673ccac5079afad74fa93feb5535be7cbcb26 assets/squaredadditions/models/item/emerald_shovel.json
+9011be1ee37f6ae56b0d484b34eac096b9f6e907 assets/squaredadditions/models/item/emerald_pickaxe.json
 32fe678c1527b64ea225930db2db5251c0a7ba7a assets/squaredadditions/models/item/copper_pickaxe.json
-f6bd2f2c35340d899a2928bdacb127ca28140e3d assets/squaredadditions/models/item/copper_hoe.json
 e707267f36198cf7a546e3b58db73fa98b8e056a assets/squaredadditions/models/item/copper_axe.json
+f6bd2f2c35340d899a2928bdacb127ca28140e3d assets/squaredadditions/models/item/copper_hoe.json
diff --git a/src/main/generated/assets/squaredadditions/blockstates/rose_gold_block.json b/src/main/generated/assets/squaredadditions/blockstates/rose_gold_block.json
@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "squaredadditions:block/rose_gold_block"
+    }
+  }
+}
diff --git a/src/main/generated/assets/squaredadditions/models/block/rose_gold_block.json b/src/main/generated/assets/squaredadditions/models/block/rose_gold_block.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cube_all",
+  "textures": {
+    "all": "squaredadditions:block/rose_gold_block"
+  }
+}
diff --git a/src/main/generated/assets/squaredadditions/models/item/rose_gold_block.json b/src/main/generated/assets/squaredadditions/models/item/rose_gold_block.json
@@ -0,0 +1,3 @@
+{
+  "parent": "squaredadditions:block/rose_gold_block"
+}
diff --git a/src/main/java/pl/xyundy/squaredadditions/SquaredAdditions.java b/src/main/java/pl/xyundy/squaredadditions/SquaredAdditions.java
@@ -4,6 +4,7 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import pl.xyundy.squaredadditions.block.ModBlocks;
 import pl.xyundy.squaredadditions.item.ModItems;
 
 public class SquaredAdditions implements ModInitializer {
@@ -14,6 +15,7 @@ public class SquaredAdditions implements ModInitializer {
 	public void onInitialize() {
   		LOGGER.info("SquaredAdditions initialization started!");
 		ModItems.registerModItems();
+		ModBlocks.registerModBlocks();
 		LOGGER.info("SquaredAdditions initialization completed!");
 	}
 }
diff --git a/src/main/java/pl/xyundy/squaredadditions/block/ModBlocks.java b/src/main/java/pl/xyundy/squaredadditions/block/ModBlocks.java
@@ -0,0 +1,29 @@
+package pl.xyundy.squaredadditions.block;
+
+import net.fabricmc.fabric.api.item.v1.FabricItemSettings;
+import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
+import pl.xyundy.squaredadditions.SquaredAdditions;
+import net.minecraft.block.Block;
+import net.minecraft.block.Blocks;
+import net.minecraft.item.BlockItem;
+import net.minecraft.registry.Registries;
+import net.minecraft.registry.Registry;
+import net.minecraft.util.Identifier;
+public class ModBlocks {
+    public static final Block ROSE_GOLD_BLOCK = registerBlock("rose_gold_block",
+            new Block(FabricBlockSettings.copyOf(Blocks.GOLD_BLOCK)));
+
+    private static Block registerBlock(String name, Block block) {
+        registerBlockItem(name, block);
+        return Registry.register(Registries.BLOCK, new Identifier(SquaredAdditions.MOD_ID, name), block);
+    }
+
+    private static void registerBlockItem(String name, Block block) {
+        Registry.register(Registries.ITEM, new Identifier(SquaredAdditions.MOD_ID, name),
+                new BlockItem(block, new FabricItemSettings()));
+    }
+
+    public static void registerModBlocks() {
+        SquaredAdditions.LOGGER.info("Registering ModBlocks for " + SquaredAdditions.MOD_ID);
+    }
+}
diff --git a/src/main/java/pl/xyundy/squaredadditions/datagen/ModModelProvider.java b/src/main/java/pl/xyundy/squaredadditions/datagen/ModModelProvider.java
@@ -4,6 +4,7 @@
 import net.fabricmc.fabric.api.datagen.v1.provider.FabricModelProvider;
 import net.minecraft.data.client.BlockStateModelGenerator;
 import net.minecraft.data.client.ItemModelGenerator;
+import pl.xyundy.squaredadditions.block.ModBlocks;
 import pl.xyundy.squaredadditions.item.ModItems;
 import net.minecraft.data.client.Models;
 public class ModModelProvider extends FabricModelProvider {
@@ -13,7 +14,7 @@ public ModModelProvider(FabricDataOutput output) {
 
     @Override
     public void generateBlockStateModels(BlockStateModelGenerator blockStateModelGenerator) {
-
+        blockStateModelGenerator.registerSimpleCubeAll(ModBlocks.ROSE_GOLD_BLOCK);
     }
 
     @Override

diff --git a/src/main/java/pl/xyundy/squaredadditions/item/ModItems.java b/src/main/java/pl/xyundy/squaredadditions/item/ModItems.java
@@ -8,6 +8,7 @@
 import net.minecraft.registry.Registry;
 import net.minecraft.util.Identifier;
 import pl.xyundy.squaredadditions.SquaredAdditions;
+import pl.xyundy.squaredadditions.block.ModBlocks;
 
 public class ModItems {
 
@@ -64,12 +65,17 @@ public static void itemGroupIngredient(FabricItemGroupEntries entries) {
         entries.add(ROSE_GOLD_INGOT);
     }
 
+    public static void itemGroupBuildingBlocks(FabricItemGroupEntries entries) {
+        entries.add(ModBlocks.ROSE_GOLD_BLOCK);
+    }
+
     public static void registerModItems() {
         SquaredAdditions.LOGGER.info("Registering Mod Items for " + SquaredAdditions.MOD_ID);
 
         ItemGroupEvents.modifyEntriesEvent(ItemGroups.TOOLS).register(ModItems::itemGroupTools);
         ItemGroupEvents.modifyEntriesEvent(ItemGroups.COMBAT).register(ModItems::itemGroupCombat);
         ItemGroupEvents.modifyEntriesEvent(ItemGroups.INGREDIENTS).register(ModItems::itemGroupIngredient);
+        ItemGroupEvents.modifyEntriesEvent(ItemGroups.BUILDING_BLOCKS).register(ModItems::itemGroupBuildingBlocks);
 
         SquaredAdditions.LOGGER.info("Registering Mod Items for " + SquaredAdditions.MOD_ID + " finished!");
 

diff --git a/src/main/resources/assets/squaredadditions/lang/cs_cz.json b/src/main/resources/assets/squaredadditions/lang/cs_cz.json
@@ -14,5 +14,7 @@
     "item.squaredadditions.emerald_shovel": "Smaragdová lopata",
     "item.squaredadditions.emerald_hoe": "Smaragdová motyčka",
     "item.squaredadditions.emerald_axe": "Smaragdová sekera",
-    "item.squaredadditions.emerald_pickaxe": "Smaragdový krumpáč"
+    "item.squaredadditions.emerald_pickaxe": "Smaragdový krumpáč",
+    "item.squaredadditions.rose_gold_ingot": "Slitek růžového zlata",
+    "block.squaredadditions.rose_gold_block": "Blok růžového zlata"
 }
diff --git a/src/main/resources/assets/squaredadditions/lang/de_de.json b/src/main/resources/assets/squaredadditions/lang/de_de.json
@@ -15,5 +15,7 @@
     "item.squaredadditions.emerald_shovel": "Smaragd Schaufel",
     "item.squaredadditions.emerald_hoe": "Smaragd Hacke",
     "item.squaredadditions.emerald_axe": "Smaragd Axt",
-    "item.squaredadditions.emerald_pickaxe": "Smaragd Spitzhacke"
+    "item.squaredadditions.emerald_pickaxe": "Smaragd Spitzhacke",
+    "item.squaredadditions.rose_gold_ingot": "Roségoldbarren",
+    "block.squaredadditions.rose_gold_block": "Roségoldblock"
 }
diff --git a/src/main/resources/assets/squaredadditions/lang/en_us.json b/src/main/resources/assets/squaredadditions/lang/en_us.json
@@ -15,5 +15,6 @@
     "item.squaredadditions.emerald_hoe": "Emerald Hoe",
     "item.squaredadditions.emerald_axe": "Emerald Axe",
     "item.squaredadditions.emerald_pickaxe": "Emerald Pickaxe",
-    "item.squaredadditions.rose_gold_ingot": "Rose Gold Ingot"
+    "item.squaredadditions.rose_gold_ingot": "Rose Gold Ingot",
+    "block.squaredadditions.rose_gold_block": "Rose Gold Block"
 }
diff --git a/src/main/resources/assets/squaredadditions/lang/fr_fr.json b/src/main/resources/assets/squaredadditions/lang/fr_fr.json
@@ -15,5 +15,7 @@
     "item.squaredadditions.emerald_shovel": "Pelle d'émeraude",
     "item.squaredadditions.emerald_hoe": "Houe d'émeraude",
     "item.squaredadditions.emerald_axe": "Hache d'émeraude",
-    "item.squaredadditions.emerald_pickaxe": "Pioche d'émeraude"
+    "item.squaredadditions.emerald_pickaxe": "Pioche d'émeraude",
+    "item.squaredadditions.rose_gold_ingot": "Lingot d'or rose",
+    "block.squaredadditions.rose_gold_block": "Bloc d'or rose"
 }
diff --git a/src/main/resources/assets/squaredadditions/lang/it_it.json b/src/main/resources/assets/squaredadditions/lang/it_it.json
@@ -15,5 +15,7 @@
     "item.squaredadditions.emerald_shovel": "Pala di Smeraldo",
     "item.squaredadditions.emerald_hoe": "Zappa di smeraldo",
     "item.squaredadditions.emerald_axe": "Ascia di smeraldo",
-    "item.squaredadditions.emerald_pickaxe": "Piccone di smeraldo"
+    "item.squaredadditions.emerald_pickaxe": "Piccone di smeraldo",
+    "item.squaredadditions.rose_gold_ingot": "Lingotto d'oro rosa",
+    "block.squaredadditions.rose_gold_block": "Blocco oro rosa"
 }
diff --git a/src/main/resources/assets/squaredadditions/lang/pl_pl.json b/src/main/resources/assets/squaredadditions/lang/pl_pl.json
@@ -16,6 +16,6 @@
     "item.squaredadditions.emerald_hoe": "Szmaragdowa Motyka",
     "item.squaredadditions.emerald_axe": "Szmaragdowa Siekiera",
     "item.squaredadditions.emerald_pickaxe": "Szmaragdowy Kilof",
-    "item.squaredadditions.rose_gold_ingot": "Sztabka Różowego Złota"
-
+    "item.squaredadditions.rose_gold_ingot": "Sztabka Różowego Złota",
+    "block.squaredadditions.rose_gold_block": "Blok Różowego Złota"
 }
diff --git a/src/main/resources/assets/squaredadditions/lang/ro_ro.json b/src/main/resources/assets/squaredadditions/lang/ro_ro.json
@@ -15,5 +15,7 @@
     "item.squaredadditions.emerald_shovel": "Lopata de smarald",
     "item.squaredadditions.emerald_hoe": "Sapa de smarald",
     "item.squaredadditions.emerald_axe": "Topor de smarald",
-    "item.squaredadditions.emerald_pickaxe": "Picamer de smarald"
+    "item.squaredadditions.emerald_pickaxe": "Picamer de smarald",
+    "item.squaredadditions.rose_gold_ingot": "Lingou de aur roz",
+    "block.squaredadditions.rose_gold_block": "Bloc de aur roz"
 }
diff --git a/src/main/resources/assets/squaredadditions/lang/sk_sk.json b/src/main/resources/assets/squaredadditions/lang/sk_sk.json
@@ -15,5 +15,7 @@
     "item.squaredadditions.emerald_shovel": "Smaragdová lopata",
     "item.squaredadditions.emerald_hoe": "Smaragdová motyka",
     "item.squaredadditions.emerald_axe": "Smaragdová sekera",
-    "item.squaredadditions.emerald_pickaxe": "Smaragdový krompáč"
+    "item.squaredadditions.emerald_pickaxe": "Smaragdový krompáč",
+    "item.squaredadditions.rose_gold_ingot": "Zliatok ružového zlata",
+    "block.squaredadditions.rose_gold_block": "Blok ružového zlata"
 }
diff --git a/src/main/resources/assets/squaredadditions/lang/uk_ua.json b/src/main/resources/assets/squaredadditions/lang/uk_ua.json
@@ -15,5 +15,7 @@
     "item.squaredadditions.emerald_shovel": "Смарагдова лопата",
     "item.squaredadditions.emerald_hoe": "Смарагдова мотика",
     "item.squaredadditions.emerald_axe": "Смарагдова сокира",
-    "item.squaredadditions.emerald_pickaxe": "Смарагдова кирка"
+    "item.squaredadditions.emerald_pickaxe": "Смарагдова кирка",
+    "item.squaredadditions.rose_gold_ingot": "Злиток рожевого золота",
+    "block.squaredadditions.rose_gold_block": "Кулон з рожевого золота"
 }
diff --git a/src/main/resources/assets/squaredadditions/textures/block/rose_gold_block.png b/src/main/resources/assets/squaredadditions/textures/block/rose_gold_block.png
diff --git a/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json b/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json
@@ -0,0 +1,6 @@
+{
+  "replace": false,
+  "values": [
+    "squaredadditions:rose_gold_block"
+  ]
+}
diff --git a/src/main/resources/data/minecraft/tags/blocks/needs_iron_tool.json b/src/main/resources/data/minecraft/tags/blocks/needs_iron_tool.json
@@ -0,0 +1,6 @@
+{
+  "replace": false,
+  "values": [
+    "squaredadditions:rose_gold_block"
+  ]
+}
diff --git a/src/main/resources/data/squaredadditions/loot_tables/blocks/rose_gold_block.json b/src/main/resources/data/squaredadditions/loot_tables/blocks/rose_gold_block.json
@@ -0,0 +1,20 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "squaredadditions:rose_gold_block"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ]
+}
diff --git a/src/main/resources/data/squaredadditions/recipes/rose_gold_block.json b/src/main/resources/data/squaredadditions/recipes/rose_gold_block.json
@@ -0,0 +1,17 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "category": "misc",
+  "pattern": [
+    "###",
+    "###",
+    "###"
+  ],
+  "key": {
+    "#": {
+      "item": "squaredadditions:rose_gold_ingot"
+    }
+  },
+  "result": {
+    "item": "squaredadditions:rose_gold_block"
+  }
+}