Add Polymorphic Wand - Item only

Direwolf20-MC · Dec 7, 2024 · e81533f · e81533f
1 parent 9a881a0
commit e81533f
Show file tree

Hide file tree

Showing 10 changed files with 35 additions and 4 deletions.
diff --git a/src/generated/resources/.cache/69ee5e809dff011efe049b68501078221ca37cb0 b/src/generated/resources/.cache/69ee5e809dff011efe049b68501078221ca37cb0
@@ -1,4 +1,4 @@
-// 1.21.1	2024-12-04T17:22:22.4686514	Item Models: justdirethings
+// 1.21.1	2024-12-07T12:22:16.5077405	Item Models: justdirethings
 c197a1b2a5ae31fcfabfe6cab9ab95a9dc0e1af6 assets/justdirethings/models/item/blazegold_axe.json
 dddf215922d40d92c2d8bce4229f2e2af8b3c7ba assets/justdirethings/models/item/blazegold_axe_active.json
 6396fb6e503760080534bc26337236d4d09a4cb8 assets/justdirethings/models/item/blazegold_block.json
@@ -292,6 +292,7 @@ b10bbca68270e48599af7174531b0235c8e7c9a4 assets/justdirethings/models/item/playe
 86e8b463737ba209a47a1f3544b51525598d38a3 assets/justdirethings/models/item/pocket_generator_active.json
 6ac490fc1ca0a7b3663a770a09e3cd3ade652bb5 assets/justdirethings/models/item/polymorphic_catalyst.json
 c51b41b9c484aa6724dfe24732b06a196ee05ffe assets/justdirethings/models/item/polymorphic_fluid_bucket.json
+af285bda921f3fea66dd01b7b30fadfd8669ee14 assets/justdirethings/models/item/polymorphic_wand.json
 403d14795debb89f422eefb10f3b8188e148190a assets/justdirethings/models/item/portal_fluid_bucket.json
 ea9b4416ff95371822cbc5808fd425323b170cc9 assets/justdirethings/models/item/portal_fluid_catalyst.json
 d8ea68a75b8b49f7765e715d62ad23c2f1939281 assets/justdirethings/models/item/raw_blazegold.json

diff --git a/src/generated/resources/.cache/8202586f691eec5ad0bb88d13a278951d0c130fb b/src/generated/resources/.cache/8202586f691eec5ad0bb88d13a278951d0c130fb
@@ -1,2 +1,2 @@
-// 1.21.1	2024-12-05T15:28:54.1394864	Languages: en_us for mod: justdirethings
-34988637a21b45b6d93036e8fe9525ffdd8c9e97 assets/justdirethings/lang/en_us.json
+// 1.21.1	2024-12-07T12:22:16.5157473	Languages: en_us for mod: justdirethings
+3b47394404270f860109f4004040665ac95dfef0 assets/justdirethings/lang/en_us.json
diff --git a/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e
@@ -1,4 +1,4 @@
-// 1.21.1	2024-11-02T12:45:23.0801389	Recipes
+// 1.21.1	2024-12-07T12:22:16.5167479	Recipes
 39cd44c838de7f56aeac73aec8b3bfb64ad7fec2 data/justdirethings/advancement/recipes/building_blocks/blazegold_ingot_9x9.json
 2f2a0f948f272df9713010dbcb75beb81c328b01 data/justdirethings/advancement/recipes/building_blocks/celestigem_9x9.json
 4c183b67eff4bc24117606cdc45ebcd987dd4138 data/justdirethings/advancement/recipes/building_blocks/charcoal_9x9.json
@@ -307,6 +307,7 @@ dad2a7782e9a1e1d8e7099a6596640b309925ed9 data/justdirethings/advancement/recipes
 2cf19ff627966b28128eb42fd47c9b9e84bc43d8 data/justdirethings/advancement/recipes/misc/pocket_generator.json
 858af81155eff55f8b4cff67f9bade9f64071902 data/justdirethings/advancement/recipes/misc/polymorphic_catalyst.json
 d028ad197c2078a4c30eafcbde2282aff17f1df1 data/justdirethings/advancement/recipes/misc/polymorphic_fluid_block-fluiddrop.json
+8d77029166db109c5f6f34ecd68888bbb458b36f data/justdirethings/advancement/recipes/misc/polymorphic_wand.json
 5570c3f5f6bf47c6d6026ead547ac4516bad5da9 data/justdirethings/advancement/recipes/misc/portalgun.json
 f921713cd6dfa2ad74a0b7144f7778c2fe33bc72 data/justdirethings/advancement/recipes/misc/portalgun_v2.json
 c811419aba5aeaf1be214e7f29492a7ccb300ddd data/justdirethings/advancement/recipes/misc/portal_fluid_block-goospread.json
@@ -696,6 +697,7 @@ de4d6dd744789b903d6828fec4ce5847a1dfef60 data/justdirethings/recipe/paradoxmachi
 cc73b7c24448814a0e8663c8065a6625cbd30072 data/justdirethings/recipe/pocket_generator.json
 035ed5c68eac114352b166d38b7f8308e5db63c0 data/justdirethings/recipe/polymorphic_catalyst.json
 6cfafeb9ae58abc121bd78f1c67b11aedec8297b data/justdirethings/recipe/polymorphic_fluid_block-fluiddrop.json
+fc60c6a1885dc44e50e451ea8e12eb4f9d7acf4c data/justdirethings/recipe/polymorphic_wand.json
 1494fe69edb92207b18a251b9c4a4d7ef2487b45 data/justdirethings/recipe/portalgun.json
 4ed1bcc18461694ef969bb8820a6a4433cec054f data/justdirethings/recipe/portalgun_v2.json
 881053ecbb4f27590666128cfd52f2c212cf6a37 data/justdirethings/recipe/portal_fluid_block-goospread.json

diff --git a/src/generated/resources/assets/justdirethings/lang/en_us.json b/src/generated/resources/assets/justdirethings/lang/en_us.json
@@ -144,6 +144,7 @@
   "item.justdirethings.pocket_generator": "Pocket Generator",
   "item.justdirethings.polymorphic_catalyst": "Polymorphic Catalyst",
   "item.justdirethings.polymorphic_fluid_bucket": "Polymorphic Fluid Bucket",
+  "item.justdirethings.polymorphic_wand": "Polymorphic Wand",
   "item.justdirethings.portal_fluid_bucket": "Portal Fluid Bucket",
   "item.justdirethings.portal_fluid_catalyst": "Portal Fluid Catalyst",
   "item.justdirethings.portalgun": "Portal Gun",

diff --git a/src/main/java/com/direwolf20/justdirethings/common/items/PolymorphicWand.java b/src/main/java/com/direwolf20/justdirethings/common/items/PolymorphicWand.java
@@ -0,0 +1,15 @@
+package com.direwolf20.justdirethings.common.items;
+
+import com.direwolf20.justdirethings.common.items.interfaces.Ability;
+import com.direwolf20.justdirethings.common.items.interfaces.BaseToggleableTool;
+import com.direwolf20.justdirethings.common.items.interfaces.LeftClickableTool;
+
+public class PolymorphicWand extends BaseToggleableTool implements LeftClickableTool {
+    public PolymorphicWand() {
+        super(new Properties()
+                .fireResistant()
+                .durability(200));
+        registerAbility(Ability.LAVAREPAIR);
+        //registerAbility(Ability.AIRBURST, new AbilityParams(1, 2, 1, 2));
+    }
+}
diff --git a/src/main/java/com/direwolf20/justdirethings/datagen/JustDireItemModels.java b/src/main/java/com/direwolf20/justdirethings/datagen/JustDireItemModels.java
@@ -118,6 +118,7 @@ protected void registerModels() {
         singleTexture(Registration.TEMPLATE_CELESTIGEM.getId().getPath(), mcLoc("item/generated"), "layer0", modLoc("item/template_celestigem"));
         singleTexture(Registration.TEMPLATE_ECLIPSEALLOY.getId().getPath(), mcLoc("item/generated"), "layer0", modLoc("item/template_eclipsealloy"));
         singleTexture(Registration.TimeWand.getId().getPath(), mcLoc("item/generated"), "layer0", modLoc("item/time_wand"));
+        singleTexture(Registration.PolymorphicWand.getId().getPath(), mcLoc("item/handheld"), "layer0", modLoc("item/polymorphic_wand"));
 
         registerBowModels();
 

diff --git a/src/main/java/com/direwolf20/justdirethings/datagen/JustDireLanguageProvider.java b/src/main/java/com/direwolf20/justdirethings/datagen/JustDireLanguageProvider.java
@@ -132,6 +132,7 @@ protected void addTranslations() {
         add(Registration.FluidCanister.get(), "Fluid Canister");
         add(Registration.PotionCanister.get(), "Potion Canister");
         add(Registration.TimeWand.get(), "Time Wand");
+        add(Registration.PolymorphicWand.get(), "Polymorphic Wand");
 
         //Tools
         add(Registration.FerricoreSword.get(), "Ferricore Sword");

diff --git a/src/main/java/com/direwolf20/justdirethings/datagen/JustDireRecipes.java b/src/main/java/com/direwolf20/justdirethings/datagen/JustDireRecipes.java
@@ -454,6 +454,15 @@ protected void buildRecipes(RecipeOutput consumer) {
                 .group("justdirethings")
                 .unlockedBy("has_eclipsealloy_ingot", InventoryChangeTrigger.TriggerInstance.hasItems(Registration.EclipseAlloyIngot.get()))
                 .save(consumer);
+        ShapedRecipeBuilder.shaped(RecipeCategory.MISC, Registration.PolymorphicWand.get())
+                .pattern("  b")
+                .pattern(" i ")
+                .pattern("i  ")
+                .define('i', Registration.BlazegoldIngot.get())
+                .define('b', Registration.FluidCanister.get())
+                .group("justdirethings")
+                .unlockedBy("has_blazegold_ingot", InventoryChangeTrigger.TriggerInstance.hasItems(Registration.BlazegoldIngot.get()))
+                .save(consumer);
         ShapedRecipeBuilder.shaped(RecipeCategory.MISC, Registration.TimeWand.get())
                 .pattern(" bt")
                 .pattern(" ib")

diff --git a/src/main/java/com/direwolf20/justdirethings/setup/Registration.java b/src/main/java/com/direwolf20/justdirethings/setup/Registration.java
@@ -518,6 +518,7 @@ public static void init(IEventBus eventBus) {
     public static final DeferredHolder<Item, BlazegoldBow> BlazegoldBow = BOWS.register("bow_blazegold", BlazegoldBow::new);
     public static final DeferredHolder<Item, CelestigemBow> CelestigemBow = BOWS.register("bow_celestigem", CelestigemBow::new);
     public static final DeferredHolder<Item, EclipseAlloyBow> EclipseAlloyBow = BOWS.register("bow_eclipsealloy", EclipseAlloyBow::new);
+    public static final DeferredHolder<Item, PolymorphicWand> PolymorphicWand = ITEMS.register("polymorphic_wand", PolymorphicWand::new);
 
     //Items - Tools
     public static final DeferredHolder<Item, FerricoreSword> FerricoreSword = TOOLS.register("ferricore_sword", FerricoreSword::new);

diff --git a/src/main/resources/assets/justdirethings/textures/item/polymorphic_wand.png b/src/main/resources/assets/justdirethings/textures/item/polymorphic_wand.png