Added property for specially registered tools #2693
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| package gregtech.api.unification.material.materials; | ||
|
|
||
| import gregtech.api.items.toolitem.ToolClasses; | ||
| import gregtech.api.recipes.ModHandler; | ||
| import gregtech.api.unification.material.Material; | ||
| import gregtech.api.unification.material.Materials; | ||
| import gregtech.api.unification.material.properties.ExtraToolProperty; | ||
| import gregtech.api.unification.material.properties.PropertyKey; | ||
|
|
||
| public class SoftToolAddition { | ||
|
|
||
| public static final Material[] softMaterials = new Material[] { | ||
| Materials.Wood, Materials.Rubber, Materials.Polyethylene, | ||
| Materials.Polytetrafluoroethylene, Materials.Polybenzimidazole | ||
| }; | ||
|
|
||
| public static void register() { | ||
| for (int i = 0; i < softMaterials.length; i++) { | ||
|
|
||
| Material material = softMaterials[i]; | ||
|
|
||
| if (ModHandler.isMaterialWood(material)) { | ||
| material.getProperties().ensureSet(PropertyKey.EXTRATOOL); | ||
| ExtraToolProperty extraToolProperty = material.getProperty(PropertyKey.EXTRATOOL); | ||
|
|
||
| extraToolProperty.setOverrideProperty(ToolClasses.SOFT_MALLET, | ||
| ExtraToolProperty.Builder.of(4F, 1F, 48, 1).build()); | ||
| } else { | ||
| material.getProperties().ensureSet(PropertyKey.EXTRATOOL); | ||
| ExtraToolProperty extraToolProperty = material.getProperty(PropertyKey.EXTRATOOL); | ||
|
|
||
| extraToolProperty.setOverrideProperty(ToolClasses.SOFT_MALLET, | ||
| ExtraToolProperty.Builder.of(4F, 1F, 128 * (1 << i), 1).build()); | ||
| extraToolProperty.setOverrideProperty(ToolClasses.PLUNGER, | ||
| ExtraToolProperty.Builder.of(4F, 0F, 128 * (1 << i), 1).build()); | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,164 @@ | ||
| package gregtech.api.unification.material.properties; | ||
|
|
||
| import net.minecraft.enchantment.Enchantment; | ||
|
|
||
| import org.jetbrains.annotations.NotNull; | ||
| import org.jetbrains.annotations.Nullable; | ||
|
|
||
| import java.util.HashMap; | ||
| import java.util.Map; | ||
|
|
||
| public class ExtraToolProperty implements IMaterialProperty { | ||
|
|
||
| /** | ||
| * Special override for certain kinds of tools. | ||
| */ | ||
| private final Map<String, OverrideToolProperty> overrideMap; | ||
|
|
||
| public static class OverrideToolProperty extends SimpleToolProperty { | ||
|
|
||
| public OverrideToolProperty() { | ||
| this.setToolSpeed(Float.NaN); | ||
| this.setToolAttackSpeed(Float.NaN); | ||
| this.setToolAttackDamage(Float.NaN); | ||
| this.setToolDurability(-1); | ||
| this.setToolHarvestLevel(-1); | ||
| this.setToolEnchantability(-1); | ||
| this.setDurabilityMultiplier(-1); | ||
| } | ||
|
|
||
| // It does not make much sense to set these overrides: | ||
| public void setShouldIgnoreCraftingTools(boolean ignore) { | ||
| throw new UnsupportedOperationException(); | ||
| } | ||
|
|
||
| public void setUnbreakable(boolean isUnbreakable) { | ||
| throw new UnsupportedOperationException(); | ||
| } | ||
|
|
||
| public boolean isMagnetic() { | ||
| throw new UnsupportedOperationException(); | ||
| } | ||
|
|
||
| private SimpleToolProperty override(@NotNull SimpleToolProperty property) { | ||
| // copy to prevent the previous map is produced | ||
| SimpleToolProperty result = new SimpleToolProperty(property); | ||
|
|
||
| // Set the floating point number fields | ||
| if (!Float.isNaN(this.getToolSpeed())) | ||
| result.setToolSpeed(this.getToolSpeed()); | ||
| if (!Float.isNaN(this.getToolAttackSpeed())) | ||
| result.setToolAttackSpeed(this.getToolAttackSpeed()); | ||
| if (!Float.isNaN(this.getToolAttackDamage())) | ||
| result.setToolAttackDamage(this.getToolAttackDamage()); | ||
|
|
||
| // Set the integer fields | ||
| if (this.getToolDurability() != -1) | ||
| result.setToolDurability(this.getToolDurability()); | ||
| if (this.getToolHarvestLevel() != -1) | ||
| result.setToolHarvestLevel(this.getToolHarvestLevel()); | ||
| if (this.getToolEnchantability() != -1) | ||
| result.setToolEnchantability(this.getToolEnchantability()); | ||
| if (this.getDurabilityMultiplier() != -1) | ||
| result.setDurabilityMultiplier(this.getDurabilityMultiplier()); | ||
|
|
||
| // Merge the enchantment map | ||
| result.getEnchantments().putAll(this.getEnchantments()); | ||
| return result; | ||
| } | ||
| } | ||
|
|
||
| public ExtraToolProperty() { | ||
| this.overrideMap = new HashMap<>(); | ||
| } | ||
|
|
||
| public void setOverrideProperty(String toolId, OverrideToolProperty overrideProperty) { | ||
| this.overrideMap.put(toolId, overrideProperty); | ||
| } | ||
|
|
||
| @Nullable | ||
| public OverrideToolProperty getOverrideProperty(String toolId) { | ||
| return this.overrideMap.get(toolId); | ||
| } | ||
|
|
||
| public boolean hasOverrideProperty(String toolId) { | ||
| return getOverrideProperty(toolId) != null; | ||
|
||
| } | ||
|
|
||
| public SimpleToolProperty getOverriddenResult(String toolId, @Nullable ToolProperty toolProperty) { | ||
| if (toolProperty == null) toolProperty = new ToolProperty(); | ||
| return overrideMap.getOrDefault(toolId, new OverrideToolProperty()) | ||
| .override(toolProperty); | ||
| } | ||
|
|
||
| @Override | ||
| public void verifyProperty(MaterialProperties properties) { | ||
| // No check here, since these recipes should be self-generated. | ||
| // If they are overriding ToolProperty, then it is already generated. | ||
| } | ||
|
|
||
| public static class Builder { | ||
|
|
||
| private final OverrideToolProperty toolProperty; | ||
|
|
||
| public static Builder of() { | ||
| return new Builder(); | ||
| } | ||
|
|
||
| public static Builder of(int durability) { | ||
| Builder builder = new Builder(); | ||
| builder.durability(durability); | ||
| return builder; | ||
| } | ||
|
|
||
| public static Builder of(float harvestSpeed, float attackDamage, int durability, int harvestLevel) { | ||
| Builder builder = new Builder(); | ||
| builder.harvestSpeed(harvestSpeed).attackDamage(attackDamage).durability(durability) | ||
| .harvestLevel(harvestLevel); | ||
| return builder; | ||
| } | ||
|
|
||
| public Builder() { | ||
| this.toolProperty = new OverrideToolProperty(); | ||
| } | ||
|
|
||
| public Builder harvestSpeed(float harvestSpeed) { | ||
| toolProperty.setToolSpeed(harvestSpeed); | ||
| return this; | ||
| } | ||
|
|
||
| public Builder attackDamage(float attackDamage) { | ||
| toolProperty.setToolAttackDamage(attackDamage); | ||
| return this; | ||
| } | ||
|
|
||
| public Builder durability(int durability) { | ||
| toolProperty.setToolDurability(durability); | ||
| return this; | ||
| } | ||
|
|
||
| public Builder attackSpeed(float attackSpeed) { | ||
| toolProperty.setToolAttackSpeed(attackSpeed); | ||
| return this; | ||
| } | ||
|
|
||
| public Builder harvestLevel(int harvestLevel) { | ||
| toolProperty.setToolHarvestLevel(harvestLevel); | ||
| return this; | ||
| } | ||
|
|
||
| public Builder enchantment(Enchantment enchantment, int level) { | ||
| toolProperty.addEnchantmentForTools(enchantment, level); | ||
| return this; | ||
| } | ||
|
|
||
| public Builder durabilityMultiplier(int multiplier) { | ||
| toolProperty.setDurabilityMultiplier(multiplier); | ||
| return this; | ||
| } | ||
|
|
||
| public OverrideToolProperty build() { | ||
| return this.toolProperty; | ||
| } | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is there any reason for the explicit casting and separating the
*=apart? The+=and*=operators implicitly perform the casting for integer types, iirc.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No, but the operands are floating point numbers, so I just wanted to be clear here.