From 411920c1875546d75cfe924a4008eddb391f0536 Mon Sep 17 00:00:00 2001 From: trinsdar <30245301+Trinsdar@users.noreply.github.com> Date: Thu, 23 Jan 2025 18:57:08 -0500 Subject: [PATCH] removed some deprecated methods --- .../providers/AntimatterRecipeProvider.java | 39 ------------------- .../antimatter/event/MaterialEvent.java | 33 ---------------- .../antimatter/material/Material.java | 5 --- .../antimatter/tool/AntimatterToolType.java | 5 --- .../java/muramasa/antimatter/util/Utils.java | 2 - 5 files changed, 84 deletions(-) diff --git a/common/src/main/java/muramasa/antimatter/datagen/providers/AntimatterRecipeProvider.java b/common/src/main/java/muramasa/antimatter/datagen/providers/AntimatterRecipeProvider.java index 3669de49f..1171f5696 100644 --- a/common/src/main/java/muramasa/antimatter/datagen/providers/AntimatterRecipeProvider.java +++ b/common/src/main/java/muramasa/antimatter/datagen/providers/AntimatterRecipeProvider.java @@ -112,16 +112,6 @@ public AntimatterShapedRecipeBuilder getStackRecipe(String groupName, boolean cu return recipeBuilder; } - @Deprecated(forRemoval = true) - public void shapeless(Consumer consumer, String recipeID, String groupName, String criterionName, CriterionTriggerInstance criterion, ItemStack output, Object... inputs) { - shapeless(consumer, Ref.ID, recipeID, groupName, output, inputs); - } - - @Deprecated(forRemoval = true) - public void shapeless(Consumer consumer, String domain, String recipeID, String groupName, String criterionName, CriterionTriggerInstance criterion, ItemStack output, Object... inputs) { - shapeless(consumer, domain, recipeID, groupName, output, inputs); - } - public void shapeless(Consumer consumer, String recipeID, String groupName, ItemStack output, Object... inputs) { shapeless(consumer, Ref.ID, recipeID, groupName, output, inputs); } @@ -161,16 +151,6 @@ public void shapeless(Consumer consumer, String domain, String r } } - @Deprecated(forRemoval = true) - public void addItemRecipe(Consumer consumer, String groupName, String criterionName, CriterionTriggerInstance criterion, ItemLike output, ImmutableMap inputs, String... inputPattern) { - addStackRecipe(consumer, "", "", groupName, criterionName, criterion, new ItemStack(output), inputs, inputPattern); - } - - @Deprecated(forRemoval = true) - public void addItemRecipe(Consumer consumer, String recipeDomain, String recipeName, String groupName, String criterionName, CriterionTriggerInstance criterion, ItemLike output, ImmutableMap inputs, String... inputPattern) { - addStackRecipe(consumer, recipeDomain, recipeName, groupName, criterionName, criterion, new ItemStack(output), inputs, inputPattern); - } - public void addItemRecipe(Consumer consumer, String groupName, ItemLike output, ImmutableMap inputs, String... inputPattern) { addStackRecipe(consumer, "", "", groupName, new ItemStack(output), inputs, inputPattern); } @@ -187,16 +167,6 @@ public void addStackRecipe(Consumer consumer, String groupName, addStackRecipe(consumer, "", "", groupName, output, inputs, inputPattern); } - @Deprecated(forRemoval = true) - public void addStackRecipe(Consumer consumer, String recipeDomain, String recipeName, String groupName, String criterionName, CriterionTriggerInstance criterion, ItemStack output, ImmutableMap inputs, String... inputPattern) { - AntimatterShapedRecipeBuilder recipeBuilder = getStackRecipe(groupName, false, output, inputs, inputPattern); - if (recipeName.isEmpty()) recipeBuilder.build(consumer); - else { - if (recipeDomain.isEmpty()) recipeBuilder.build(consumer, recipeName); - else recipeBuilder.build(consumer, fixLoc(recipeDomain, recipeName)); - } - } - public void addStackRecipe(Consumer consumer, String recipeDomain, String recipeName, String groupName, ItemStack output, ImmutableMap inputs, String... inputPattern) { AntimatterShapedRecipeBuilder recipeBuilder = getStackRecipe(groupName, false, output, inputs, inputPattern); if (recipeName.isEmpty()) recipeBuilder.build(consumer); @@ -206,15 +176,6 @@ public void addStackRecipe(Consumer consumer, String recipeDomai } } - public void addToolRecipe(String builder, Consumer consumer, String recipeDomain, String recipeName, String groupName, String criterionName, CriterionTriggerInstance criterion, ItemStack output, Function, ImmutableMap.Builder> inputs, String... inputPattern) { - addToolRecipe(builder, consumer, recipeDomain, recipeName, groupName, criterionName, criterion, output, inputs.apply(new ImmutableMap.Builder<>()).build(), inputPattern); - } - - @Deprecated(forRemoval = true) - public void addToolRecipe(String builder, Consumer consumer, String recipeDomain, String recipeName, String groupName, String criterionName, CriterionTriggerInstance criterion, ItemStack output, ImmutableMap inputs, String... inputPattern) { - addToolRecipe(builder, consumer, recipeDomain, recipeName, groupName, output, inputs, inputPattern); - } - public void addToolRecipe(String builder, Consumer consumer, String recipeDomain, String recipeName, String groupName, ItemStack output, ImmutableMap inputs, String... inputPattern) { if (output.isEmpty()) { Antimatter.LOGGER.warn("Material recipe " + recipeDomain + ":" + recipeName + "has an empty output."); diff --git a/common/src/main/java/muramasa/antimatter/event/MaterialEvent.java b/common/src/main/java/muramasa/antimatter/event/MaterialEvent.java index a5aa6ed58..72b8aa6c4 100644 --- a/common/src/main/java/muramasa/antimatter/event/MaterialEvent.java +++ b/common/src/main/java/muramasa/antimatter/event/MaterialEvent.java @@ -171,39 +171,6 @@ public T harvestLevel(int harvestLevel) { return (T) this; } - @Deprecated - public T addTools(float toolDamage, float toolSpeed, int toolDurability, int toolQuality) { - return addTools(toolDamage, toolSpeed, toolDurability, toolQuality, ImmutableMap.of()); - } - - @Deprecated - public T addTools(float toolDamage, float toolSpeed, int toolDurability, int toolQuality, ImmutableMap toolEnchantment, AntimatterToolType... toolTypes) { - if (has(AntimatterMaterialTypes.INGOT)) - flags(AntimatterMaterialTypes.PLATE, AntimatterMaterialTypes.ROD, AntimatterMaterialTypes.SCREW, AntimatterMaterialTypes.BOLT); //TODO: We need to add bolt for now since screws depends on bolt, need to find time to change it - else flags(AntimatterMaterialTypes.ROD); - List toolTypesList = toolTypes.length > 0 ? Arrays.asList(toolTypes) : AntimatterAPI.all(AntimatterToolType.class); - MaterialTags.TOOLS.add(this.material, new ToolData(toolDamage, toolSpeed, toolDurability, toolQuality, Wood, toolEnchantment, toolTypesList)); - MaterialTags.MINING_LEVEL.add(this.material, toolQuality - 1); - for (AntimatterToolType type : toolTypesList){ - if (type.getMaterialTypeItem() != null && material != Flint && material != NULL && !material.has(RUBBERTOOLS) && material != Wood){ - flags(type.getMaterialTypeItem()); - } - } - return (T) this; - } - - @Deprecated - public T addTools(Material derivedMaterial, ImmutableMap toolEnchantment) { - ToolData data = MaterialTags.TOOLS.get(derivedMaterial); - return addTools(data.toolDamage(), data.toolSpeed(), data.toolDurability(), data.toolQuality(), toolEnchantment); - } - - @Deprecated - public T addTools(Material derivedMaterial) { - ToolData data = MaterialTags.TOOLS.get(derivedMaterial); - return addTools(data.toolDamage(), data.toolSpeed(), data.toolDurability(), data.toolQuality()); - } - public T setAllowedTypes(AntimatterToolType... toolTypes) { if (!has(MaterialTags.TOOLS)) return (T) this; ToolData data = MaterialTags.TOOLS.get(this.material); diff --git a/common/src/main/java/muramasa/antimatter/material/Material.java b/common/src/main/java/muramasa/antimatter/material/Material.java index c197bd894..29ef379ee 100644 --- a/common/src/main/java/muramasa/antimatter/material/Material.java +++ b/common/src/main/java/muramasa/antimatter/material/Material.java @@ -124,11 +124,6 @@ public Material setMassMultiplierAndDivider(int massMultiplier, int massDivider) return this; } - @Deprecated - public Material setDisplayName(String displayNameString){ - return setDisplayNameString(displayNameString); - } - public Material flags(IMaterialTag... tags) { if (!enabled) return this; for (IMaterialTag t : tags) { diff --git a/common/src/main/java/muramasa/antimatter/tool/AntimatterToolType.java b/common/src/main/java/muramasa/antimatter/tool/AntimatterToolType.java index da5aafd72..6d3b6dbe0 100644 --- a/common/src/main/java/muramasa/antimatter/tool/AntimatterToolType.java +++ b/common/src/main/java/muramasa/antimatter/tool/AntimatterToolType.java @@ -245,11 +245,6 @@ public AntimatterToolType setToolTip(Component... tooltip) { return this; } - @Deprecated - public AntimatterToolType setMaterialType(MaterialTypeItem materialTypeItem){ - return setMaterialTypeItem(materialTypeItem); - } - @Deprecated public AntimatterToolType setRepairability(boolean repairable){ return setRepairable(repairable); diff --git a/common/src/main/java/muramasa/antimatter/util/Utils.java b/common/src/main/java/muramasa/antimatter/util/Utils.java index 76bd46179..978cbfb71 100644 --- a/common/src/main/java/muramasa/antimatter/util/Utils.java +++ b/common/src/main/java/muramasa/antimatter/util/Utils.java @@ -1415,8 +1415,6 @@ public static boolean isPlayerHolding(Player player, InteractionHand hand, Antim } @Nullable - //@Deprecated // Ready to use the methods above instead - //Not deprecated so you don't have to call methods multiple times. public static AntimatterToolType getToolType(Player player) { ItemStack stack = player.getMainHandItem(); for (AntimatterToolType ty : AntimatterAPI.all(AntimatterToolType.class)) {