Merge pull request #4 from UnRealDinnerbone/main

Add copper gear, plate and rods

CHANGELOG.md

@@ -1,3 +1,9 @@
+## [21.1.0-beta.6]
+
+### Added
+
+- Copper Rod, Plate and Gear
+
 ## [21.1.0-beta.5]
 
 ### Added

common/src/main/java/dev/ftb/mods/ftbmaterials/resources/Resource.java

@@ -11,7 +11,7 @@ public enum Resource {
     BRONZE(builder().noOres().noRawOre().noRawBlock().noGem().noCrystal().noShard().noClump().noDirtyDust().noChunk().noCluster().build()),
     CHARCOAL(builder().noOres().noIngot().noBlock().noRawOre().noWire().noRawBlock().noNugget().noPlate().noGear().noRod().noGem().noCrystal().noShard().noClump().noDirtyDust().noBlade().noChunk().noCluster().build()),
     CONSTANTAN(builder().noOres().noRawOre().noRawBlock().noGem().noCrystal().noShard().noClump().noDirtyDust().noBlade().noChunk().noCluster().build()),
-    COPPER(builder().noDeepslateOre().noStoneOre().noBlock().noIngot().noRawOre().noRawBlock().noPlate().noGear().noRod().noGem().build()),
+    COPPER(builder().noDeepslateOre().noStoneOre().noBlock().noIngot().noRawOre().noRawBlock().noGem().build()),
     DIAMOND(ResourceLocation.withDefaultNamespace("needs_iron_tool"),  builder().noGem().noBlock().noDeepslateOre().noStoneOre().noIngot().noRawOre().noRawBlock().noBlade().build()),
     ELECTRUM(builder().noOres().noRawOre().noRawBlock().noCrystal().noShard().noClump().noDirtyDust().noBlade().noChunk().noCluster().build()),
     GOLD(ResourceLocation.withDefaultNamespace("needs_iron_tool"),  builder().noDeepslateOre().noStoneOre().noBlock().noIngot().noNugget().noRawOre().noRawBlock().noBlade().build()),

fabric/src/main/generated/assets/ftbmaterials/lang/en_us.json

@@ -246,8 +246,11 @@
   "item.ftbmaterials.copper_dirty_dust": "Copper Dirty Dust",
   "item.ftbmaterials.copper_dust": "Copper Dust",
   "item.ftbmaterials.copper_end_ore": "Endstone Copper Ore",
+  "item.ftbmaterials.copper_gear": "Copper Gear",
   "item.ftbmaterials.copper_nether_ore": "Nether Copper Ore",
   "item.ftbmaterials.copper_nugget": "Copper Nugget",
+  "item.ftbmaterials.copper_plate": "Copper Plate",
+  "item.ftbmaterials.copper_rod": "Copper Rod",
   "item.ftbmaterials.copper_shard": "Copper Shard",
   "item.ftbmaterials.copper_wire": "Copper Wire",
   "item.ftbmaterials.diamond_chunk": "Diamond Chunk",

fabric/src/main/generated/assets/ftbmaterials/models/item/copper_gear.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "ftbmaterials:item/copper_gear"
+  }
+}

fabric/src/main/generated/assets/ftbmaterials/models/item/copper_plate.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "ftbmaterials:item/copper_plate"
+  }
+}

fabric/src/main/generated/assets/ftbmaterials/models/item/copper_rod.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "ftbmaterials:item/copper_rod"
+  }
+}

fabric/src/main/generated/data/c/tags/item/gears.json

@@ -3,6 +3,7 @@
     "ftbmaterials:aluminum_gear",
     "ftbmaterials:bronze_gear",
     "ftbmaterials:constantan_gear",
+    "ftbmaterials:copper_gear",
     "ftbmaterials:diamond_gear",
     "ftbmaterials:electrum_gear",
     "ftbmaterials:gold_gear",

fabric/src/main/generated/data/c/tags/item/gears/copper.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "ftbmaterials:copper_gear"
+  ]
+}

fabric/src/main/generated/data/c/tags/item/plates.json

@@ -3,6 +3,7 @@
     "ftbmaterials:aluminum_plate",
     "ftbmaterials:bronze_plate",
     "ftbmaterials:constantan_plate",
+    "ftbmaterials:copper_plate",
     "ftbmaterials:diamond_plate",
     "ftbmaterials:electrum_plate",
     "ftbmaterials:gold_plate",

fabric/src/main/generated/data/c/tags/item/plates/copper.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "ftbmaterials:copper_plate"
+  ]
+}

fabric/src/main/generated/data/c/tags/item/rods.json

@@ -3,6 +3,7 @@
     "ftbmaterials:aluminum_rod",
     "ftbmaterials:bronze_rod",
     "ftbmaterials:constantan_rod",
+    "ftbmaterials:copper_rod",
     "ftbmaterials:diamond_rod",
     "ftbmaterials:electrum_rod",
     "ftbmaterials:gold_rod",

fabric/src/main/generated/data/c/tags/item/rods/copper.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "ftbmaterials:copper_rod"
+  ]
+}

gradle.properties

@@ -3,7 +3,7 @@ org.gradle.jvmargs=-Xmx2G
 org.gradle.parallel=true
 
 # Mod properties
-mod_version = 21.1.0-beta.5
+mod_version = 21.1.0-beta.6
 maven_group = dev.ftb.mods
 archives_name = ftbmaterials
 enabled_platforms = fabric,neoforge