Skip to content

Commit 963b2c6

Browse files
rubensworksrubensworks
committed
Remove lombok
1 parent c0aee0f commit 963b2c6

File tree

6 files changed

+84
-44
lines changed

6 files changed

+84
-44
lines changed

‎build.gradle‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,10 @@ apply plugin: 'idea'
1111
apply plugin: 'maven-publish'
1212
apply plugin: 'jacoco'
1313

14-
import net.neoforged.gradle.common.tasks.PotentiallySignJar
14+
1515
import net.darkhax.curseforgegradle.Constants
1616
import net.darkhax.curseforgegradle.TaskPublishCurseForge
17+
import net.neoforged.gradle.common.tasks.PotentiallySignJar
1718

1819
// Determine build number
1920
String build_number = "DEV" // this will be referenced as simply build_number from now on.
@@ -147,13 +148,6 @@ dependencies {
147148
exclude group: 'com.ibm.icu', module: 'icu4j'
148149
}
149150
shadow "org.graalvm.js:js:22.3.2"
150-
151-
152-
// Project lombok
153-
compileOnly 'org.projectlombok:lombok:1.18.30'
154-
annotationProcessor 'org.projectlombok:lombok:1.18.30'
155-
testCompileOnly 'org.projectlombok:lombok:1.18.30'
156-
testAnnotationProcessor 'org.projectlombok:lombok:1.18.30'
157151

158152
testImplementation "junit:junit:4.12"
159153
testImplementation "org.mockito:mockito-core:1.+"

‎src/main/java/org/cyclops/integratedscripting/core/item/ScriptVariableFacade.java‎

Lines changed: 29 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package org.cyclops.integratedscripting.core.item;
22

3-
import lombok.Data;
4-
import lombok.EqualsAndHashCode;
53
import net.minecraft.client.renderer.block.model.BakedQuad;
64
import net.minecraft.network.chat.Component;
75
import net.minecraft.util.RandomSource;
@@ -27,13 +25,12 @@
2725

2826
import java.nio.file.Path;
2927
import java.util.List;
28+
import java.util.Objects;
3029

3130
/**
3231
* Variable facade for variables determined by proxies.
3332
* @author rubensworks
3433
*/
35-
@EqualsAndHashCode(callSuper = true)
36-
@Data
3734
public class ScriptVariableFacade extends VariableFacadeBase implements IScriptVariableFacade {
3835

3936
private final int disk;
@@ -54,6 +51,34 @@ public ScriptVariableFacade(int id, int disk, Path path, String member) {
5451
this.member = member;
5552
}
5653

54+
@Override
55+
public int getDisk() {
56+
return disk;
57+
}
58+
59+
@Override
60+
public Path getPath() {
61+
return path;
62+
}
63+
64+
@Override
65+
public String getMember() {
66+
return member;
67+
}
68+
69+
@Override
70+
public boolean equals(Object o) {
71+
if (o == null || getClass() != o.getClass()) return false;
72+
if (!super.equals(o)) return false;
73+
ScriptVariableFacade that = (ScriptVariableFacade) o;
74+
return disk == that.disk && Objects.equals(path, that.path) && Objects.equals(member, that.member);
75+
}
76+
77+
@Override
78+
public int hashCode() {
79+
return Objects.hash(super.hashCode(), disk, path, member);
80+
}
81+
5782
@Override
5883
public <V extends IValue> IVariable<V> getVariable(INetwork network, IPartNetwork partNetwork) {
5984
if(isValid()) {

‎src/main/java/org/cyclops/integratedscripting/evaluate/ScriptHelpers.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,4 +101,8 @@ public static IEvaluationExceptionFactory getEvaluationExceptionFactory(int disk
101101
disk, path);
102102
}
103103

104+
public static <E extends Throwable> void sneakyThrow(Throwable e) throws E {
105+
throw (E) e;
106+
}
107+
104108
}

‎src/main/java/org/cyclops/integratedscripting/evaluate/translation/translator/NbtCompoundTagProxyObject.java‎

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
package org.cyclops.integratedscripting.evaluate.translation.translator;
22

3-
import lombok.SneakyThrows;
43
import net.minecraft.nbt.CompoundTag;
4+
import org.cyclops.integrateddynamics.api.evaluate.EvaluationException;
55
import org.cyclops.integrateddynamics.api.evaluate.operator.IOperator;
66
import org.cyclops.integrateddynamics.api.evaluate.variable.IValue;
77
import org.cyclops.integrateddynamics.api.evaluate.variable.ValueDeseralizationContext;
88
import org.cyclops.integrateddynamics.core.evaluate.operator.CurriedOperator;
99
import org.cyclops.integrateddynamics.core.evaluate.variable.ValueTypeOperator;
1010
import org.cyclops.integrateddynamics.core.evaluate.variable.Variable;
1111
import org.cyclops.integratedscripting.api.evaluate.translation.IEvaluationExceptionFactory;
12+
import org.cyclops.integratedscripting.evaluate.ScriptHelpers;
1213
import org.cyclops.integratedscripting.evaluate.translation.ValueTranslators;
1314
import org.graalvm.polyglot.Context;
1415
import org.graalvm.polyglot.Value;
@@ -51,17 +52,21 @@ public IValue getValue() {
5152
return value;
5253
}
5354

54-
@SneakyThrows
5555
@Override
5656
public Object getMember(String key) {
57-
if (methods != null) {
58-
IOperator operator = methods.get(key);
59-
if (operator != null) {
60-
CurriedOperator curriedOperator = new CurriedOperator(operator, new Variable(value));
61-
return ValueTranslators.REGISTRY.translateToGraal(context, ValueTypeOperator.ValueOperator.of(curriedOperator), exceptionFactory, valueDeseralizationContext);
57+
try {
58+
if (methods != null) {
59+
IOperator operator = methods.get(key);
60+
if (operator != null) {
61+
CurriedOperator curriedOperator = new CurriedOperator(operator, new Variable(value));
62+
return ValueTranslators.REGISTRY.translateToGraal(context, ValueTypeOperator.ValueOperator.of(curriedOperator), exceptionFactory, valueDeseralizationContext);
63+
}
6264
}
65+
return ValueTranslators.TRANSLATOR_NBT.translateTag(context, tag.get(key), exceptionFactory, valueDeseralizationContext);
66+
} catch (EvaluationException e) {
67+
ScriptHelpers.sneakyThrow(e);
68+
return null;
6369
}
64-
return ValueTranslators.TRANSLATOR_NBT.translateTag(context, tag.get(key), exceptionFactory, valueDeseralizationContext);
6570
}
6671

6772
@Override
@@ -74,10 +79,13 @@ public boolean hasMember(String key) {
7479
return tag.contains(key) || (this.methods != null && this.methods.containsKey(key));
7580
}
7681

77-
@SneakyThrows
7882
@Override
7983
public void putMember(String key, Value value) {
80-
IValue idValue = ValueTranslators.REGISTRY.translateFromGraal(context, value, exceptionFactory, valueDeseralizationContext);
81-
tag.put(key, ValueTranslators.REGISTRY.translateToNbt(context, idValue, exceptionFactory));
84+
try {
85+
IValue idValue = ValueTranslators.REGISTRY.translateFromGraal(context, value, exceptionFactory, valueDeseralizationContext);
86+
tag.put(key, ValueTranslators.REGISTRY.translateToNbt(context, idValue, exceptionFactory));
87+
} catch (EvaluationException e) {
88+
ScriptHelpers.sneakyThrow(e);
89+
}
8290
}
8391
}

‎src/main/java/org/cyclops/integratedscripting/evaluate/translation/translator/OperatorProxyExecutable.java‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
package org.cyclops.integratedscripting.evaluate.translation.translator;
22

3-
import lombok.SneakyThrows;
3+
import org.cyclops.integrateddynamics.api.evaluate.EvaluationException;
44
import org.cyclops.integrateddynamics.api.evaluate.variable.IValue;
55
import org.cyclops.integrateddynamics.api.evaluate.variable.IVariable;
66
import org.cyclops.integrateddynamics.api.evaluate.variable.ValueDeseralizationContext;
77
import org.cyclops.integrateddynamics.core.evaluate.variable.ValueTypeOperator;
88
import org.cyclops.integrateddynamics.core.evaluate.variable.Variable;
99
import org.cyclops.integratedscripting.api.evaluate.translation.IEvaluationExceptionFactory;
10+
import org.cyclops.integratedscripting.evaluate.ScriptHelpers;
1011
import org.cyclops.integratedscripting.evaluate.translation.ValueTranslators;
1112
import org.graalvm.polyglot.Context;
1213
import org.graalvm.polyglot.Value;
@@ -33,13 +34,17 @@ public ValueTypeOperator.ValueOperator getValue() {
3334
return value;
3435
}
3536

36-
@SneakyThrows
3737
@Override
3838
public Object execute(Value... args) {
39-
IVariable<IValue>[] variables = new IVariable[args.length];
40-
for (int i = 0; i < args.length; i++) {
41-
variables[i] = new Variable<>(ValueTranslators.REGISTRY.translateFromGraal(context, args[i], exceptionFactory, valueDeseralizationContext));
39+
try {
40+
IVariable<IValue>[] variables = new IVariable[args.length];
41+
for (int i = 0; i < args.length; i++) {
42+
variables[i] = new Variable<>(ValueTranslators.REGISTRY.translateFromGraal(context, args[i], exceptionFactory, valueDeseralizationContext));
43+
}
44+
return ValueTranslators.REGISTRY.translateToGraal(context, value.getRawValue().evaluate(variables), exceptionFactory, valueDeseralizationContext);
45+
} catch (EvaluationException e) {
46+
ScriptHelpers.sneakyThrow(e);
47+
return null;
4248
}
43-
return ValueTranslators.REGISTRY.translateToGraal(context, value.getRawValue().evaluate(variables), exceptionFactory, valueDeseralizationContext);
4449
}
4550
}

‎src/main/java/org/cyclops/integratedscripting/evaluate/translation/translator/ValueObjectProxyObject.java‎

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package org.cyclops.integratedscripting.evaluate.translation.translator;
22

3-
import lombok.SneakyThrows;
43
import net.minecraft.nbt.Tag;
54
import net.minecraft.network.chat.Component;
5+
import org.cyclops.integrateddynamics.api.evaluate.EvaluationException;
66
import org.cyclops.integrateddynamics.api.evaluate.operator.IOperator;
77
import org.cyclops.integrateddynamics.api.evaluate.variable.IValue;
88
import org.cyclops.integrateddynamics.api.evaluate.variable.ValueDeseralizationContext;
@@ -11,6 +11,7 @@
1111
import org.cyclops.integrateddynamics.core.evaluate.variable.ValueTypeOperator;
1212
import org.cyclops.integrateddynamics.core.evaluate.variable.Variable;
1313
import org.cyclops.integratedscripting.api.evaluate.translation.IEvaluationExceptionFactory;
14+
import org.cyclops.integratedscripting.evaluate.ScriptHelpers;
1415
import org.cyclops.integratedscripting.evaluate.translation.ValueTranslators;
1516
import org.graalvm.polyglot.Context;
1617
import org.graalvm.polyglot.Value;
@@ -57,22 +58,26 @@ public IValue getValue() {
5758
return value;
5859
}
5960

60-
@SneakyThrows
6161
@Override
6262
public Object getMember(String key) {
63-
IOperator operator = methods.get(key);
64-
if (operator != null) {
65-
CurriedOperator curriedOperator = new CurriedOperator(operator, new Variable(value));
66-
return ValueTranslators.REGISTRY.translateToGraal(context, ValueTypeOperator.ValueOperator.of(curriedOperator), exceptionFactory, valueDeseralizationContext);
67-
}
68-
if (key.equals(this.memberNbtKey)) {
69-
if (this.memberNbtValue == null) {
70-
Tag tag = this.valueType.serialize(this.valueDeseralizationContext, this.value);
71-
this.memberNbtValue = ValueTranslators.TRANSLATOR_NBT.translateTag(context, tag, exceptionFactory, valueDeseralizationContext);
63+
try {
64+
IOperator operator = methods.get(key);
65+
if (operator != null) {
66+
CurriedOperator curriedOperator = new CurriedOperator(operator, new Variable(value));
67+
return ValueTranslators.REGISTRY.translateToGraal(context, ValueTypeOperator.ValueOperator.of(curriedOperator), exceptionFactory, valueDeseralizationContext);
68+
}
69+
if (key.equals(this.memberNbtKey)) {
70+
if (this.memberNbtValue == null) {
71+
Tag tag = this.valueType.serialize(this.valueDeseralizationContext, this.value);
72+
this.memberNbtValue = ValueTranslators.TRANSLATOR_NBT.translateTag(context, tag, exceptionFactory, valueDeseralizationContext);
73+
}
74+
return this.memberNbtValue;
7275
}
73-
return this.memberNbtValue;
76+
return null;
77+
} catch (EvaluationException e) {
78+
ScriptHelpers.sneakyThrow(e);
79+
return null;
7480
}
75-
return null;
7681
}
7782

7883
@Override
@@ -85,9 +90,8 @@ public boolean hasMember(String key) {
8590
return key.equals(this.memberNbtKey) || (this.methods != null && this.methods.containsKey(key));
8691
}
8792

88-
@SneakyThrows
8993
@Override
9094
public void putMember(String key, Value value) {
91-
throw exceptionFactory.createError(Component.translatable("valuetype.integratedscripting.error.translation.proxyobject_putMember", key, valueType.getTypeName()));
95+
ScriptHelpers.sneakyThrow(exceptionFactory.createError(Component.translatable("valuetype.integratedscripting.error.translation.proxyobject_putMember", key, valueType.getTypeName())));
9296
}
9397
}

0 commit comments

Comments
 (0)