added jackhammers

GT-Reimagined · Mar 10, 2024 · 01c7ea1 · 01c7ea1
1 parent d298f01
commit 01c7ea1
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 15 deletions.
diff --git a/AntimatterAPI b/AntimatterAPI
diff --git a/common/src/main/java/trinsdar/gt4r/data/GT4RData.java b/common/src/main/java/trinsdar/gt4r/data/GT4RData.java
@@ -137,17 +137,20 @@ private static Block.Properties prepareProperties() {
     public static ItemBasic<?> MachineParts = new ItemBasic<>(GT4RRef.ID, "machine_parts");
     public static ItemBasic<?> StorageDataOrb = new ItemStorageOrb(GT4RRef.ID, "storage_data_orb").tip("A High Capacity Data Storage");
 
-    public static ItemElectricTool Drill = new ItemElectricTool("drill", GTCoreTools.DRILL, 6.0f, 5.5f, 2, 1, b -> !(b instanceof BehaviourAOEBreak));
-    public static ItemElectricTool DiamondDrill = new ItemElectricTool("diamond_drill", GTCoreTools.DRILL, 8.0f, 6.0f, 3, 1, b -> !(b instanceof BehaviourAOEBreak));
-    public static ItemElectricTool AdvancedDrill = new ItemElectricTool("advanced_drill", GTCoreTools.DRILL, 10.0f, 9.0f, 4, 2, b -> true);
-    public static ItemElectricTool Chainsaw = new ItemElectricTool("chainsaw", GTCoreTools.CHAINSAW, 6.0f, 8.5f, 2, 1, b -> true);
-    public static ItemElectricTool AdvancedChainsaw = new ItemElectricTool("advanced_chainsaw", GTCoreTools.CHAINSAW, 10.0f, 12f, 4, 2, b -> true);
-    public static ItemElectricTool ElectricWrench = new ItemElectricTool("electric_wrench", GTCoreTools.ELECTRIC_WRENCH, 6.0f, 4f, 2, 1, b -> true);
-    public static ItemElectricTool AdvancedWrench = new ItemElectricTool("advanced_wrench", GTCoreTools.ELECTRIC_WRENCH, 10.0f, 7.5f, 4, 2, b -> true);
-    public static ItemElectricTool ElectricWrenchAlt = new ItemElectricTool("electric_wrench_alt", GTCoreTools.ELECTRIC_WRENCH_ALT, 6.0f, 4f, 2, 1, b -> true);
-    public static ItemElectricTool AdvancedWrenchAlt = new ItemElectricTool("advanced_wrench_alt", GTCoreTools.ELECTRIC_WRENCH_ALT, 10.0f, 7.5f, 4, 2, b -> true);
-    public static ItemElectricTool ElectricScrewdriver = new ItemElectricTool("electric_screwdriver", GTCoreTools.ELECTRIC_SCREWDRIVER, 6.0f, 2.5f, 2, 1, b -> true);
-    public static ItemElectricTool RockCutter = new ItemElectricTool("rock_cutter", ToolTypes.ROCK_CUTTER, 8.0f, 1.0f, 3, 1, b -> true);
+    public static ItemElectricTool Drill = new ItemElectricTool("drill", GTCoreTools.DRILL, Steel, 6.0f, 5.5f, 2, 1, b -> !(b instanceof BehaviourAOEBreak));
+    public static ItemElectricTool DiamondDrill = new ItemElectricTool("diamond_drill", GTCoreTools.DRILL, Steel, 8.0f, 6.0f, 3, 1, b -> !(b instanceof BehaviourAOEBreak));
+    public static ItemElectricTool AdvancedDrill = new ItemElectricTool("advanced_drill", GTCoreTools.DRILL, TungstenSteel, 10.0f, 9.0f, 4, 2, b -> true);
+    public static ItemElectricTool Chainsaw = new ItemElectricTool("chainsaw", GTCoreTools.CHAINSAW, Steel, 6.0f, 8.5f, 2, 1, b -> true);
+    public static ItemElectricTool AdvancedChainsaw = new ItemElectricTool("advanced_chainsaw", GTCoreTools.CHAINSAW, TungstenSteel, 10.0f, 12f, 4, 2, b -> true);
+    public static ItemElectricTool ElectricWrench = new ItemElectricTool("electric_wrench", GTCoreTools.ELECTRIC_WRENCH, Steel, 6.0f, 4f, 2, 1, b -> true);
+    public static ItemElectricTool AdvancedWrench = new ItemElectricTool("advanced_wrench", GTCoreTools.ELECTRIC_WRENCH, TungstenSteel, 10.0f, 7.5f, 4, 2, b -> true);
+    public static ItemElectricTool ElectricWrenchAlt = new ItemElectricTool("electric_wrench_alt", GTCoreTools.ELECTRIC_WRENCH_ALT, Steel, 6.0f, 4f, 2, 1, b -> true);
+    public static ItemElectricTool AdvancedWrenchAlt = new ItemElectricTool("advanced_wrench_alt", GTCoreTools.ELECTRIC_WRENCH_ALT, TungstenSteel, 10.0f, 7.5f, 4, 2, b -> true);
+    public static ItemElectricTool ElectricScrewdriver = new ItemElectricTool("electric_screwdriver", GTCoreTools.ELECTRIC_SCREWDRIVER, Steel, 6.0f, 2.5f, 2, 1, b -> true);
+    public static ItemElectricTool RockCutter = new ItemElectricTool("rock_cutter", ToolTypes.ROCK_CUTTER, AntimatterMaterials.Diamond, 8.0f, 1.0f, 3, 1, b -> true);
+    public static ItemElectricTool BronzeJackHammer = new ItemElectricTool("bronze_jackhammer", GTCoreTools.JACKHAMMER, Bronze, 6.0f, 5f, 2, 1, b -> !(b instanceof BehaviourAOEBreak));
+    public static ItemElectricTool SteelJackHammer = new ItemElectricTool("steel_jackhammer", GTCoreTools.JACKHAMMER, Steel, 8.0f, 5.5f, 2, 1, b -> !(b instanceof BehaviourAOEBreak));
+    public static ItemElectricTool DiamondJackHammer = new ItemElectricTool("diamond_jackhammer", GTCoreTools.JACKHAMMER, AntimatterMaterials.Diamond, 10.0f, 6.0f, 3, 2, b -> true);
 
     public static ItemBasic<?> ZPM = new ItemBattery(GT4RRef.ID, "zpm", Tier.ZPM, 100000000000L, false);
     //public static ItemBasic<?> BatteryEnergyOrbCluster = new ItemBasic<>(Ref.ID, "battery_energy_orb_cluster");

diff --git a/common/src/main/java/trinsdar/gt4r/items/ItemElectricTool.java b/common/src/main/java/trinsdar/gt4r/items/ItemElectricTool.java
@@ -81,12 +81,14 @@
 
 public class ItemElectricTool extends ItemBasic<ItemElectricTool> implements IElectricTool {
     final AntimatterToolType type;
+    private final Material baseMaterial;
     int energyTier;
     final Tier itemTier;
     final Object2ObjectMap<String, IBehaviour<IBasicAntimatterTool>> behaviours;
-    public ItemElectricTool(String id, AntimatterToolType base, float miningSpeed, float attackDamage, int quality, int energyTier, Predicate<IBehaviour<?>> behaviourFilter) {
+    public ItemElectricTool(String id, AntimatterToolType base, Material baseMaterial, float miningSpeed, float attackDamage, int quality, int energyTier, Predicate<IBehaviour<?>> behaviourFilter) {
         super(GT4RRef.ID, id, ToolUtils.getToolProperties(Ref.TAB_ITEMS, false).durability(1));
         type = base;
+        this.baseMaterial = baseMaterial;
         this.energyTier = energyTier;
         this.itemTier = new ElectricItemTier(miningSpeed, quality, attackDamage);
         behaviours = new Object2ObjectOpenHashMap<>();
@@ -319,10 +321,10 @@ public ItemStack getContainerItem(ItemStack oldStack) {
     @Override
     public int getItemColor(ItemStack stack, @Nullable Block block, int i) {
         if (i == 1){
-            return getId().contains("advanced") ? 0x0000ff : 0xff6400;
+            return getId().contains("jackhammer") ? -1 : getId().contains("advanced") ? 0x0000ff : 0xff6400;
         }
         if (i == 0) {
-            return this == GT4RData.RockCutter ? Diamond.getRGB() : this.getId().contains("advanced") ? TungstenSteel.getRGB() : Steel.getRGB();
+            return this.baseMaterial.getRGB();
         }
         return -1;
     }

diff --git a/common/src/main/java/trinsdar/gt4r/loader/crafting/ToolCrafting.java b/common/src/main/java/trinsdar/gt4r/loader/crafting/ToolCrafting.java
@@ -63,6 +63,12 @@ private static void loadPoweredRecipes(Consumer<FinishedRecipe> output, Antimatt
                 GT4RData.RockCutter.getDefaultInstance(), of('R', ROD.getMaterialTag(Titanium), 'P', PLATE.getMaterialTag(Titanium), 'C', CIRCUITS_BASIC, 'D', DUST.getMaterialTag(Diamond), 'B', PropertyIngredient.builder("battery").itemTags(BATTERIES_SMALL).build()), "DR ", "DP ", "DCB");
         provider.addToolRecipe(ToolTypes.POWERED_TOOL_BUILDER_BASIC.get(ROCK_CUTTER.getId()),output, GT4RRef.ID,  "rock_cutter_tungstensteel", "antimatter_drills",
                 GT4RData.RockCutter.getDefaultInstance(), of('R', ROD.getMaterialTag(TungstenSteel), 'P', PLATE.getMaterialTag(TungstenSteel), 'C', CIRCUITS_BASIC, 'D', DUST.getMaterialTag(Diamond), 'B', PropertyIngredient.builder("battery").itemTags(BATTERIES_SMALL).build()), "DR ", "DP ", "DCB");
+        provider.addToolRecipe(ToolTypes.POWERED_TOOL_BUILDER_BASIC.get("bronze_jackhammer"), output, GT4RRef.ID, "jackhammer_bronze", "drills",
+                GT4RData.BronzeJackHammer.getDefaultInstance(), of('R', ROD.getMaterialTag(Bronze), 'I', INGOT.getMaterialTag(Bronze), 'C', CIRCUITS_BASIC, 'B', PropertyIngredient.builder("battery").itemTags(BATTERIES_SMALL).build()), "RBR", " C ", " I ");
+        provider.addToolRecipe(ToolTypes.POWERED_TOOL_BUILDER_BASIC.get("steel_jackhammer"), output, GT4RRef.ID, "jackhammer_steel", "drills",
+                GT4RData.SteelJackHammer.getDefaultInstance(), of('R', RODS_STEELS, 'I', INGOT.getMaterialTag(Steel), 'C', CIRCUITS_BASIC, 'B', PropertyIngredient.builder("battery").itemTags(BATTERIES_SMALL).build()), "RBR", " C ", " I ");
+        provider.addToolRecipe(ToolTypes.POWERED_TOOL_BUILDER_BASIC.get("diamond_jackhammer"), output, GT4RRef.ID, "jackhammer_diamond", "drills",
+                GT4RData.DiamondJackHammer.getDefaultInstance(), of('R', ROD.getMaterialTag(TungstenSteel), 'I', GEM.getMaterialTag(Diamond), 'C', CIRCUITS_ADVANCED, 'B', PropertyIngredient.builder("battery").itemTags(BATTERIES_MEDIUM).build()), "RBR", " C ", " I ");
     }
 
     private static void loadBreakablePoweredRecipes(Consumer<FinishedRecipe> output, AntimatterRecipeProvider provider){

diff --git a/common/src/main/resources/assets/gt4r/textures/item/tool/jackhammer.png b/common/src/main/resources/assets/gt4r/textures/item/tool/jackhammer.png
diff --git a/...src/main/resources/assets/gt4r/textures/item/tool/overlay/jackhammer-backup.png b/...src/main/resources/assets/gt4r/textures/item/tool/overlay/jackhammer-backup.png
diff --git a/common/src/main/resources/assets/gt4r/textures/item/tool/overlay/jackhammer.png b/common/src/main/resources/assets/gt4r/textures/item/tool/overlay/jackhammer.png
+3 −0		common/src/main/java/muramasa/antimatter/integration/jei/AntimatterJEIPlugin.java
+7 −6		common/src/main/java/muramasa/antimatter/tool/IBasicAntimatterTool.java