mirrors/Terra
1
0
Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2025-07-19 11:02:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'refs/heads/master' into feat/nmsplatform

Browse Source
This commit is contained in:
OakLoaf 2025-07-13 14:22:00 +01:00
commit b669f87b79
2 changed files with 33 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
common/addons/structure-terrascript-loader/src/test/resources/test.tesf
View File

@ -1,10 +1,10 @@
bool thing1 = 2 > (2+2) || false; bool thing1 = 2 > (2 + 2) || false;
if(2 > 2 || 3 + 4 <= 2 && 4 + 5 > 2 / 3) { if (2 > 2 || 3 + 4 <= 2 && 4 + 5 > 2 / 3) {
test("ok", 2); test("ok", 2);
} }
test("minecraft:green_w" + "ool", (2 * (3+1) * (2 * (1+1)))); test("minecraft:green_w" + "ool", (2 * (3 + 1) * (2 * (1 + 1))));
// //
num testVar = 3.4; num testVar = 3.4;
@ -21,7 +21,7 @@ bool iftest = false;
bool truetest = false; bool truetest = false;
num iterator = 0; num iterator = 0;
num thing = 4 - 2-2+2-2+2; num thing = 4 - 2 - 2 + 2 - 2 + 2;
test("4 - 2 = " + thing, 2); test("4 - 2 = " + thing, 2);
thing = -2; thing = -2;
@ -31,54 +31,54 @@ test("--2 = " + thing, 2);
for(num i = 0; i < 5; i = i + 1) { for (num i = 0; i < 5; i = i + 1) {
test("i = " + i, iterator); test("i = " + i, iterator);
if(i > 1 + 1) { if (i > 1 + 1) {
test("more than 2", iterator); test("more than 2", iterator);
continue; continue;
} }
} }
for(num i = 0; i < 5; i = i + 1) { for (num i = 0; i < 5; i = i + 1) {
test("i = " + i, iterator); test("i = " + i, iterator);
} }
for(num j = 0; j < 5; j = j + 1) test("single statement j = " + j, iterator); for (num j = 0; j < 5; j = j + 1) test("single statement j = " + j, iterator);
if(4 + 2 == 2 + 4) { if (4 + 2 == 2 + 4) {
test("new thing " + 2, iterator); test("new thing " + 2, iterator);
} }
while(iterator < 5) { while (iterator < 5) {
test("always, even after " + 2, iterator); test("always, even after " + 2, iterator);
iterator = iterator + 1; iterator = iterator + 1;
if(iterator > 2) { if (iterator > 2) {
continue; continue;
} }
test("not after " + 2, iterator); test("not after " + 2, iterator);
} }
if(true) test("single statement" + 2, iterator); if (true) test("single statement" + 2, iterator);
else if(true) test("another single statement" + 2, iterator); else if (true) test("another single statement" + 2, iterator);
if(true) { if (true) {
test("true!" + 2, iterator);
} else {
test("false!" + 2, iterator);
}
if(false) {
test("true!" + 2, iterator); test("true!" + 2, iterator);
} else { } else {
test("false!" + 2, iterator); test("false!" + 2, iterator);
} }
if(false) { if (false) {
test("true again!" + 2, iterator); test("true!" + 2, iterator);
} else if(true == true) {
test("false again!" + 2, iterator);
} else { } else {
test("not logged!" + 2, iterator); test("false!" + 2, iterator);
}
if (false) {
test("true again!" + 2, iterator);
} else if (true == true) {
test("false again!" + 2, iterator);
} else {
test("not logged!" + 2, iterator);
} }
@ -91,7 +91,7 @@ fsdfsd
test("fdsgdf" + 2, 1 + testVar); test("fdsgdf" + 2, 1 + testVar);
if(true && !(boolean && false) && true) { if (true && !(boolean && false) && true) {
num scopedVar = 2; num scopedVar = 2;
test("if statement" + 2 + stringVar, 1 + testVar + scopedVar); test("if statement" + 2 + stringVar, 1 + testVar + scopedVar);
} }

8
platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/config/BiomeParticleConfigTemplate.java
View File

@ -6,10 +6,15 @@ import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
import com.mojang.brigadier.StringReader; import com.mojang.brigadier.StringReader;
import com.mojang.brigadier.exceptions.CommandSyntaxException; import com.mojang.brigadier.exceptions.CommandSyntaxException;
import net.minecraft.commands.arguments.ParticleArgument; import net.minecraft.commands.arguments.ParticleArgument;
import net.minecraft.core.HolderLookup;
import net.minecraft.core.HolderLookup.Provider; import net.minecraft.core.HolderLookup.Provider;
import net.minecraft.core.HolderLookup.RegistryLookup;
import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.core.registries.BuiltInRegistries;
import net.minecraft.core.registries.Registries;
import net.minecraft.world.level.biome.AmbientParticleSettings; import net.minecraft.world.level.biome.AmbientParticleSettings;
import java.util.stream.Stream;
public class BiomeParticleConfigTemplate implements ObjectTemplate<AmbientParticleSettings> { public class BiomeParticleConfigTemplate implements ObjectTemplate<AmbientParticleSettings> {
@Value("particle") @Value("particle")
@ -25,10 +30,11 @@ public class BiomeParticleConfigTemplate implements ObjectTemplate<AmbientPartic
if(particle == null) { if(particle == null) {
return null; return null;
} }
try { try {
return new AmbientParticleSettings(ParticleArgument.readParticle(new StringReader(particle), return new AmbientParticleSettings(ParticleArgument.readParticle(new StringReader(particle),
(Provider) BuiltInRegistries.PARTICLE_TYPE.asHolderIdMap()), probability); HolderLookup.Provider.create(Stream.of(BuiltInRegistries.PARTICLE_TYPE))), probability);
} catch(CommandSyntaxException e) { } catch(CommandSyntaxException e) {
throw new RuntimeException(e); throw new RuntimeException(e);
} }