internal: port illumination to Java

MrTJP · Jan 23, 2023 · 2241bbb · 2241bbb
1 parent 37cfa68
commit 2241bbb
Show file tree

Hide file tree

Showing 170 changed files with 2,292 additions and 2,224 deletions.
diff --git a/src/core/resources/assets/projectred-core/lang/en_us.json b/src/core/resources/assets/projectred-core/lang/en_us.json
diff --git a/src/core/scala/mrtjp/projectred/core/RenderHalo.scala b/src/core/scala/mrtjp/projectred/core/RenderHalo.scala
@@ -2,10 +2,8 @@ package mrtjp.projectred.core
 
 import codechicken.lib.colour.EnumColour
 import codechicken.lib.render.{BlockRenderer, CCRenderState}
-import codechicken.lib.util.SneakyUtils
 import codechicken.lib.vec._
 import com.mojang.blaze3d.matrix.MatrixStack
-import com.mojang.blaze3d.systems.RenderSystem
 import net.minecraft.client.Minecraft
 import net.minecraft.client.renderer.vertex.DefaultVertexFormats
 import net.minecraft.client.renderer.{IRenderTypeBuffer, RenderState, RenderType}
@@ -19,11 +17,10 @@ object RenderHalo
     val RenderTypeLamp:RenderType = RenderType.create("pr:lamp",
         DefaultVertexFormats.POSITION_COLOR, 7, 8192, false, true,
         RenderType.State.builder().setTransparencyState(RenderState.LIGHTNING_TRANSPARENCY)
-                .setTextureState(RenderState.NO_TEXTURE)
-                .setTexturingState(new RenderState.TexturingState("disable_lighting", () => RenderSystem.disableLighting(), SneakyUtils.none))
-                .setCullState(RenderState.NO_CULL)
-//                .writeMask(RenderState.DEPTH_WRITE)
-                .createCompositeState(false))
+            .setTextureState(RenderState.NO_TEXTURE)
+            .setCullState(RenderState.CULL)
+            .setOutputState(RenderState.TRANSLUCENT_TARGET)
+            .createCompositeState(false))
 
     private var renderList = Vector[LightCache]()
     private val renderEntityPos = new Vector3

diff --git a/...illumination/generated/assets/projectred-illumination/blockstates/black_illumar_lamp.json b/...illumination/generated/assets/projectred-illumination/blockstates/black_illumar_lamp.json
@@ -1,7 +1,7 @@
 {
   "variants": {
     "lit=false": {
-      "model": "projectred-illumination:block/black_illumar_lamp_off"
+      "model": "projectred-illumination:block/black_illumar_lamp"
     },
     "lit=true": {
       "model": "projectred-illumination:block/black_illumar_lamp_on"

diff --git a/...ion/generated/assets/projectred-illumination/blockstates/black_inverted_illumar_lamp.json b/...ion/generated/assets/projectred-illumination/blockstates/black_inverted_illumar_lamp.json
@@ -1,7 +1,7 @@
 {
   "variants": {
     "lit=false": {
-      "model": "projectred-illumination:block/black_illumar_lamp_off"
+      "model": "projectred-illumination:block/black_illumar_lamp"
     },
     "lit=true": {
       "model": "projectred-illumination:block/black_illumar_lamp_on"

diff --git a/src/illumination/generated/assets/projectred-illumination/blockstates/blue_illumar_lamp.json b/src/illumination/generated/assets/projectred-illumination/blockstates/blue_illumar_lamp.json
@@ -1,7 +1,7 @@
 {
   "variants": {
     "lit=false": {
-      "model": "projectred-illumination:block/blue_illumar_lamp_off"
+      "model": "projectred-illumination:block/blue_illumar_lamp"
     },
     "lit=true": {
       "model": "projectred-illumination:block/blue_illumar_lamp_on"

diff --git a/...tion/generated/assets/projectred-illumination/blockstates/blue_inverted_illumar_lamp.json b/...tion/generated/assets/projectred-illumination/blockstates/blue_inverted_illumar_lamp.json
@@ -1,7 +1,7 @@
 {
   "variants": {
     "lit=false": {
-      "model": "projectred-illumination:block/blue_illumar_lamp_off"
+      "model": "projectred-illumination:block/blue_illumar_lamp"
     },
     "lit=true": {
       "model": "projectred-illumination:block/blue_illumar_lamp_on"

diff --git a/...illumination/generated/assets/projectred-illumination/blockstates/brown_illumar_lamp.json b/...illumination/generated/assets/projectred-illumination/blockstates/brown_illumar_lamp.json
@@ -1,7 +1,7 @@
 {
   "variants": {
     "lit=false": {
-      "model": "projectred-illumination:block/brown_illumar_lamp_off"
+      "model": "projectred-illumination:block/brown_illumar_lamp"
     },
     "lit=true": {
       "model": "projectred-illumination:block/brown_illumar_lamp_on"

diff --git a/...ion/generated/assets/projectred-illumination/blockstates/brown_inverted_illumar_lamp.json b/...ion/generated/assets/projectred-illumination/blockstates/brown_inverted_illumar_lamp.json
@@ -1,7 +1,7 @@
 {
   "variants": {
     "lit=false": {
-      "model": "projectred-illumination:block/brown_illumar_lamp_off"
+      "model": "projectred-illumination:block/brown_illumar_lamp"
     },
     "lit=true": {
       "model": "projectred-illumination:block/brown_illumar_lamp_on"

diff --git a/src/illumination/generated/assets/projectred-illumination/blockstates/cyan_illumar_lamp.json b/src/illumination/generated/assets/projectred-illumination/blockstates/cyan_illumar_lamp.json
@@ -1,7 +1,7 @@
 {
   "variants": {
     "lit=false": {
-      "model": "projectred-illumination:block/cyan_illumar_lamp_off"
+      "model": "projectred-illumination:block/cyan_illumar_lamp"
     },
     "lit=true": {
       "model": "projectred-illumination:block/cyan_illumar_lamp_on"

diff --git a/...tion/generated/assets/projectred-illumination/blockstates/cyan_inverted_illumar_lamp.json b/...tion/generated/assets/projectred-illumination/blockstates/cyan_inverted_illumar_lamp.json
@@ -1,7 +1,7 @@
 {
   "variants": {
     "lit=false": {
-      "model": "projectred-illumination:block/cyan_illumar_lamp_off"
+      "model": "projectred-illumination:block/cyan_illumar_lamp"
     },
     "lit=true": {
       "model": "projectred-illumination:block/cyan_illumar_lamp_on"

diff --git a/src/illumination/generated/assets/projectred-illumination/blockstates/gray_illumar_lamp.json b/src/illumination/generated/assets/projectred-illumination/blockstates/gray_illumar_lamp.json
@@ -1,7 +1,7 @@
 {
   "variants": {
     "lit=false": {
-      "model": "projectred-illumination:block/gray_illumar_lamp_off"
+      "model": "projectred-illumination:block/gray_illumar_lamp"
     },
     "lit=true": {
       "model": "projectred-illumination:block/gray_illumar_lamp_on"

diff --git a/...tion/generated/assets/projectred-illumination/blockstates/gray_inverted_illumar_lamp.json b/...tion/generated/assets/projectred-illumination/blockstates/gray_inverted_illumar_lamp.json
@@ -1,7 +1,7 @@
 {
   "variants": {
     "lit=false": {
-      "model": "projectred-illumination:block/gray_illumar_lamp_off"
+      "model": "projectred-illumination:block/gray_illumar_lamp"
     },
     "lit=true": {
       "model": "projectred-illumination:block/gray_illumar_lamp_on"

diff --git a/...illumination/generated/assets/projectred-illumination/blockstates/green_illumar_lamp.json b/...illumination/generated/assets/projectred-illumination/blockstates/green_illumar_lamp.json
@@ -1,7 +1,7 @@
 {
   "variants": {
     "lit=false": {
-      "model": "projectred-illumination:block/green_illumar_lamp_off"
+      "model": "projectred-illumination:block/green_illumar_lamp"
     },
     "lit=true": {
       "model": "projectred-illumination:block/green_illumar_lamp_on"

diff --git a/...ion/generated/assets/projectred-illumination/blockstates/green_inverted_illumar_lamp.json b/...ion/generated/assets/projectred-illumination/blockstates/green_inverted_illumar_lamp.json
@@ -1,7 +1,7 @@
 {
   "variants": {
     "lit=false": {
-      "model": "projectred-illumination:block/green_illumar_lamp_off"
+      "model": "projectred-illumination:block/green_illumar_lamp"
     },
     "lit=true": {
       "model": "projectred-illumination:block/green_illumar_lamp_on"

diff --git a/...ination/generated/assets/projectred-illumination/blockstates/light_blue_illumar_lamp.json b/...ination/generated/assets/projectred-illumination/blockstates/light_blue_illumar_lamp.json
@@ -1,7 +1,7 @@
 {
   "variants": {
     "lit=false": {
-      "model": "projectred-illumination:block/light_blue_illumar_lamp_off"
+      "model": "projectred-illumination:block/light_blue_illumar_lamp"
     },
     "lit=true": {
       "model": "projectred-illumination:block/light_blue_illumar_lamp_on"

diff --git a/...enerated/assets/projectred-illumination/blockstates/light_blue_inverted_illumar_lamp.json b/...enerated/assets/projectred-illumination/blockstates/light_blue_inverted_illumar_lamp.json
@@ -1,7 +1,7 @@
 {
   "variants": {
     "lit=false": {
-      "model": "projectred-illumination:block/light_blue_illumar_lamp_off"
+      "model": "projectred-illumination:block/light_blue_illumar_lamp"
     },
     "lit=true": {
       "model": "projectred-illumination:block/light_blue_illumar_lamp_on"

diff --git a/...ination/generated/assets/projectred-illumination/blockstates/light_gray_illumar_lamp.json b/...ination/generated/assets/projectred-illumination/blockstates/light_gray_illumar_lamp.json
@@ -1,7 +1,7 @@
 {
   "variants": {
     "lit=false": {
-      "model": "projectred-illumination:block/light_gray_illumar_lamp_off"
+      "model": "projectred-illumination:block/light_gray_illumar_lamp"
     },
     "lit=true": {
       "model": "projectred-illumination:block/light_gray_illumar_lamp_on"

diff --git a/...enerated/assets/projectred-illumination/blockstates/light_gray_inverted_illumar_lamp.json b/...enerated/assets/projectred-illumination/blockstates/light_gray_inverted_illumar_lamp.json
@@ -1,7 +1,7 @@
 {
   "variants": {
     "lit=false": {
-      "model": "projectred-illumination:block/light_gray_illumar_lamp_off"
+      "model": "projectred-illumination:block/light_gray_illumar_lamp"
     },
     "lit=true": {
       "model": "projectred-illumination:block/light_gray_illumar_lamp_on"

diff --git a/src/illumination/generated/assets/projectred-illumination/blockstates/lime_illumar_lamp.json b/src/illumination/generated/assets/projectred-illumination/blockstates/lime_illumar_lamp.json
@@ -1,7 +1,7 @@
 {
   "variants": {
     "lit=false": {
-      "model": "projectred-illumination:block/lime_illumar_lamp_off"
+      "model": "projectred-illumination:block/lime_illumar_lamp"
     },
     "lit=true": {
       "model": "projectred-illumination:block/lime_illumar_lamp_on"

diff --git a/...tion/generated/assets/projectred-illumination/blockstates/lime_inverted_illumar_lamp.json b/...tion/generated/assets/projectred-illumination/blockstates/lime_inverted_illumar_lamp.json
@@ -1,7 +1,7 @@
 {
   "variants": {
     "lit=false": {
-      "model": "projectred-illumination:block/lime_illumar_lamp_off"
+      "model": "projectred-illumination:block/lime_illumar_lamp"
     },
     "lit=true": {
       "model": "projectred-illumination:block/lime_illumar_lamp_on"

diff --git a/...lumination/generated/assets/projectred-illumination/blockstates/magenta_illumar_lamp.json b/...lumination/generated/assets/projectred-illumination/blockstates/magenta_illumar_lamp.json
@@ -1,7 +1,7 @@
 {
   "variants": {
     "lit=false": {
-      "model": "projectred-illumination:block/magenta_illumar_lamp_off"
+      "model": "projectred-illumination:block/magenta_illumar_lamp"
     },
     "lit=true": {
       "model": "projectred-illumination:block/magenta_illumar_lamp_on"

diff --git a/...n/generated/assets/projectred-illumination/blockstates/magenta_inverted_illumar_lamp.json b/...n/generated/assets/projectred-illumination/blockstates/magenta_inverted_illumar_lamp.json
@@ -1,7 +1,7 @@
 {
   "variants": {
     "lit=false": {
-      "model": "projectred-illumination:block/magenta_illumar_lamp_off"
+      "model": "projectred-illumination:block/magenta_illumar_lamp"
     },
     "lit=true": {
       "model": "projectred-illumination:block/magenta_illumar_lamp_on"

diff --git a/...llumination/generated/assets/projectred-illumination/blockstates/orange_illumar_lamp.json b/...llumination/generated/assets/projectred-illumination/blockstates/orange_illumar_lamp.json
@@ -1,7 +1,7 @@
 {
   "variants": {
     "lit=false": {
-      "model": "projectred-illumination:block/orange_illumar_lamp_off"
+      "model": "projectred-illumination:block/orange_illumar_lamp"
     },
     "lit=true": {
       "model": "projectred-illumination:block/orange_illumar_lamp_on"

diff --git a/...on/generated/assets/projectred-illumination/blockstates/orange_inverted_illumar_lamp.json b/...on/generated/assets/projectred-illumination/blockstates/orange_inverted_illumar_lamp.json
@@ -1,7 +1,7 @@
 {
   "variants": {
     "lit=false": {
-      "model": "projectred-illumination:block/orange_illumar_lamp_off"
+      "model": "projectred-illumination:block/orange_illumar_lamp"
     },
     "lit=true": {
       "model": "projectred-illumination:block/orange_illumar_lamp_on"

diff --git a/src/illumination/generated/assets/projectred-illumination/blockstates/pink_illumar_lamp.json b/src/illumination/generated/assets/projectred-illumination/blockstates/pink_illumar_lamp.json
@@ -1,7 +1,7 @@
 {
   "variants": {
     "lit=false": {
-      "model": "projectred-illumination:block/pink_illumar_lamp_off"
+      "model": "projectred-illumination:block/pink_illumar_lamp"
     },
     "lit=true": {
       "model": "projectred-illumination:block/pink_illumar_lamp_on"

diff --git a/...tion/generated/assets/projectred-illumination/blockstates/pink_inverted_illumar_lamp.json b/...tion/generated/assets/projectred-illumination/blockstates/pink_inverted_illumar_lamp.json
@@ -1,7 +1,7 @@
 {
   "variants": {
     "lit=false": {
-      "model": "projectred-illumination:block/pink_illumar_lamp_off"
+      "model": "projectred-illumination:block/pink_illumar_lamp"
     },
     "lit=true": {
       "model": "projectred-illumination:block/pink_illumar_lamp_on"

diff --git a/...llumination/generated/assets/projectred-illumination/blockstates/purple_illumar_lamp.json b/...llumination/generated/assets/projectred-illumination/blockstates/purple_illumar_lamp.json
@@ -1,7 +1,7 @@
 {
   "variants": {
     "lit=false": {
-      "model": "projectred-illumination:block/purple_illumar_lamp_off"
+      "model": "projectred-illumination:block/purple_illumar_lamp"
     },
     "lit=true": {
       "model": "projectred-illumination:block/purple_illumar_lamp_on"

diff --git a/...on/generated/assets/projectred-illumination/blockstates/purple_inverted_illumar_lamp.json b/...on/generated/assets/projectred-illumination/blockstates/purple_inverted_illumar_lamp.json
@@ -1,7 +1,7 @@
 {
   "variants": {
     "lit=false": {
-      "model": "projectred-illumination:block/purple_illumar_lamp_off"
+      "model": "projectred-illumination:block/purple_illumar_lamp"
     },
     "lit=true": {
       "model": "projectred-illumination:block/purple_illumar_lamp_on"

diff --git a/src/illumination/generated/assets/projectred-illumination/blockstates/red_illumar_lamp.json b/src/illumination/generated/assets/projectred-illumination/blockstates/red_illumar_lamp.json
@@ -1,7 +1,7 @@
 {
   "variants": {
     "lit=false": {
-      "model": "projectred-illumination:block/red_illumar_lamp_off"
+      "model": "projectred-illumination:block/red_illumar_lamp"
     },
     "lit=true": {
       "model": "projectred-illumination:block/red_illumar_lamp_on"

diff --git a/...ation/generated/assets/projectred-illumination/blockstates/red_inverted_illumar_lamp.json b/...ation/generated/assets/projectred-illumination/blockstates/red_inverted_illumar_lamp.json
@@ -1,7 +1,7 @@
 {
   "variants": {
     "lit=false": {
-      "model": "projectred-illumination:block/red_illumar_lamp_off"
+      "model": "projectred-illumination:block/red_illumar_lamp"
     },
     "lit=true": {
       "model": "projectred-illumination:block/red_illumar_lamp_on"

diff --git a/...illumination/generated/assets/projectred-illumination/blockstates/white_illumar_lamp.json b/...illumination/generated/assets/projectred-illumination/blockstates/white_illumar_lamp.json
@@ -1,7 +1,7 @@
 {
   "variants": {
     "lit=false": {
-      "model": "projectred-illumination:block/white_illumar_lamp_off"
+      "model": "projectred-illumination:block/white_illumar_lamp"
     },
     "lit=true": {
       "model": "projectred-illumination:block/white_illumar_lamp_on"

diff --git a/...ion/generated/assets/projectred-illumination/blockstates/white_inverted_illumar_lamp.json b/...ion/generated/assets/projectred-illumination/blockstates/white_inverted_illumar_lamp.json
@@ -1,7 +1,7 @@
 {
   "variants": {
     "lit=false": {
-      "model": "projectred-illumination:block/white_illumar_lamp_off"
+      "model": "projectred-illumination:block/white_illumar_lamp"
     },
     "lit=true": {
       "model": "projectred-illumination:block/white_illumar_lamp_on"

diff --git a/...llumination/generated/assets/projectred-illumination/blockstates/yellow_illumar_lamp.json b/...llumination/generated/assets/projectred-illumination/blockstates/yellow_illumar_lamp.json
@@ -1,7 +1,7 @@
 {
   "variants": {
     "lit=false": {
-      "model": "projectred-illumination:block/yellow_illumar_lamp_off"
+      "model": "projectred-illumination:block/yellow_illumar_lamp"
     },
     "lit=true": {
       "model": "projectred-illumination:block/yellow_illumar_lamp_on"

diff --git a/...on/generated/assets/projectred-illumination/blockstates/yellow_inverted_illumar_lamp.json b/...on/generated/assets/projectred-illumination/blockstates/yellow_inverted_illumar_lamp.json
@@ -1,7 +1,7 @@
 {
   "variants": {
     "lit=false": {
-      "model": "projectred-illumination:block/yellow_illumar_lamp_off"
+      "model": "projectred-illumination:block/yellow_illumar_lamp"
     },
     "lit=true": {
       "model": "projectred-illumination:block/yellow_illumar_lamp_on"