From 32df2c716b15772df581f2695b8cf813b11e839d Mon Sep 17 00:00:00 2001 From: UnRealDinnerbone Date: Thu, 9 Jan 2025 09:59:10 -0600 Subject: [PATCH] Add copper gear, plate and rod --- CHANGELOG.md | 6 ++++++ .../ftb/mods/ftbmaterials/resources/Resource.java | 2 +- .../ftbmaterials/textures/item/copper_gear.png | Bin 0 -> 588 bytes .../ftbmaterials/textures/item/copper_plate.png | Bin 0 -> 468 bytes .../ftbmaterials/textures/item/copper_rod.png | Bin 0 -> 370 bytes .../generated/assets/ftbmaterials/lang/en_us.json | 3 +++ .../ftbmaterials/models/item/copper_gear.json | 6 ++++++ .../ftbmaterials/models/item/copper_plate.json | 6 ++++++ .../ftbmaterials/models/item/copper_rod.json | 6 ++++++ .../main/generated/data/c/tags/item/gears.json | 1 + .../generated/data/c/tags/item/gears/copper.json | 5 +++++ .../main/generated/data/c/tags/item/plates.json | 1 + .../generated/data/c/tags/item/plates/copper.json | 5 +++++ .../src/main/generated/data/c/tags/item/rods.json | 1 + .../generated/data/c/tags/item/rods/copper.json | 5 +++++ gradle.properties | 2 +- 16 files changed, 47 insertions(+), 2 deletions(-) create mode 100644 common/src/main/resources/assets/ftbmaterials/textures/item/copper_gear.png create mode 100644 common/src/main/resources/assets/ftbmaterials/textures/item/copper_plate.png create mode 100644 common/src/main/resources/assets/ftbmaterials/textures/item/copper_rod.png create mode 100644 fabric/src/main/generated/assets/ftbmaterials/models/item/copper_gear.json create mode 100644 fabric/src/main/generated/assets/ftbmaterials/models/item/copper_plate.json create mode 100644 fabric/src/main/generated/assets/ftbmaterials/models/item/copper_rod.json create mode 100644 fabric/src/main/generated/data/c/tags/item/gears/copper.json create mode 100644 fabric/src/main/generated/data/c/tags/item/plates/copper.json create mode 100644 fabric/src/main/generated/data/c/tags/item/rods/copper.json diff --git a/CHANGELOG.md b/CHANGELOG.md index 56425e0..620cfc9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## [21.1.0-beta.6] + +### Added + +- Copper Rod, Plate and Gear + ## [21.1.0-beta.5] ### Added diff --git a/common/src/main/java/dev/ftb/mods/ftbmaterials/resources/Resource.java b/common/src/main/java/dev/ftb/mods/ftbmaterials/resources/Resource.java index 6b3e22e..ec5a6f6 100644 --- a/common/src/main/java/dev/ftb/mods/ftbmaterials/resources/Resource.java +++ b/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()), diff --git a/common/src/main/resources/assets/ftbmaterials/textures/item/copper_gear.png b/common/src/main/resources/assets/ftbmaterials/textures/item/copper_gear.png new file mode 100644 index 0000000000000000000000000000000000000000..b248ca61a57c08826480bbba3e839869166901e7 GIT binary patch literal 588 zcmV-S0<-;zP)LliN-cQ51&1y{Etwrf3truu_#^DaHe)nrh;OSA7Q) z-@pg(QG6DY-sp`ngK12_k`jSPFjBP#+77LA*vpGDL($&xU#`9XZ?E;QY$YOGL@9u` zFV@K~uS`3S>FVEu#d}Z5zkH1b&Y8uSu}LYJzqy8;TSkl#r&yW<(%bq7Fa}J%=oHpL zTasS7jkXs^WwOj&&C%c9kV#l@+&UW}HZQE)N6*@1)*hj>MvMVq_DYVFa~VBrlg=0D zxK)YAN;+_gCFSjHp)3ofHKEs|Uw7%(T_g<9_B>)D28|loawW+m0Sp>7NiP)uh=v{~ z`*oaRNjb%m@^&}ld|15uB<|o0AjXJ&eFbYi1Hh?44H`8DjT%m|qS6Aq5?+fBT^FZk^y(a@W| z#*SMhTdpW?zfQJXQ9<`Ne(MOo^@HKTPEwmR11J&U^Q-4fld>!sZzuZiGXXq&^L`At ai2efVeEBP4xDIy!0000rlg)0^Koo_)8UKxANN6Kyq*PETyGUIjb<+ppnfgF1 zyG9_4s!~Iv%EBh8ZE8<$7p@(Wuq@f=gu7^B0Q(`v($hKaQWdJ0RP|!l-fPh zS==;4c=)y8{l&)?05Cc|@B7v56=JObIA(zIe41q@%5jvLoB+_==l_mSCb5XMqJ2X+ zouPw}byc8!gIFtdcDEnFKb%k|aeHGJ;U7)_sIxl|LHlOoZgDNPy6@w34rDk#`%5g; zztgAWo9H@dUDbIiy8t>T0L?0g^?J*yV+MG`G1@moC-Z)|J)q80ywMn2ERm+}h067C z%m8g70D{+3f;Y$8GXPYX#L}!X!s(3S`xl&GfDXFs3U4%ShkWxD_vOJJ05=+{I!{Hr z9>e(=q*J5zOS>-imGjBJJd#p3HsmN_BeyD3t1N+%5Irf8!%YZJaW6-MDlB0000< KMNUMnLSTZQ<Dl0Q$vKp2OAuarcA;NU+m@494#^EeW`SC+ zw!0)Z43gWZ5AM?iYPs6(lH@idw^6&gO`kw5U-U;mFtZ|fuRtx=ukXm2>yXUCd4IHX zFHsOLv$q!n!uI$ml`c{-d_RWPk3hnwOnenC_LW> zM}qhd3xo^FtW+2PG|x0NUvT(>M?Xw`=TyOJ_N-mrJdkG^SnE>&$P5F(H_<|<22eXA Q0{{R307*qoM6N<$g3n5qLjV8( literal 0 HcmV?d00001 diff --git a/fabric/src/main/generated/assets/ftbmaterials/lang/en_us.json b/fabric/src/main/generated/assets/ftbmaterials/lang/en_us.json index 7644e4b..b0d669e 100644 --- a/fabric/src/main/generated/assets/ftbmaterials/lang/en_us.json +++ b/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", diff --git a/fabric/src/main/generated/assets/ftbmaterials/models/item/copper_gear.json b/fabric/src/main/generated/assets/ftbmaterials/models/item/copper_gear.json new file mode 100644 index 0000000..81a63c7 --- /dev/null +++ b/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" + } +} \ No newline at end of file diff --git a/fabric/src/main/generated/assets/ftbmaterials/models/item/copper_plate.json b/fabric/src/main/generated/assets/ftbmaterials/models/item/copper_plate.json new file mode 100644 index 0000000..3bd3a1f --- /dev/null +++ b/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" + } +} \ No newline at end of file diff --git a/fabric/src/main/generated/assets/ftbmaterials/models/item/copper_rod.json b/fabric/src/main/generated/assets/ftbmaterials/models/item/copper_rod.json new file mode 100644 index 0000000..4b5c981 --- /dev/null +++ b/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" + } +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/c/tags/item/gears.json b/fabric/src/main/generated/data/c/tags/item/gears.json index 31a21f3..8a37199 100644 --- a/fabric/src/main/generated/data/c/tags/item/gears.json +++ b/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", diff --git a/fabric/src/main/generated/data/c/tags/item/gears/copper.json b/fabric/src/main/generated/data/c/tags/item/gears/copper.json new file mode 100644 index 0000000..3c58422 --- /dev/null +++ b/fabric/src/main/generated/data/c/tags/item/gears/copper.json @@ -0,0 +1,5 @@ +{ + "values": [ + "ftbmaterials:copper_gear" + ] +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/c/tags/item/plates.json b/fabric/src/main/generated/data/c/tags/item/plates.json index d35b10d..6027fbe 100644 --- a/fabric/src/main/generated/data/c/tags/item/plates.json +++ b/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", diff --git a/fabric/src/main/generated/data/c/tags/item/plates/copper.json b/fabric/src/main/generated/data/c/tags/item/plates/copper.json new file mode 100644 index 0000000..f1b68f4 --- /dev/null +++ b/fabric/src/main/generated/data/c/tags/item/plates/copper.json @@ -0,0 +1,5 @@ +{ + "values": [ + "ftbmaterials:copper_plate" + ] +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/c/tags/item/rods.json b/fabric/src/main/generated/data/c/tags/item/rods.json index 1e73860..6bbd18a 100644 --- a/fabric/src/main/generated/data/c/tags/item/rods.json +++ b/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", diff --git a/fabric/src/main/generated/data/c/tags/item/rods/copper.json b/fabric/src/main/generated/data/c/tags/item/rods/copper.json new file mode 100644 index 0000000..5f73567 --- /dev/null +++ b/fabric/src/main/generated/data/c/tags/item/rods/copper.json @@ -0,0 +1,5 @@ +{ + "values": [ + "ftbmaterials:copper_rod" + ] +} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 9aefc03..590cb27 100644 --- a/gradle.properties +++ b/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