From 959201838109ebddd499dfea871c803b271761ef Mon Sep 17 00:00:00 2001 From: Jottyfan Date: Thu, 14 Dec 2023 20:54:38 +0100 Subject: [PATCH] ingots --- gradle.properties | 2 +- .../quickiefabric/init/RegistryManager.java | 17 +++---- .../items/ItemOxidizedcopperpowder.java | 16 ++++++ .../quickiefabric/items/ItemQuickieingot.java | 16 ++++++ .../quickiefabric/items/ItemSpeedingot.java | 16 ++++++ .../quickiefabric/items/QuickieItems.java | 3 ++ .../assets/quickiefabric/lang/de_de.json | 3 ++ .../assets/quickiefabric/lang/en_us.json | 3 ++ .../models/item/oxidizedcopperpowder.json | 6 +++ .../models/item/quickieingot.json | 6 +++ .../quickiefabric/models/item/speedingot.json | 6 +++ .../textures/item/oxidizedcopperpowder.png | Bin 0 -> 5945 bytes .../textures/item/quickieingot.png | Bin 0 -> 779 bytes .../textures/item/speedingot.png | Bin 0 -> 799 bytes .../loot_tables/blocks/chestaddition.json | 38 ++++++++++++++ .../loot_tables/blocks/speedpowder.json | 48 ------------------ .../recipes/oxidized_copper_powder1.json | 9 ++++ .../recipes/oxidized_copper_powder2.json | 9 ++++ .../recipes/oxidized_copper_powder3.json | 9 ++++ .../recipes/oxidized_copper_powder4.json | 9 ++++ .../quickiefabric/recipes/quickieingot.json | 9 ++++ ...ickiepowder_from_oxidizedcopperpowder.json | 15 ++++++ ...json => quickiepowder_from_slimeball.json} | 2 +- .../recipes/quickiepowderaxe.json | 2 +- .../recipes/quickiepowderhoe.json | 2 +- .../recipes/quickiepowderpickaxe.json | 2 +- .../recipes/quickiepowdershovel.json | 2 +- .../quickiefabric/recipes/speedingot.json | 9 ++++ .../quickiefabric/recipes/speedpowderaxe.json | 2 +- .../quickiefabric/recipes/speedpowderhoe.json | 2 +- .../recipes/speedpowderpickaxe.json | 2 +- .../recipes/speedpowdershovel.json | 2 +- 32 files changed, 198 insertions(+), 69 deletions(-) create mode 100644 src/main/java/de/jottyfan/minecraft/quickiefabric/items/ItemOxidizedcopperpowder.java create mode 100644 src/main/java/de/jottyfan/minecraft/quickiefabric/items/ItemQuickieingot.java create mode 100644 src/main/java/de/jottyfan/minecraft/quickiefabric/items/ItemSpeedingot.java create mode 100644 src/main/resources/assets/quickiefabric/models/item/oxidizedcopperpowder.json create mode 100644 src/main/resources/assets/quickiefabric/models/item/quickieingot.json create mode 100644 src/main/resources/assets/quickiefabric/models/item/speedingot.json create mode 100644 src/main/resources/assets/quickiefabric/textures/item/oxidizedcopperpowder.png create mode 100644 src/main/resources/assets/quickiefabric/textures/item/quickieingot.png create mode 100644 src/main/resources/assets/quickiefabric/textures/item/speedingot.png create mode 100644 src/main/resources/data/quickiefabric/loot_tables/blocks/chestaddition.json delete mode 100644 src/main/resources/data/quickiefabric/loot_tables/blocks/speedpowder.json create mode 100644 src/main/resources/data/quickiefabric/recipes/oxidized_copper_powder1.json create mode 100644 src/main/resources/data/quickiefabric/recipes/oxidized_copper_powder2.json create mode 100644 src/main/resources/data/quickiefabric/recipes/oxidized_copper_powder3.json create mode 100644 src/main/resources/data/quickiefabric/recipes/oxidized_copper_powder4.json create mode 100644 src/main/resources/data/quickiefabric/recipes/quickieingot.json create mode 100644 src/main/resources/data/quickiefabric/recipes/quickiepowder_from_oxidizedcopperpowder.json rename src/main/resources/data/quickiefabric/recipes/{quickiepowder.json => quickiepowder_from_slimeball.json} (93%) create mode 100644 src/main/resources/data/quickiefabric/recipes/speedingot.json diff --git a/gradle.properties b/gradle.properties index 53f1478..e69ba84 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,7 +9,7 @@ loader_version=0.15.1 # Mod Properties - mod_version = 1.20.4.2 + mod_version = 1.20.4.3 maven_group = de.jottyfan.minecraft archives_base_name = quickiefabric diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/init/RegistryManager.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/init/RegistryManager.java index 85e2e9c..70db71f 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/init/RegistryManager.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/init/RegistryManager.java @@ -1,7 +1,5 @@ package de.jottyfan.minecraft.quickiefabric.init; -import java.util.List; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -24,8 +22,6 @@ import de.jottyfan.minecraft.quickiefabric.event.EventBlockBreak; import de.jottyfan.minecraft.quickiefabric.items.QuickieItems; import de.jottyfan.minecraft.quickiefabric.loot.LootHelper; import de.jottyfan.minecraft.quickiefabric.tools.QuickieTools; -import de.jottyfan.minecraft.quickiefabric.world.gen.feature.SulforpadFeature; -import de.jottyfan.minecraft.quickiefabric.world.gen.feature.SulforpadFeatureConfig; import net.fabricmc.fabric.api.biome.v1.BiomeModifications; import net.fabricmc.fabric.api.biome.v1.BiomeSelectors; import net.fabricmc.fabric.api.biome.v1.ModificationPhase; @@ -44,22 +40,15 @@ import net.minecraft.item.BlockItem; import net.minecraft.item.Item; import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemStack; -import net.minecraft.registry.BuiltinRegistries; import net.minecraft.registry.Registries; import net.minecraft.registry.Registry; import net.minecraft.registry.RegistryKey; import net.minecraft.registry.RegistryKeys; -import net.minecraft.registry.entry.RegistryEntry; import net.minecraft.registry.tag.TagKey; import net.minecraft.screen.ScreenHandlerType; import net.minecraft.text.Text; import net.minecraft.util.ActionResult; import net.minecraft.util.Identifier; -import net.minecraft.world.gen.GenerationStep; -import net.minecraft.world.gen.feature.ConfiguredFeature; -import net.minecraft.world.gen.feature.Feature; -import net.minecraft.world.gen.feature.PlacedFeature; -import net.minecraft.world.gen.placementmodifier.SquarePlacementModifier; /** * @@ -89,6 +78,8 @@ public class RegistryManager { stacks.add(new ItemStack(QuickieItems.SULPHOR)); stacks.add(new ItemStack(QuickieItems.SPEEDPOWDER)); stacks.add(new ItemStack(QuickieItems.QUICKIEPOWDER)); + stacks.add(new ItemStack(QuickieItems.SPEEDINGOT)); + stacks.add(new ItemStack(QuickieItems.QUICKIEINGOT)); stacks.add(new ItemStack(QuickieItems.LEVELUP)); stacks.add(new ItemStack(QuickieItems.PENCIL)); stacks.add(new ItemStack(QuickieItems.ROTTEN_FLESH_STRIPES)); @@ -113,6 +104,7 @@ public class RegistryManager { stacks.add(new ItemStack(QuickieItems.BACKPACK_LIGHTBLUE)); stacks.add(new ItemStack(QuickieItems.BAG)); stacks.add(new ItemStack(QuickieItems.STUB)); + stacks.add(new ItemStack(QuickieItems.OXIDIZEDCOPPERPOWDER)); stacks.add(new ItemStack(QuickieTools.SPEEDPOWDERAXE)); stacks.add(new ItemStack(QuickieTools.SPEEDPOWDERPICKAXE)); stacks.add(new ItemStack(QuickieTools.SPEEDPOWDERSHOVEL)); @@ -267,6 +259,9 @@ public class RegistryManager { registerItem(QuickieItems.BACKPACK_LIGHTBLUE, "backpack_lightblue"); registerItem(QuickieItems.BAG, "bag"); registerItem(QuickieItems.STUB, "stub"); + registerItem(QuickieItems.OXIDIZEDCOPPERPOWDER, "oxidizedcopperpowder"); + registerItem(QuickieItems.SPEEDINGOT, "speedingot"); + registerItem(QuickieItems.QUICKIEINGOT, "quickieingot"); ComposterBlock.ITEM_TO_LEVEL_INCREASE_CHANCE.put(QuickieItems.COTTONSEED, 0.5f); ComposterBlock.ITEM_TO_LEVEL_INCREASE_CHANCE.put(QuickieItems.COTTON, 0.75f); diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/items/ItemOxidizedcopperpowder.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/items/ItemOxidizedcopperpowder.java new file mode 100644 index 0000000..9ec5b13 --- /dev/null +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/items/ItemOxidizedcopperpowder.java @@ -0,0 +1,16 @@ +package de.jottyfan.minecraft.quickiefabric.items; + +import net.fabricmc.fabric.api.item.v1.FabricItemSettings; +import net.minecraft.item.Item; + +/** + * + * @author jotty + * + */ +public class ItemOxidizedcopperpowder extends Item { + + public ItemOxidizedcopperpowder() { + super(new FabricItemSettings().maxCount(64)); + } +} diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/items/ItemQuickieingot.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/items/ItemQuickieingot.java new file mode 100644 index 0000000..e76d984 --- /dev/null +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/items/ItemQuickieingot.java @@ -0,0 +1,16 @@ +package de.jottyfan.minecraft.quickiefabric.items; + +import net.fabricmc.fabric.api.item.v1.FabricItemSettings; +import net.minecraft.item.Item; + +/** + * + * @author jotty + * + */ +public class ItemQuickieingot extends Item { + + public ItemQuickieingot() { + super(new FabricItemSettings()); + } +} diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/items/ItemSpeedingot.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/items/ItemSpeedingot.java new file mode 100644 index 0000000..a7751b1 --- /dev/null +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/items/ItemSpeedingot.java @@ -0,0 +1,16 @@ +package de.jottyfan.minecraft.quickiefabric.items; + +import net.fabricmc.fabric.api.item.v1.FabricItemSettings; +import net.minecraft.item.Item; + +/** + * + * @author jotty + * + */ +public class ItemSpeedingot extends Item { + + public ItemSpeedingot() { + super(new FabricItemSettings()); + } +} diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/items/QuickieItems.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/items/QuickieItems.java index 3942b06..4c8bf84 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/items/QuickieItems.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/items/QuickieItems.java @@ -34,4 +34,7 @@ public class QuickieItems { public static final ItemCotton COTTON = new ItemCotton(); public static final ItemCottonseed COTTONSEED = new ItemCottonseed(); public static final ItemStub STUB = new ItemStub(); + public static final ItemOxidizedcopperpowder OXIDIZEDCOPPERPOWDER = new ItemOxidizedcopperpowder(); + public static final ItemSpeedingot SPEEDINGOT = new ItemSpeedingot(); + public static final ItemQuickieingot QUICKIEINGOT = new ItemQuickieingot(); } diff --git a/src/main/resources/assets/quickiefabric/lang/de_de.json b/src/main/resources/assets/quickiefabric/lang/de_de.json index c97b395..5502691 100644 --- a/src/main/resources/assets/quickiefabric/lang/de_de.json +++ b/src/main/resources/assets/quickiefabric/lang/de_de.json @@ -41,6 +41,9 @@ "item.quickiefabric.cotton": "Baumwolle", "item.quickiefabric.cottonseed": "Baumwollsaat", "item.quickiefabric.stub": "Stummel", + "item.quickiefabric.oxidizedcopperpowder": "oxidiertes Kupferpulver", + "item.quickiefabric.speedingot": "Fluchtpulverbarren", + "item.quickiefabric.quickieingot": "Eilpulverbarren", "block.quickiefabric.orenethersulphor": "Nether-Schwefel", "block.quickiefabric.oresalpeter": "Salpetererz", "block.quickiefabric.oresandsalpeter": "Salpetergestein", diff --git a/src/main/resources/assets/quickiefabric/lang/en_us.json b/src/main/resources/assets/quickiefabric/lang/en_us.json index c23f338..e76009e 100644 --- a/src/main/resources/assets/quickiefabric/lang/en_us.json +++ b/src/main/resources/assets/quickiefabric/lang/en_us.json @@ -41,6 +41,9 @@ "item.quickiefabric.cotton": "cotton", "item.quickiefabric.cottonseed": "cotton seed", "item.quickiefabric.stub": "stub", + "item.quickiefabric.oxidizedcopperpowder": "oxidized copper powder", + "item.quickiefabric.speedingot": "Speedpowderingot", + "item.quickiefabric.quickieingot": "Hurrypowderingot", "block.quickiefabric.orenethersulphor": "nether sulfur", "block.quickiefabric.oresalpeter": "salpeter ore", "block.quickiefabric.oresandsalpeter": "salpeter stone", diff --git a/src/main/resources/assets/quickiefabric/models/item/oxidizedcopperpowder.json b/src/main/resources/assets/quickiefabric/models/item/oxidizedcopperpowder.json new file mode 100644 index 0000000..9a26b06 --- /dev/null +++ b/src/main/resources/assets/quickiefabric/models/item/oxidizedcopperpowder.json @@ -0,0 +1,6 @@ +{ + "parent": "item/coal", + "textures": { + "layer0": "quickiefabric:item/oxidizedcopperpowder" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/quickiefabric/models/item/quickieingot.json b/src/main/resources/assets/quickiefabric/models/item/quickieingot.json new file mode 100644 index 0000000..822ede8 --- /dev/null +++ b/src/main/resources/assets/quickiefabric/models/item/quickieingot.json @@ -0,0 +1,6 @@ +{ + "parent": "item/coal", + "textures": { + "layer0": "quickiefabric:item/quickieingot" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/quickiefabric/models/item/speedingot.json b/src/main/resources/assets/quickiefabric/models/item/speedingot.json new file mode 100644 index 0000000..c63668d --- /dev/null +++ b/src/main/resources/assets/quickiefabric/models/item/speedingot.json @@ -0,0 +1,6 @@ +{ + "parent": "item/coal", + "textures": { + "layer0": "quickiefabric:item/speedingot" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/quickiefabric/textures/item/oxidizedcopperpowder.png b/src/main/resources/assets/quickiefabric/textures/item/oxidizedcopperpowder.png new file mode 100644 index 0000000000000000000000000000000000000000..2a3b472b0b5c080d000d377006cc7bc159353804 GIT binary patch literal 5945 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 Bzn1_2 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/quickiefabric/textures/item/quickieingot.png b/src/main/resources/assets/quickiefabric/textures/item/quickieingot.png new file mode 100644 index 0000000000000000000000000000000000000000..cc7b6d3cb74df89eb3fe4698e93a9472b433eff8 GIT binary patch literal 779 zcmV+m1N8ifP)EX>4Tx04R}tkv&MmKpe$iTcsjZK|6>zWT=8*7ZnkwT7@E12(?114knj=L6e3g z#l=x@EjakGSaoo5*44pP5ClI!TwR`&;VI;7KC5R9pqlyyBun?tHBgI6D_TwJ@A;&M0OD0zd zj2sK7K!xP^!T;cQw`P8F!c7XrfzB7({ulv*yFjC6+uz5w-8caP&%l+|@>lA>%qQu! zmKHez`nG|K>y{?(0hc?#;FB&Hk|PCZ`ty0<{fxdT3k=)>-D_@d&3&9c0BPzfc>^3A z0;2`WUiWx+S9@>&o@w^?0{~QV-&Wh95-_CX>@2HM@dakSAh-}0002uNklLc!>N20_cd)nzwh}*p^pHbVRLRa17Rl~IS`Gb{+yJ_iO~yK&ZfO7j002ov JPDHLkV1glxMNt3% literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/quickiefabric/textures/item/speedingot.png b/src/main/resources/assets/quickiefabric/textures/item/speedingot.png new file mode 100644 index 0000000000000000000000000000000000000000..dd44c2f46ec7ed13421fc61daf4bd01a73d4ae31 GIT binary patch literal 799 zcmV+)1K|9LP)EX>4Tx04R}tkv&MmKpe$iTcsjZK|6>zWT=8*7ZnkwT7@E12(?114knj=L6e3g z#l=x@EjakGSaoo5*44pP5ClI!TwR`&;VI;7KC5R9pqlyyBun?tHBgI6D_TwJ@A;&M0OD0zd zj2sK7K!xP^!T;cQw`P8F!c7XrfzB7({ulv*yFjC6+uz5w-8caP&%l+|@>lA>%qQu! zmKHez`nG|K>y{?(0hc?#;FB&Hk|PCZ`ty0<{fxdT3k=)>-D_@d&3&9c0BPzfc>^3A z0;2`WUiWx+S9@>&o@w^?0{~QV-&Wh95-$o5(Y?h0000?uMObu0Z*6U5Zgc=ca%Ew3 zWn>_CX>@2HM@dakSAh-}0002?NklSH}F6>?X*y?+s+pV>8xV0yAm~tmfkcw4Ez1V{4?-xBErui z{Or13y9e34&)#HyHexGmT~t9sZ(k_ewcObG~C2@&CE!}&YJ@-Z_$ zCi;yfV-;u*(wW4WPs&9sWWa@L(77=&minU=xq^O`%Mll7ly4!ON&ePLx