Merge remote-tracking branch 'create/mc1.19/dev' into mc1.19/fabric/dev

# Conflicts: # gradle.properties # src/generated/resources/.cache/8e794e243511ea3d808ffb90a97ef5ee71d8d5f9 # src/generated/resources/.cache/b256105d8411632b0d585496ea8944a751a08034 # src/main/java/com/simibubi/create/AllFluids.java # src/main/java/com/simibubi/create/AllTags.java # src/main/java/com/simibubi/create/compat/computercraft/implementation/ComputerBehaviour.java # src/main/java/com/simibubi/create/content/decoration/copycat/CopycatModel.java # src/main/java/com/simibubi/create/content/decoration/copycat/CopycatPanelModel.java # src/main/java/com/simibubi/create/content/equipment/armor/DivingHelmetItem.java # src/main/java/com/simibubi/create/content/equipment/armor/RemainingAirOverlay.java # src/main/java/com/simibubi/create/content/processing/basin/BasinBlockEntity.java # src/main/java/com/simibubi/create/content/schematics/client/SchematicRenderer.java # src/main/java/com/simibubi/create/foundation/events/ClientEvents.java # src/main/java/com/simibubi/create/foundation/render/SuperByteBuffer.java # src/main/java/com/simibubi/create/infrastructure/gametest/tests/TestFluids.java
Fabricators-of-Create · Jul 8, 2023 · 384b92c · 384b92c
2 parents ff09bda + 20fde55
commit 384b92c
Show file tree

Hide file tree

Showing 14 changed files with 21 additions and 20 deletions.
diff --git a/...utting/compat/hexcasting/akashic_log.json → ...utting/compat/hexcasting/edified_log.json b/...utting/compat/hexcasting/akashic_log.json → ...utting/compat/hexcasting/edified_log.json
@@ -10,13 +10,13 @@
   ],
   "ingredients": [
     {
-      "item": "hexcasting:akashic_log"
+      "item": "hexcasting:edified_log"
     }
   ],
   "processingTime": 50,
   "results": [
     {
-      "item": "hexcasting:akashic_log_stripped"
+      "item": "hexcasting:stripped_edified_log"
     }
   ]
 }
diff --git a/...tting/compat/hexcasting/akashic_wood.json → ...tting/compat/hexcasting/edified_wood.json b/...tting/compat/hexcasting/akashic_wood.json → ...tting/compat/hexcasting/edified_wood.json
@@ -10,13 +10,13 @@
   ],
   "ingredients": [
     {
-      "item": "hexcasting:akashic_wood"
+      "item": "hexcasting:edified_wood"
     }
   ],
   "processingTime": 50,
   "results": [
     {
-      "item": "hexcasting:akashic_wood_stripped"
+      "item": "hexcasting:stripped_edified_wood"
     }
   ]
 }
diff --git a/...mpat/hexcasting/akashic_log_stripped.json → ...mpat/hexcasting/stripped_edified_log.json b/...mpat/hexcasting/akashic_log_stripped.json → ...mpat/hexcasting/stripped_edified_log.json
@@ -10,14 +10,14 @@
   ],
   "ingredients": [
     {
-      "item": "hexcasting:akashic_log_stripped"
+      "item": "hexcasting:stripped_edified_log"
     }
   ],
   "processingTime": 50,
   "results": [
     {
       "count": 6,
-      "item": "hexcasting:akashic_planks"
+      "item": "hexcasting:edified_planks"
     }
   ]
 }
diff --git a/...pat/hexcasting/akashic_wood_stripped.json → ...pat/hexcasting/stripped_edified_wood.json b/...pat/hexcasting/akashic_wood_stripped.json → ...pat/hexcasting/stripped_edified_wood.json
@@ -10,14 +10,14 @@
   ],
   "ingredients": [
     {
-      "item": "hexcasting:akashic_wood_stripped"
+      "item": "hexcasting:stripped_edified_wood"
     }
   ],
   "processingTime": 50,
   "results": [
     {
       "count": 6,
-      "item": "hexcasting:akashic_planks"
+      "item": "hexcasting:edified_planks"
     }
   ]
 }
diff --git a/src/generated/resources/data/create/tags/entity_types/ignore_seat.json b/src/generated/resources/data/create/tags/entity_types/ignore_seat.json
@@ -1,4 +1,3 @@
 {
-  "replace": false,
   "values": []
 }
diff --git a/src/generated/resources/data/create/tags/items/modded_stripped_logs.json b/src/generated/resources/data/create/tags/items/modded_stripped_logs.json
@@ -34,7 +34,7 @@
       "required": false
     },
     {
-      "id": "hexcasting:akashic_log_stripped",
+      "id": "hexcasting:stripped_akashic_log",
       "required": false
     },
     {

diff --git a/src/generated/resources/data/create/tags/items/modded_stripped_wood.json b/src/generated/resources/data/create/tags/items/modded_stripped_wood.json
@@ -34,7 +34,7 @@
       "required": false
     },
     {
-      "id": "hexcasting:akashic_wood_stripped",
+      "id": "hexcasting:stripped_akashic_wood",
       "required": false
     },
     {

diff --git a/src/main/java/com/simibubi/create/content/equipment/armor/RemainingAirOverlay.java b/src/main/java/com/simibubi/create/content/equipment/armor/RemainingAirOverlay.java
@@ -1,5 +1,7 @@
 package com.simibubi.create.content.equipment.armor;
 
+import java.util.List;
+
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.simibubi.create.AllItems;
 import com.simibubi.create.foundation.gui.element.GuiGameElement;
@@ -14,8 +16,6 @@
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.GameType;
 
-import java.util.List;
-
 public class RemainingAirOverlay {
 	public static void render(PoseStack poseStack, int width, int height) {
 		Minecraft mc = Minecraft.getInstance();

diff --git a/src/main/java/com/simibubi/create/content/schematics/client/SchematicRenderer.java b/src/main/java/com/simibubi/create/content/schematics/client/SchematicRenderer.java
@@ -11,7 +11,6 @@
 import com.jozufozu.flywheel.fabric.model.LayerFilteringBakedModel;
 import com.jozufozu.flywheel.util.Pair;
 import com.mojang.blaze3d.vertex.BufferBuilder;
-import com.mojang.blaze3d.vertex.BufferBuilder.RenderedBuffer;
 import com.mojang.blaze3d.vertex.DefaultVertexFormat;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.VertexFormat;

diff --git a/src/main/java/com/simibubi/create/foundation/data/recipe/CuttingRecipeGen.java b/src/main/java/com/simibubi/create/foundation/data/recipe/CuttingRecipeGen.java
@@ -56,7 +56,7 @@ public class CuttingRecipeGen extends ProcessingRecipeGen {
 		FA = cuttingCompat(Mods.FA, "cherrywood", "mysterywood"),
 
 		// Hexcasting (stripped is a suffix here)
-		HEX = cuttingCompat(Mods.HEX, "akashic"),
+		HEX = cuttingCompat(Mods.HEX, "edified"),
 
 		// Integrated Dynamics (stripped is a suffix here also)
 		ID = cuttingCompat(Mods.ID, "menril"),

diff --git a/src/main/java/com/simibubi/create/foundation/data/recipe/Mods.java b/src/main/java/com/simibubi/create/foundation/data/recipe/Mods.java
@@ -15,7 +15,7 @@ public enum Mods {
 	BSK("blue_skies"),
 	BTN("botania", b -> b.omitWoodSuffix()),
 	FA("forbidden_arcanus", b -> b.omitWoodSuffix()),
-	HEX("hexcasting", b -> b.strippedWoodIsSuffix()),
+	HEX("hexcasting"),
 	ID("integrateddynamics", b -> b.strippedWoodIsSuffix()),
 	BYG("byg"),
 	SG("silentgear"),

diff --git a/src/main/java/com/simibubi/create/foundation/events/ClientEvents.java b/src/main/java/com/simibubi/create/foundation/events/ClientEvents.java
@@ -6,7 +6,6 @@
 import com.mojang.blaze3d.shaders.FogShape;
 import com.mojang.blaze3d.systems.RenderSystem;
 import com.mojang.blaze3d.vertex.PoseStack;
-import com.simibubi.create.AllFluids;
 import com.simibubi.create.AllItems;
 import com.simibubi.create.AllKeys;
 import com.simibubi.create.AllPackets;

diff --git a/src/main/java/com/simibubi/create/foundation/ponder/element/WorldSectionElement.java b/src/main/java/com/simibubi/create/foundation/ponder/element/WorldSectionElement.java
@@ -14,7 +14,6 @@
 import com.jozufozu.flywheel.fabric.model.LayerFilteringBakedModel;
 import com.jozufozu.flywheel.util.transform.TransformStack;
 import com.mojang.blaze3d.vertex.BufferBuilder;
-import com.mojang.blaze3d.vertex.BufferBuilder.RenderedBuffer;
 import com.mojang.blaze3d.vertex.DefaultVertexFormat;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.SheetedDecalTextureGenerator;

diff --git a/src/main/java/com/simibubi/create/foundation/render/SuperByteBuffer.java b/src/main/java/com/simibubi/create/foundation/render/SuperByteBuffer.java
@@ -1,6 +1,10 @@
 package com.simibubi.create.foundation.render;
 
+import java.nio.ByteBuffer;
+import java.util.function.IntPredicate;
+
 import com.jozufozu.flywheel.api.vertex.ShadedVertexList;
+import com.jozufozu.flywheel.api.vertex.VertexList;
 import com.jozufozu.flywheel.backend.ShadersModHandler;
 import com.jozufozu.flywheel.core.model.ShadeSeparatedBufferedData;
 import com.jozufozu.flywheel.core.vertex.BlockVertexList;
@@ -32,7 +36,8 @@
 
 public class SuperByteBuffer implements Transform<SuperByteBuffer>, TStack<SuperByteBuffer> {
 
-	private final ShadedVertexList template;
+	private final VertexList template;
+	private final IntPredicate shadedPredicate;
 
 	// Vertex Position
 	private final PoseStack transforms = new PoseStack();
@@ -166,7 +171,7 @@ public void renderInto(PoseStack input, VertexConsumer builder) {
 			if (disableDiffuseMult) {
 				builder.color(r, g, b, a);
 			} else {
-				float instanceDiffuse = diffuseCalculator.getDiffuse(nx, ny, nz, template.isShaded(i));
+				float instanceDiffuse = diffuseCalculator.getDiffuse(nx, ny, nz, shadedPredicate.test(i));
 				int colorR = transformColor(r, instanceDiffuse);
 				int colorG = transformColor(g, instanceDiffuse);
 				int colorB = transformColor(b, instanceDiffuse);