Anvilcraft/DimDoors
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Localization

Browse source 
Changes to be committed:
	modified:   src/main/java/org/dimdev/dimdoors/client/tesseract/Plane.java
	modified:   src/main/java/org/dimdev/dimdoors/client/tesseract/Tesseract.java
	modified:   src/main/resources/assets/dimdoors/lang/en_us.json
This commit is contained in:
SD 2020-09-26 21:11:39 +05:30
parent d76adf7070
commit d1cdf9349d
No known key found for this signature in database
GPG key ID: E36B57EE08544BC5
3 changed files with 37 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/main/java/org/dimdev/dimdoors/client/tesseract/Plane.java
View file

@ -7,21 +7,24 @@ import org.dimdev.dimdoors.util.RGBA;
import net.minecraft.client.render.VertexConsumer; import net.minecraft.client.render.VertexConsumer;
import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
import static com.flowpowered.math.TrigMath.cos; import static com.flowpowered.math.TrigMath.cos;
import static com.flowpowered.math.TrigMath.sin; import static com.flowpowered.math.TrigMath.sin;
@Environment(EnvType.CLIENT)
public class Plane { public class Plane {
Vector4f[] vectors; Vector4f[] vectors;
public Plane(Vector4f vec1, Vector4f vec2, Vector4f vec3, Vector4f vec4) { public Plane(Vector4f vec1, Vector4f vec2, Vector4f vec3, Vector4f vec4) {
vectors = new Vector4f[]{vec1, vec2, vec3, vec4}; this.vectors = new Vector4f[]{vec1, vec2, vec3, vec4};
} }
public void draw(net.minecraft.util.math.Matrix4f model, VertexConsumer vc, RGBA color, double radian) { public void draw(net.minecraft.util.math.Matrix4f model, VertexConsumer vc, RGBA color, double radian) {
drawVertex(model, vc, rotYW(vectors[0], radian), 0, 0, color); drawVertex(model, vc, rotYW(this.vectors[0], radian), 0, 0, color);
drawVertex(model, vc, rotYW(vectors[1], radian), 0, 1, color); drawVertex(model, vc, rotYW(this.vectors[1], radian), 0, 1, color);
drawVertex(model, vc, rotYW(vectors[2], radian), 1, 1, color); drawVertex(model, vc, rotYW(this.vectors[2], radian), 1, 1, color);
drawVertex(model, vc, rotYW(vectors[3], radian), 1, 0, color); drawVertex(model, vc, rotYW(this.vectors[3], radian), 1, 0, color);
} }
private static void drawVertex(net.minecraft.util.math.Matrix4f model, VertexConsumer vc, Vector4f vector, int u, int v, RGBA color) { private static void drawVertex(net.minecraft.util.math.Matrix4f model, VertexConsumer vc, Vector4f vector, int u, int v, RGBA color) {

51
src/main/java/org/dimdev/dimdoors/client/tesseract/Tesseract.java
View file

@ -9,172 +9,173 @@ import net.minecraft.util.math.Matrix4f;
import net.fabricmc.api.EnvType; import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment; import net.fabricmc.api.Environment;
@Environment(EnvType.CLIENT)
public class Tesseract { public class Tesseract {
private final Plane[] planes = new Plane[24]; private final Plane[] planes = new Plane[24];
public Tesseract() { public Tesseract() {
planes[0] = new Plane( this.planes[0] = new Plane(
new Vector4f(-0.5f, -0.5f, -0.5f, -0.5f), new Vector4f(-0.5f, -0.5f, -0.5f, -0.5f),
new Vector4f(0.5f, -0.5f, -0.5f, -0.5f), new Vector4f(0.5f, -0.5f, -0.5f, -0.5f),
new Vector4f(0.5f, -0.5f, 0.5f, -0.5f), new Vector4f(0.5f, -0.5f, 0.5f, -0.5f),
new Vector4f(-0.5f, -0.5f, 0.5f, -0.5f) new Vector4f(-0.5f, -0.5f, 0.5f, -0.5f)
); );
planes[1] = new Plane( this.planes[1] = new Plane(
new Vector4f(-0.5f, 0.5f, -0.5f, -0.5f), new Vector4f(-0.5f, 0.5f, -0.5f, -0.5f),
new Vector4f(0.5f, 0.5f, -0.5f, -0.5f), new Vector4f(0.5f, 0.5f, -0.5f, -0.5f),
new Vector4f(0.5f, 0.5f, 0.5f, -0.5f), new Vector4f(0.5f, 0.5f, 0.5f, -0.5f),
new Vector4f(-0.5f, 0.5f, 0.5f, -0.5f) new Vector4f(-0.5f, 0.5f, 0.5f, -0.5f)
); );
planes[2] = new Plane( this.planes[2] = new Plane(
new Vector4f(-0.5f, -0.5f, -0.5f, -0.5f), new Vector4f(-0.5f, -0.5f, -0.5f, -0.5f),
new Vector4f(0.5f, -0.5f, -0.5f, -0.5f), new Vector4f(0.5f, -0.5f, -0.5f, -0.5f),
new Vector4f(0.5f, 0.5f, -0.5f, -0.5f), new Vector4f(0.5f, 0.5f, -0.5f, -0.5f),
new Vector4f(-0.5f, 0.5f, -0.5f, -0.5f) new Vector4f(-0.5f, 0.5f, -0.5f, -0.5f)
); );
planes[3] = new Plane( this.planes[3] = new Plane(
new Vector4f(-0.5f, -0.5f, 0.5f, -0.5f), new Vector4f(-0.5f, -0.5f, 0.5f, -0.5f),
new Vector4f(0.5f, -0.5f, 0.5f, -0.5f), new Vector4f(0.5f, -0.5f, 0.5f, -0.5f),
new Vector4f(0.5f, 0.5f, 0.5f, -0.5f), new Vector4f(0.5f, 0.5f, 0.5f, -0.5f),
new Vector4f(-0.5f, 0.5f, 0.5f, -0.5f) new Vector4f(-0.5f, 0.5f, 0.5f, -0.5f)
); );
planes[4] = new Plane( this.planes[4] = new Plane(
new Vector4f(-0.5f, -0.5f, -0.5f, -0.5f), new Vector4f(-0.5f, -0.5f, -0.5f, -0.5f),
new Vector4f(-0.5f, 0.5f, -0.5f, -0.5f), new Vector4f(-0.5f, 0.5f, -0.5f, -0.5f),
new Vector4f(-0.5f, 0.5f, 0.5f, -0.5f), new Vector4f(-0.5f, 0.5f, 0.5f, -0.5f),
new Vector4f(-0.5f, -0.5f, 0.5f, -0.5f) new Vector4f(-0.5f, -0.5f, 0.5f, -0.5f)
); );
planes[5] = new Plane( this.planes[5] = new Plane(
new Vector4f(0.5f, -0.5f, -0.5f, -0.5f), new Vector4f(0.5f, -0.5f, -0.5f, -0.5f),
new Vector4f(0.5f, 0.5f, -0.5f, -0.5f), new Vector4f(0.5f, 0.5f, -0.5f, -0.5f),
new Vector4f(0.5f, 0.5f, 0.5f, -0.5f), new Vector4f(0.5f, 0.5f, 0.5f, -0.5f),
new Vector4f(0.5f, -0.5f, 0.5f, -0.5f) new Vector4f(0.5f, -0.5f, 0.5f, -0.5f)
); );
planes[6] = new Plane( this.planes[6] = new Plane(
new Vector4f(-0.5f, -0.5f, -0.5f, 0.5f), new Vector4f(-0.5f, -0.5f, -0.5f, 0.5f),
new Vector4f(0.5f, -0.5f, -0.5f, 0.5f), new Vector4f(0.5f, -0.5f, -0.5f, 0.5f),
new Vector4f(0.5f, -0.5f, 0.5f, 0.5f), new Vector4f(0.5f, -0.5f, 0.5f, 0.5f),
new Vector4f(-0.5f, -0.5f, 0.5f, 0.5f) new Vector4f(-0.5f, -0.5f, 0.5f, 0.5f)
); );
planes[7] = new Plane( this.planes[7] = new Plane(
new Vector4f(-0.5f, 0.5f, -0.5f, 0.5f), new Vector4f(-0.5f, 0.5f, -0.5f, 0.5f),
new Vector4f(0.5f, 0.5f, -0.5f, 0.5f), new Vector4f(0.5f, 0.5f, -0.5f, 0.5f),
new Vector4f(0.5f, 0.5f, 0.5f, 0.5f), new Vector4f(0.5f, 0.5f, 0.5f, 0.5f),
new Vector4f(-0.5f, 0.5f, 0.5f, 0.5f) new Vector4f(-0.5f, 0.5f, 0.5f, 0.5f)
); );
planes[8] = new Plane( this.planes[8] = new Plane(
new Vector4f(-0.5f, -0.5f, -0.5f, 0.5f), new Vector4f(-0.5f, -0.5f, -0.5f, 0.5f),
new Vector4f(0.5f, -0.5f, -0.5f, 0.5f), new Vector4f(0.5f, -0.5f, -0.5f, 0.5f),
new Vector4f(0.5f, 0.5f, -0.5f, 0.5f), new Vector4f(0.5f, 0.5f, -0.5f, 0.5f),
new Vector4f(-0.5f, 0.5f, -0.5f, 0.5f) new Vector4f(-0.5f, 0.5f, -0.5f, 0.5f)
); );
planes[9] = new Plane( this.planes[9] = new Plane(
new Vector4f(-0.5f, -0.5f, 0.5f, 0.5f), new Vector4f(-0.5f, -0.5f, 0.5f, 0.5f),
new Vector4f(0.5f, -0.5f, 0.5f, 0.5f), new Vector4f(0.5f, -0.5f, 0.5f, 0.5f),
new Vector4f(0.5f, 0.5f, 0.5f, 0.5f), new Vector4f(0.5f, 0.5f, 0.5f, 0.5f),
new Vector4f(-0.5f, 0.5f, 0.5f, 0.5f) new Vector4f(-0.5f, 0.5f, 0.5f, 0.5f)
); );
planes[10] = new Plane( this.planes[10] = new Plane(
new Vector4f(-0.5f, -0.5f, -0.5f, 0.5f), new Vector4f(-0.5f, -0.5f, -0.5f, 0.5f),
new Vector4f(-0.5f, 0.5f, -0.5f, 0.5f), new Vector4f(-0.5f, 0.5f, -0.5f, 0.5f),
new Vector4f(-0.5f, 0.5f, 0.5f, 0.5f), new Vector4f(-0.5f, 0.5f, 0.5f, 0.5f),
new Vector4f(-0.5f, -0.5f, 0.5f, 0.5f) new Vector4f(-0.5f, -0.5f, 0.5f, 0.5f)
); );
planes[11] = new Plane( this.planes[11] = new Plane(
new Vector4f(0.5f, -0.5f, -0.5f, 0.5f), new Vector4f(0.5f, -0.5f, -0.5f, 0.5f),
new Vector4f(0.5f, 0.5f, -0.5f, 0.5f), new Vector4f(0.5f, 0.5f, -0.5f, 0.5f),
new Vector4f(0.5f, 0.5f, 0.5f, 0.5f), new Vector4f(0.5f, 0.5f, 0.5f, 0.5f),
new Vector4f(0.5f, -0.5f, 0.5f, 0.5f) new Vector4f(0.5f, -0.5f, 0.5f, 0.5f)
); );
planes[12] = new Plane( this.planes[12] = new Plane(
new Vector4f(-0.5f, -0.5f, -0.5f, -0.5f), new Vector4f(-0.5f, -0.5f, -0.5f, -0.5f),
new Vector4f(-0.5f, 0.5f, -0.5f, -0.5f), new Vector4f(-0.5f, 0.5f, -0.5f, -0.5f),
new Vector4f(-0.5f, 0.5f, -0.5f, 0.5f), new Vector4f(-0.5f, 0.5f, -0.5f, 0.5f),
new Vector4f(-0.5f, -0.5f, -0.5f, 0.5f) new Vector4f(-0.5f, -0.5f, -0.5f, 0.5f)
); );
planes[13] = new Plane( this.planes[13] = new Plane(
new Vector4f(-0.5f, -0.5f, 0.5f, -0.5f), new Vector4f(-0.5f, -0.5f, 0.5f, -0.5f),
new Vector4f(-0.5f, 0.5f, 0.5f, -0.5f), new Vector4f(-0.5f, 0.5f, 0.5f, -0.5f),
new Vector4f(-0.5f, 0.5f, 0.5f, 0.5f), new Vector4f(-0.5f, 0.5f, 0.5f, 0.5f),
new Vector4f(-0.5f, -0.5f, 0.5f, 0.5f) new Vector4f(-0.5f, -0.5f, 0.5f, 0.5f)
); );
planes[14] = new Plane( this.planes[14] = new Plane(
new Vector4f(-0.5f, -0.5f, -0.5f, -0.5f), new Vector4f(-0.5f, -0.5f, -0.5f, -0.5f),
new Vector4f(-0.5f, 0.5f, -0.5f, -0.5f), new Vector4f(-0.5f, 0.5f, -0.5f, -0.5f),
new Vector4f(-0.5f, 0.5f, 0.5f, -0.5f), new Vector4f(-0.5f, 0.5f, 0.5f, -0.5f),
new Vector4f(-0.5f, -0.5f, 0.5f, -0.5f) new Vector4f(-0.5f, -0.5f, 0.5f, -0.5f)
); );
planes[15] = new Plane( this.planes[15] = new Plane(
new Vector4f(-0.5f, -0.5f, -0.5f, 0.5f), new Vector4f(-0.5f, -0.5f, -0.5f, 0.5f),
new Vector4f(-0.5f, 0.5f, -0.5f, 0.5f), new Vector4f(-0.5f, 0.5f, -0.5f, 0.5f),
new Vector4f(-0.5f, 0.5f, 0.5f, 0.5f), new Vector4f(-0.5f, 0.5f, 0.5f, 0.5f),
new Vector4f(-0.5f, -0.5f, 0.5f, 0.5f) new Vector4f(-0.5f, -0.5f, 0.5f, 0.5f)
); );
planes[16] = new Plane( this.planes[16] = new Plane(
new Vector4f(-0.5f, -0.5f, -0.5f, -0.5f), new Vector4f(-0.5f, -0.5f, -0.5f, -0.5f),
new Vector4f(-0.5f, -0.5f, 0.5f, -0.5f), new Vector4f(-0.5f, -0.5f, 0.5f, -0.5f),
new Vector4f(-0.5f, -0.5f, 0.5f, 0.5f), new Vector4f(-0.5f, -0.5f, 0.5f, 0.5f),
new Vector4f(-0.5f, -0.5f, -0.5f, 0.5f) new Vector4f(-0.5f, -0.5f, -0.5f, 0.5f)
); );
planes[17] = new Plane( this.planes[17] = new Plane(
new Vector4f(-0.5f, 0.5f, -0.5f, -0.5f), new Vector4f(-0.5f, 0.5f, -0.5f, -0.5f),
new Vector4f(-0.5f, 0.5f, 0.5f, -0.5f), new Vector4f(-0.5f, 0.5f, 0.5f, -0.5f),
new Vector4f(-0.5f, 0.5f, 0.5f, 0.5f), new Vector4f(-0.5f, 0.5f, 0.5f, 0.5f),
new Vector4f(-0.5f, 0.5f, -0.5f, 0.5f) new Vector4f(-0.5f, 0.5f, -0.5f, 0.5f)
); );
planes[18] = new Plane( this.planes[18] = new Plane(
new Vector4f(0.5f, -0.5f, -0.5f, -0.5f), new Vector4f(0.5f, -0.5f, -0.5f, -0.5f),
new Vector4f(0.5f, 0.5f, -0.5f, -0.5f), new Vector4f(0.5f, 0.5f, -0.5f, -0.5f),
new Vector4f(0.5f, 0.5f, -0.5f, 0.5f), new Vector4f(0.5f, 0.5f, -0.5f, 0.5f),
new Vector4f(0.5f, -0.5f, -0.5f, 0.5f) new Vector4f(0.5f, -0.5f, -0.5f, 0.5f)
); );
planes[19] = new Plane( this.planes[19] = new Plane(
new Vector4f(0.5f, -0.5f, 0.5f, -0.5f), new Vector4f(0.5f, -0.5f, 0.5f, -0.5f),
new Vector4f(0.5f, 0.5f, 0.5f, -0.5f), new Vector4f(0.5f, 0.5f, 0.5f, -0.5f),
new Vector4f(0.5f, 0.5f, 0.5f, 0.5f), new Vector4f(0.5f, 0.5f, 0.5f, 0.5f),
new Vector4f(0.5f, -0.5f, 0.5f, 0.5f) new Vector4f(0.5f, -0.5f, 0.5f, 0.5f)
); );
planes[20] = new Plane( this.planes[20] = new Plane(
new Vector4f(0.5f, -0.5f, -0.5f, -0.5f), new Vector4f(0.5f, -0.5f, -0.5f, -0.5f),
new Vector4f(0.5f, 0.5f, -0.5f, -0.5f), new Vector4f(0.5f, 0.5f, -0.5f, -0.5f),
new Vector4f(0.5f, 0.5f, 0.5f, -0.5f), new Vector4f(0.5f, 0.5f, 0.5f, -0.5f),
new Vector4f(0.5f, -0.5f, 0.5f, -0.5f) new Vector4f(0.5f, -0.5f, 0.5f, -0.5f)
); );
planes[21] = new Plane( this.planes[21] = new Plane(
new Vector4f(0.5f, -0.5f, -0.5f, 0.5f), new Vector4f(0.5f, -0.5f, -0.5f, 0.5f),
new Vector4f(0.5f, 0.5f, -0.5f, 0.5f), new Vector4f(0.5f, 0.5f, -0.5f, 0.5f),
new Vector4f(0.5f, 0.5f, 0.5f, 0.5f), new Vector4f(0.5f, 0.5f, 0.5f, 0.5f),
new Vector4f(0.5f, -0.5f, 0.5f, 0.5f) new Vector4f(0.5f, -0.5f, 0.5f, 0.5f)
); );
planes[22] = new Plane( this.planes[22] = new Plane(
new Vector4f(0.5f, -0.5f, -0.5f, -0.5f), new Vector4f(0.5f, -0.5f, -0.5f, -0.5f),
new Vector4f(0.5f, -0.5f, 0.5f, -0.5f), new Vector4f(0.5f, -0.5f, 0.5f, -0.5f),
new Vector4f(0.5f, -0.5f, 0.5f, 0.5f), new Vector4f(0.5f, -0.5f, 0.5f, 0.5f),
new Vector4f(0.5f, -0.5f, -0.5f, 0.5f) new Vector4f(0.5f, -0.5f, -0.5f, 0.5f)
); );
planes[23] = new Plane( this.planes[23] = new Plane(
new Vector4f(0.5f, 0.5f, -0.5f, -0.5f), new Vector4f(0.5f, 0.5f, -0.5f, -0.5f),
new Vector4f(0.5f, 0.5f, 0.5f, -0.5f), new Vector4f(0.5f, 0.5f, 0.5f, -0.5f),
new Vector4f(0.5f, 0.5f, 0.5f, 0.5f), new Vector4f(0.5f, 0.5f, 0.5f, 0.5f),
@ -184,7 +185,7 @@ public class Tesseract {
@Environment(EnvType.CLIENT) @Environment(EnvType.CLIENT)
public void draw(Matrix4f model, VertexConsumer vc, RGBA color, double radian) { public void draw(Matrix4f model, VertexConsumer vc, RGBA color, double radian) {
for (Plane plane : planes) { for (Plane plane : this.planes) {
plane.draw(model, vc, color, radian); plane.draw(model, vc, color, radian);
} }
} }

5
src/main/resources/assets/dimdoors/lang/en_us.json
View file

@ -1,5 +1,5 @@
{ {
"itemGroup.dimdoors.dimensional_doors": "Dimensional Doors Items", "itemGroup.dimdoors.dimensional_doors": "Dimensional Doors",
"block.dimdoors.gold_door": "Gold Door", "block.dimdoors.gold_door": "Gold Door",
"block.dimdoors.quartz_door": "Quartz Door", "block.dimdoors.quartz_door": "Quartz Door",
"block.dimdoors.iron_dimensional_door": "Iron Dimensional Door", "block.dimdoors.iron_dimensional_door": "Iron Dimensional Door",
@ -186,5 +186,6 @@
"dimdoors.graphics.riftJitter": "Rift Jitter", "dimdoors.graphics.riftJitter": "Rift Jitter",
"dimdoors.graphics.riftJitter.tooltip": "Multiplier affecting how much rifts should jitter, 1 being the default size.", "dimdoors.graphics.riftJitter.tooltip": "Multiplier affecting how much rifts should jitter, 1 being the default size.",
"argument.dimdoors.schematic.invalidNamespace": "Invalid schematic namespace. Expected one of %s, found %s.", "argument.dimdoors.schematic.invalidNamespace": "Invalid schematic namespace. Expected one of %s, found %s.",
"command.dimdoors.schematicv2.unknownSchematic": "Unknown schematic \"%s\" in namespace \"%s\" " "command.dimdoors.schematicv2.unknownSchematic": "Unknown schematic \"%s\" in namespace \"%s\" ",
"dimdoors.config.screen.reload": "Reload Config"
} }