From a60af3e574ece5b8b3ec90a2873ad0d4887acdd0 Mon Sep 17 00:00:00 2001 From: Jared Date: Mon, 14 Mar 2022 00:29:29 +0200 Subject: [PATCH] Code cleanup --- .../crafttweaker/api/util/random/Percentaged.java | 1 - .../crafttweaker/natives/block/ExpandBlock.java | 11 ++++++----- .../crafttweaker/natives/block/ExpandBlockState.java | 11 ++++++----- .../natives/block/entity/ExpandBlockEntity.java | 6 ++++++ .../natives/entity/attribute/ExpandAttribute.java | 1 + .../entity/attribute/ExpandAttributeInstance.java | 4 ++++ 6 files changed, 23 insertions(+), 11 deletions(-) diff --git a/Common/src/main/java/com/blamejared/crafttweaker/api/util/random/Percentaged.java b/Common/src/main/java/com/blamejared/crafttweaker/api/util/random/Percentaged.java index 3b6bc9f0c..7a0cc6304 100644 --- a/Common/src/main/java/com/blamejared/crafttweaker/api/util/random/Percentaged.java +++ b/Common/src/main/java/com/blamejared/crafttweaker/api/util/random/Percentaged.java @@ -26,7 +26,6 @@ public Percentaged(T data, double percentage, Function commandStringF this.commandStringFunc = commandStringFunc; } - public T getData() { return data; diff --git a/Common/src/main/java/com/blamejared/crafttweaker/natives/block/ExpandBlock.java b/Common/src/main/java/com/blamejared/crafttweaker/natives/block/ExpandBlock.java index 5e3adc820..c103e9407 100644 --- a/Common/src/main/java/com/blamejared/crafttweaker/natives/block/ExpandBlock.java +++ b/Common/src/main/java/com/blamejared/crafttweaker/natives/block/ExpandBlock.java @@ -72,6 +72,7 @@ public static String getLootTable(Block internal) { * @return True if an entity can be spawned in this Block. False Otherwise. */ @ZenCodeType.Method + @ZenCodeType.Getter("isPossibleToRespawnInThis") public static boolean isPossibleToRespawnInThis(Block internal) { return internal.isPossibleToRespawnInThis(); @@ -83,7 +84,7 @@ public static boolean isPossibleToRespawnInThis(Block internal) { * @return The unlocalized name of this block. */ @ZenCodeType.Method - @ZenCodeType.Getter("translationKey") + @ZenCodeType.Getter("getDescriptionId") public static String getDescriptionId(Block internal) { return internal.getDescriptionId(); @@ -113,7 +114,7 @@ public static String getCommandString(Block internal) { * @return A list of valid {@link BlockState}s for this Block. */ @ZenCodeType.Method - @ZenCodeType.Getter("validStates") + @ZenCodeType.Getter("possibleStates") public static List getPossibleStates(Block internal) { return internal.getStateDefinition().getPossibleStates(); @@ -154,9 +155,9 @@ public static float getFriction(Block internal) { */ @ZenCodeType.Method @ZenCodeType.Setter("friction") - public static void setSlipperiness(Block internal, float friction) { + public static void setFriction(Block internal, float friction) { - CraftTweakerAPI.apply(new ActionSetBlockProperty<>(internal, "Slipperiness", + CraftTweakerAPI.apply(new ActionSetBlockProperty<>(internal, "Friction", friction, ((AccessBlockBehaviour) internal).crafttweaker$getFriction(), ((AccessBlockBehaviour) internal)::crafttweaker$setFriction)); } @@ -262,7 +263,7 @@ public static boolean hasCollision(Block internal) { * @docParam canCollide true */ @ZenCodeType.Method - @ZenCodeType.Setter("canCollide") + @ZenCodeType.Setter("hasCollision") public static void setHasCollision(Block internal, boolean canCollide) { CraftTweakerAPI.apply(new ActionSetBlockProperty<>(internal, "Has Collision", diff --git a/Common/src/main/java/com/blamejared/crafttweaker/natives/block/ExpandBlockState.java b/Common/src/main/java/com/blamejared/crafttweaker/natives/block/ExpandBlockState.java index 197443534..59fb816d2 100644 --- a/Common/src/main/java/com/blamejared/crafttweaker/natives/block/ExpandBlockState.java +++ b/Common/src/main/java/com/blamejared/crafttweaker/natives/block/ExpandBlockState.java @@ -77,7 +77,7 @@ public static int getLightEmission(BlockState internal) { * @return True if this BlockState can provide Redstone Power. False otherwise. */ @ZenCodeType.Method - @ZenCodeType.Getter("signalSource") + @ZenCodeType.Getter("isSignalSource") public static boolean isSignalSource(BlockState internal) { return internal.isSignalSource(); @@ -101,7 +101,7 @@ public static boolean canOcclude(BlockState internal) { * @return True if this BlockState ticks randomly. False otherwise. */ @ZenCodeType.Method - @ZenCodeType.Getter("randomlyTicking") + @ZenCodeType.Getter("isRandomlyTicking") public static boolean isRandomlyTicking(BlockState internal) { return internal.isRandomlyTicking(); @@ -209,6 +209,7 @@ public static List getAllowedValuesForProperty(BlockState internal, Stri * @return a Map of the properties on this BlockState. */ @ZenCodeType.Method + @ZenCodeType.Getter("properties") public static Map getProperties(BlockState internal) { Map props = new HashMap<>(); @@ -234,9 +235,8 @@ public static boolean hasProperty(BlockState internal, String name) { return prop != null; } - @ZenCodeType.Caster + @ZenCodeType.Method public static String asString(BlockState internal) { - return internal.toString(); } @@ -261,7 +261,7 @@ public static float getDestroySpeed(BlockState internal) { */ @ZenCodeType.Method @ZenCodeType.Setter("destroySpeed") - public static void setHardness(BlockState internal, float destroySpeed) { + public static void setDestroySpeed(BlockState internal, float destroySpeed) { CraftTweakerAPI.apply(new ActionSetBlockProperty<>(internal, "Destroy Speed", destroySpeed, ((AccessBlockStateBase) internal).crafttweaker$getDestroySpeed(), value -> ((AccessBlockStateBase) internal).crafttweaker$setDestroySpeed(value))); } @@ -278,6 +278,7 @@ public static void setHardness(BlockState internal, float destroySpeed) { */ @ZenCodeType.Method @ZenCodeType.Getter("commandString") + @ZenCodeType.Caster public static String getCommandString(BlockState internal) { StringBuilder builder = new StringBuilder(""; diff --git a/Common/src/main/java/com/blamejared/crafttweaker/natives/entity/attribute/ExpandAttributeInstance.java b/Common/src/main/java/com/blamejared/crafttweaker/natives/entity/attribute/ExpandAttributeInstance.java index 22d27cdc9..7ff29f37e 100644 --- a/Common/src/main/java/com/blamejared/crafttweaker/natives/entity/attribute/ExpandAttributeInstance.java +++ b/Common/src/main/java/com/blamejared/crafttweaker/natives/entity/attribute/ExpandAttributeInstance.java @@ -16,24 +16,28 @@ @NativeTypeRegistration(value = AttributeInstance.class, zenCodeName = "crafttweaker.api.entity.attribute.AttributeInstance") public class ExpandAttributeInstance { + @ZenCodeType.Method @ZenCodeType.Getter("baseValue") public static double getBaseValue(AttributeInstance internal) { return internal.getBaseValue(); } + @ZenCodeType.Method @ZenCodeType.Setter("baseValue") public static void setBaseValue(AttributeInstance internal, double value) { internal.setBaseValue(value); } + @ZenCodeType.Method @ZenCodeType.Getter("value") public static double getValue(AttributeInstance internal) { return internal.getValue(); } + @ZenCodeType.Method @ZenCodeType.Getter("modifiers") public static List getModifiers(AttributeInstance internal) {