diff --git a/common/src/main/java/muramasa/antimatter/data/AntimatterDefaultTools.java b/common/src/main/java/muramasa/antimatter/data/AntimatterDefaultTools.java index d55c9d775..6704809ac 100644 --- a/common/src/main/java/muramasa/antimatter/data/AntimatterDefaultTools.java +++ b/common/src/main/java/muramasa/antimatter/data/AntimatterDefaultTools.java @@ -22,7 +22,7 @@ import static net.minecraft.world.level.material.Material.*; public class AntimatterDefaultTools { - public static final AntimatterToolType SWORD = AntimatterAPI.register(AntimatterToolType.class, new AntimatterToolType(Ref.ID, "sword", 2, 1, 10, 3.0F, -2.4F, false)).setToolClass(MaterialSword.class).addEffectiveBlocks(Blocks.COBWEB).setHasContainer(false).setMaterialTypeItem(SWORD_HEAD); + public static final AntimatterToolType SWORD = AntimatterAPI.register(AntimatterToolType.class, new AntimatterToolType(Ref.ID, "sword", 2, 1, 10, 3.0F, -2.4F, false)).setToolClass(MaterialSword.class).addEffectiveBlocks(Blocks.COBWEB).setHasContainer(false).setMaterialTypeItem(SWORD_BLADE); public static final AntimatterToolType PICKAXE = AntimatterAPI.register(AntimatterToolType.class, new AntimatterToolType(Ref.ID, "pickaxe", 1, 2, 10, 1.0F, -2.8F, true)).addEffectiveMaterials(ICE_SOLID, PISTON).setHasContainer(false).setMaterialTypeItem(PICKAXE_HEAD); public static final AntimatterToolType SHOVEL = AntimatterAPI.register(AntimatterToolType.class, new AntimatterToolType(Ref.ID, "shovel", 1, 2, 10, 1.5F, -3.0F, true)).addEffectiveMaterials(CLAY, SAND, TOP_SNOW, SNOW, DIRT).setHasContainer(false).setMaterialTypeItem(SHOVEL_HEAD); public static final AntimatterToolType AXE = AntimatterAPI.register(AntimatterToolType.class, new AntimatterToolType(Ref.ID, "axe", 1, 1, 10, 6.0F, -3.0F, true)).addEffectiveMaterials(PLANT, REPLACEABLE_PLANT, BAMBOO).setHasContainer(false).setMaterialTypeItem(AXE_HEAD); @@ -30,7 +30,7 @@ public class AntimatterDefaultTools { public static final AntimatterToolType HAMMER = AntimatterAPI.register(AntimatterToolType.class, new AntimatterToolType(Ref.ID, "hammer", 1, 2, 2, 3.0F, -3.0F, false)).addTags("pickaxe").addEffectiveMaterials(net.minecraft.world.level.material.Material.METAL, STONE).setUseSound(SoundEvents.ANVIL_PLACE).setRepairable(false); public static final AntimatterToolType WRENCH = AntimatterAPI.register(AntimatterToolType.class, new AntimatterToolType(Ref.ID, "wrench", 1, 2, 2, 1.5F, -2.8F, false)).setUseSound(Ref.WRENCH).addEffectiveBlocks(Blocks.HOPPER).setHasSecondary(false).setOverlayLayers(0).setRepairable(false).addBlacklistedEnchantments(Enchantments.BLOCK_EFFICIENCY); public static final AntimatterToolType WRENCH_ALT = AntimatterAPI.register(AntimatterToolType.class, new AntimatterToolType(Ref.ID, "wrench_alt", 1, 2, 2, 1.5F, -2.8F, false)).setUseSound(Ref.WRENCH).addEffectiveBlocks(Blocks.HOPPER).addTags("wrench").setHasSecondary(false).setOverlayLayers(0).setRepairable(false).addBlacklistedEnchantments(Enchantments.BLOCK_EFFICIENCY).setCustomName("Wrench (Alt)"); - public static final AntimatterToolType SAW = AntimatterAPI.register(AntimatterToolType.class, new AntimatterToolType(Ref.ID, "saw", 1, 2, 2, 2.0F, -2.8F, false)).addEffectiveBlocks(Blocks.ICE, Blocks.PACKED_ICE, Blocks.BLUE_ICE).setRepairable(false).setMaterialTypeItem(SAW_HEAD); + public static final AntimatterToolType SAW = AntimatterAPI.register(AntimatterToolType.class, new AntimatterToolType(Ref.ID, "saw", 1, 2, 2, 2.0F, -2.8F, false)).addEffectiveBlocks(Blocks.ICE, Blocks.PACKED_ICE, Blocks.BLUE_ICE).setRepairable(false).setMaterialTypeItem(SAW_BLADE); public static final AntimatterToolType FILE = AntimatterAPI.register(AntimatterToolType.class, new AntimatterToolType(Ref.ID, "file", 1, 2, 2, -2.0F, -2.4F, false)).setRepairable(false).setMaterialTypeItem(FILE_HEAD); public static final AntimatterToolType CROWBAR = AntimatterAPI.register(AntimatterToolType.class, new AntimatterToolType(Ref.ID, "crowbar", 1, 10, 5, 1.0F, -2.0F, false)).setUseSound(SoundEvents.ITEM_BREAK).setHasSecondary(false).setRepairable(false); public static final AntimatterToolType SOFT_HAMMER = AntimatterAPI.register(AntimatterToolType.class, new AntimatterToolType(Ref.ID, "soft_hammer", 1, 2, 2, 1.0F, -3.0F, false)).setRepairable(false).setPrimaryRequirement(MaterialTags.RUBBERTOOLS);//.setUseSound(); diff --git a/common/src/main/java/muramasa/antimatter/data/AntimatterMaterialTypes.java b/common/src/main/java/muramasa/antimatter/data/AntimatterMaterialTypes.java index 3b0df6e3f..09ca1cce9 100644 --- a/common/src/main/java/muramasa/antimatter/data/AntimatterMaterialTypes.java +++ b/common/src/main/java/muramasa/antimatter/data/AntimatterMaterialTypes.java @@ -71,12 +71,13 @@ public class AntimatterMaterialTypes { public static MaterialTypeItem BUZZSAW_BLADE = new MaterialTypeItem<>("buzzsaw_blade", 2, true, U * 4); public static final MaterialTypeItem PICKAXE_HEAD = new MaterialTypeItem<>("pickaxe_head", 2, true, U * 3); public static final MaterialTypeItem AXE_HEAD = new MaterialTypeItem<>("axe_head", 2, true, U * 3); - public static final MaterialTypeItem SWORD_HEAD = new MaterialTypeItem<>("sword_head", 2, true, U * 2); + public static final MaterialTypeItem SWORD_BLADE = new MaterialTypeItem<>("sword_blade", 2, true, U * 2); public static final MaterialTypeItem SHOVEL_HEAD = new MaterialTypeItem<>("shovel_head", 2, true, U); public static final MaterialTypeItem HOE_HEAD = new MaterialTypeItem<>("hoe_head", 2, true, U * 2); public static final MaterialTypeItem HAMMER_HEAD = new MaterialTypeItem<>("hammer_head", 2, true, U * 6); public static final MaterialTypeItem FILE_HEAD = new MaterialTypeItem<>("file_head", 2, true, U * 2); - public static final MaterialTypeItem SAW_HEAD = new MaterialTypeItem<>("saw_head", 2, true, U * 2); + public static final MaterialTypeItem SAW_BLADE = new MaterialTypeItem<>("saw_blade", 2, true, U * 2); + public static final MaterialTypeItem SCREWDRIVER_TIP = new MaterialTypeItem<>("screwdriver_tip", 2, true, U); public static MaterialTypeItem FISSILE_FUEL = new MaterialTypeItem<>("fissile_fuel", 2, true, U); public static MaterialTypeItem DEPLETED_FISSILE_FUEL = new MaterialTypeItem<>("depleted_fissile_fuel", 2, true, U); //Block Types @@ -258,12 +259,12 @@ public static void init() { AntimatterMaterialTypes.BUZZSAW_BLADE.unSplitName().setIgnoreTextureSets(); AntimatterMaterialTypes.PICKAXE_HEAD.unSplitName().setIgnoreTextureSets(); AntimatterMaterialTypes.SHOVEL_HEAD.unSplitName().setIgnoreTextureSets(); - AntimatterMaterialTypes.SWORD_HEAD.unSplitName().setIgnoreTextureSets(); + AntimatterMaterialTypes.SWORD_BLADE.unSplitName().setIgnoreTextureSets(); AntimatterMaterialTypes.AXE_HEAD.unSplitName().setIgnoreTextureSets(); AntimatterMaterialTypes.HOE_HEAD.unSplitName().setIgnoreTextureSets(); AntimatterMaterialTypes.HAMMER_HEAD.unSplitName().setIgnoreTextureSets(); AntimatterMaterialTypes.FILE_HEAD.unSplitName().setIgnoreTextureSets(); - AntimatterMaterialTypes.SAW_HEAD.unSplitName().setIgnoreTextureSets(); + AntimatterMaterialTypes.SAW_BLADE.unSplitName().setIgnoreTextureSets(); FISSILE_FUEL.setIgnoreTextureSets().unSplitName(); DEPLETED_FISSILE_FUEL.setIgnoreTextureSets().unSplitName(); AntimatterMaterialTypes.RAW_ORE.unSplitName(); diff --git a/common/src/main/resources/assets/antimatter/textures/material/file_head.png b/common/src/main/resources/assets/antimatter/textures/material/file_head.png index cf4b7f73f..41e6d59c2 100644 Binary files a/common/src/main/resources/assets/antimatter/textures/material/file_head.png and b/common/src/main/resources/assets/antimatter/textures/material/file_head.png differ diff --git a/common/src/main/resources/assets/antimatter/textures/material/magnetic/file_head.png b/common/src/main/resources/assets/antimatter/textures/material/magnetic/file_head.png index cf4b7f73f..41e6d59c2 100644 Binary files a/common/src/main/resources/assets/antimatter/textures/material/magnetic/file_head.png and b/common/src/main/resources/assets/antimatter/textures/material/magnetic/file_head.png differ diff --git a/common/src/main/resources/assets/antimatter/textures/material/magnetic/saw_blade.png b/common/src/main/resources/assets/antimatter/textures/material/magnetic/saw_blade.png new file mode 100644 index 000000000..c689321eb Binary files /dev/null and b/common/src/main/resources/assets/antimatter/textures/material/magnetic/saw_blade.png differ diff --git a/common/src/main/resources/assets/antimatter/textures/material/magnetic/saw_head_overlay.png b/common/src/main/resources/assets/antimatter/textures/material/magnetic/saw_blade_overlay.png similarity index 100% rename from common/src/main/resources/assets/antimatter/textures/material/magnetic/saw_head_overlay.png rename to common/src/main/resources/assets/antimatter/textures/material/magnetic/saw_blade_overlay.png diff --git a/common/src/main/resources/assets/antimatter/textures/material/magnetic/saw_head.png b/common/src/main/resources/assets/antimatter/textures/material/magnetic/saw_head.png deleted file mode 100644 index eb29fba97..000000000 Binary files a/common/src/main/resources/assets/antimatter/textures/material/magnetic/saw_head.png and /dev/null differ diff --git a/common/src/main/resources/assets/antimatter/textures/material/magnetic/screwdriver_tip.png b/common/src/main/resources/assets/antimatter/textures/material/magnetic/screwdriver_tip.png new file mode 100644 index 000000000..a4f9a3217 Binary files /dev/null and b/common/src/main/resources/assets/antimatter/textures/material/magnetic/screwdriver_tip.png differ diff --git a/common/src/main/resources/assets/antimatter/textures/material/magnetic/sword_head_overlay.png b/common/src/main/resources/assets/antimatter/textures/material/magnetic/screwdriver_tip_overlay.png similarity index 100% rename from common/src/main/resources/assets/antimatter/textures/material/magnetic/sword_head_overlay.png rename to common/src/main/resources/assets/antimatter/textures/material/magnetic/screwdriver_tip_overlay.png diff --git a/common/src/main/resources/assets/antimatter/textures/material/magnetic/sword_blade.png b/common/src/main/resources/assets/antimatter/textures/material/magnetic/sword_blade.png new file mode 100644 index 000000000..e23c28bdc Binary files /dev/null and b/common/src/main/resources/assets/antimatter/textures/material/magnetic/sword_blade.png differ diff --git a/common/src/main/resources/assets/antimatter/textures/material/magnetic/sword_blade_overlay.png b/common/src/main/resources/assets/antimatter/textures/material/magnetic/sword_blade_overlay.png new file mode 100644 index 000000000..3fdb810f8 Binary files /dev/null and b/common/src/main/resources/assets/antimatter/textures/material/magnetic/sword_blade_overlay.png differ diff --git a/common/src/main/resources/assets/antimatter/textures/material/magnetic/sword_head.png b/common/src/main/resources/assets/antimatter/textures/material/magnetic/sword_head.png deleted file mode 100644 index ddf338beb..000000000 Binary files a/common/src/main/resources/assets/antimatter/textures/material/magnetic/sword_head.png and /dev/null differ diff --git a/common/src/main/resources/assets/antimatter/textures/material/saw_blade.png b/common/src/main/resources/assets/antimatter/textures/material/saw_blade.png new file mode 100644 index 000000000..c689321eb Binary files /dev/null and b/common/src/main/resources/assets/antimatter/textures/material/saw_blade.png differ diff --git a/common/src/main/resources/assets/antimatter/textures/material/saw_head_overlay.png b/common/src/main/resources/assets/antimatter/textures/material/saw_blade_overlay.png similarity index 100% rename from common/src/main/resources/assets/antimatter/textures/material/saw_head_overlay.png rename to common/src/main/resources/assets/antimatter/textures/material/saw_blade_overlay.png diff --git a/common/src/main/resources/assets/antimatter/textures/material/saw_head.png b/common/src/main/resources/assets/antimatter/textures/material/saw_head.png deleted file mode 100644 index eb29fba97..000000000 Binary files a/common/src/main/resources/assets/antimatter/textures/material/saw_head.png and /dev/null differ diff --git a/common/src/main/resources/assets/antimatter/textures/material/screwdriver_tip.png b/common/src/main/resources/assets/antimatter/textures/material/screwdriver_tip.png new file mode 100644 index 000000000..a4f9a3217 Binary files /dev/null and b/common/src/main/resources/assets/antimatter/textures/material/screwdriver_tip.png differ diff --git a/common/src/main/resources/assets/antimatter/textures/material/sword_head_overlay.png b/common/src/main/resources/assets/antimatter/textures/material/screwdriver_tip_overlay.png similarity index 100% rename from common/src/main/resources/assets/antimatter/textures/material/sword_head_overlay.png rename to common/src/main/resources/assets/antimatter/textures/material/screwdriver_tip_overlay.png diff --git a/common/src/main/resources/assets/antimatter/textures/material/sword_blade.png b/common/src/main/resources/assets/antimatter/textures/material/sword_blade.png new file mode 100644 index 000000000..e23c28bdc Binary files /dev/null and b/common/src/main/resources/assets/antimatter/textures/material/sword_blade.png differ diff --git a/common/src/main/resources/assets/antimatter/textures/material/sword_blade_overlay.png b/common/src/main/resources/assets/antimatter/textures/material/sword_blade_overlay.png new file mode 100644 index 000000000..4e35ad328 Binary files /dev/null and b/common/src/main/resources/assets/antimatter/textures/material/sword_blade_overlay.png differ diff --git a/common/src/main/resources/assets/antimatter/textures/material/sword_head.png b/common/src/main/resources/assets/antimatter/textures/material/sword_head.png deleted file mode 100644 index ddf338beb..000000000 Binary files a/common/src/main/resources/assets/antimatter/textures/material/sword_head.png and /dev/null differ