diff --git a/build.gradle.kts b/build.gradle.kts index 552c8af..496e82b 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -191,49 +191,4 @@ publishing { } } } -}*/ -mavenPublishing { - publishToMavenCentral() - - signAllPublications() - coordinates( - "io.github.hotpad100c", - "ryansrenderingkit", - project.version.toString() - ) - pom { - name.set("Ryans Rendering Kit") - description.set("A Fabric rendering utility library for Minecraft mods.") - url.set("https://github.com/hotpad100c/ryansrenderingkit") - - licenses { - license { - name.set("MIT License") - url.set("https://opensource.org/licenses/MIT") - } - } - - scm { - url.set("https://github.com/hotpad100c/ryansrenderingkit") - connection.set("scm:git:https://github.com/hotpad100c/ryansrenderingkit.git") - developerConnection.set("scm:git:ssh://git@github.com:hotpad100c/ryansrenderingkit.git") - } - - developers { - developer { - id.set("hotpad100c") - name.set("Ryan100C") - email.set("hotpad100c@gmail.com") - } - } - } -} - -signing { - useInMemoryPgpKeys( - findProperty("signing.keyId") as String, - file("C:\\Users\\Ryan\\.gnupg\\private.key").readText(), - findProperty("signing.password") as String - ) - sign(publishing.publications) -} \ No newline at end of file +}*/ \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 9e9e687..d4d95dc 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,6 @@ # Done to increase the memory available to gradle. org.gradle.jvmargs=-Xmx6G org.gradle.parallel=true -org.gradle.configuration-cache=true # Mod properties mod.version=1.1.0 diff --git a/settings.gradle.kts b/settings.gradle.kts index 73d6ad8..542b7f0 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -16,7 +16,7 @@ stonecutter { create(rootProject) { // See https://stonecutter.kikugie.dev/wiki/start/#choosing-minecraft-versions versions( - //"1.16.5",TODO + //"1.16.5", TODO "1.17.1", "1.18.2", "1.19.4", @@ -29,9 +29,12 @@ stonecutter { "1.21.6", "1.21.9", "1.21.10", - "1.21.11" + "1.21.11", ).buildscript("build.gradle.kts") - version("26.1").buildscript("unobfuscated.gradle.kts") + versions( + "26.1", + "26.2" + ).buildscript("unobfuscated.gradle.kts") vcsVersion = "1.21.4" } } diff --git a/src/main/java/ml/mypals/ryansrenderingkit/RyansRenderingKit.java b/src/main/java/ml/mypals/ryansrenderingkit/RyansRenderingKit.java index f5a9be5..8359217 100644 --- a/src/main/java/ml/mypals/ryansrenderingkit/RyansRenderingKit.java +++ b/src/main/java/ml/mypals/ryansrenderingkit/RyansRenderingKit.java @@ -11,16 +11,16 @@ //? if >1.18.2 { import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback; //?} else { -/*import net.fabricmc.fabric.api.client.command.v1.ClientCommandManager; +/*import net.fabricmc.fabric.api.client.command.v1.ClientCommands; *///?} import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents; //? if >= 26.1 { -/*import net.fabricmc.fabric.api.client.rendering.v1.level.LevelRenderContext; +import net.fabricmc.fabric.api.client.rendering.v1.level.LevelRenderContext; import net.fabricmc.fabric.api.client.rendering.v1.level.LevelRenderEvents; -*///?} else if >=1.21.10 { -import net.fabricmc.fabric.api.client.rendering.v1.world.WorldRenderContext; +//?} else if >=1.21.10 { +/*import net.fabricmc.fabric.api.client.rendering.v1.world.WorldRenderContext; import net.fabricmc.fabric.api.client.rendering.v1.world.WorldRenderEvents; -//?} else if =1.21.9 { +*///?} else if =1.21.9 { /*import ml.mypals.ryansrenderingkit.render.nine.WorldRenderContext; *///?} else { /*import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderContext; @@ -47,20 +47,20 @@ public void onInitializeClient() { VertexBuilderGetter.init(); //? if >= 26.1 { - /*LevelRenderEvents.END_MAIN.register(this::handleRenderLast); - *///?} else if >= 1.21.10 { - WorldRenderEvents.END_MAIN.register(this::handleRenderLast); - //?} else if > 1.21.1 && < 1.21.9 { + LevelRenderEvents.END_MAIN.register(this::handleRenderLast); + //?} else if >= 1.21.10 { + /*WorldRenderEvents.END_MAIN.register(this::handleRenderLast); + *///?} else if > 1.21.1 && < 1.21.9 { /*WorldRenderEvents.LAST.register(this::handleRenderLast); *///?} else if <= 1.21.1 { /*WorldRenderEvents.AFTER_ENTITIES.register(this::handleRenderLast); *///?} //? if >= 26.1 { - /*ClientTickEvents.END_LEVEL_TICK.register(c -> { - *///?} else { - ClientTickEvents.END_WORLD_TICK.register(c -> { - //?} + ClientTickEvents.END_LEVEL_TICK.register(c -> { + //?} else { + /*ClientTickEvents.END_WORLD_TICK.register(c -> { + *///?} if (c.getGameTime() % 20 == 0) { RENDER_PROFILER.reset(); } @@ -68,10 +68,10 @@ public void onInitializeClient() { }); //? if >= 26.1 { - /*ClientTickEvents.START_LEVEL_TICK.register(c -> { - *///?} else { - ClientTickEvents.START_WORLD_TICK.register(c -> { - //?} + ClientTickEvents.START_LEVEL_TICK.register(c -> { + //?} else { + /*ClientTickEvents.START_WORLD_TICK.register(c -> { + *///?} endOfWorldTick = false; RENDER_PROFILER.push("syncTransforms"); ShapeManagers.syncShapeTransform(); @@ -84,7 +84,7 @@ public void onInitializeClient() { registerDebugCommands(dispatcher) ); //?} else { - /*registerDebugCommands(ClientCommandManager.DISPATCHER); + /*registerDebugCommands(ClientCommands.DISPATCHER); *///?} Debug.init(); } @@ -93,10 +93,10 @@ public static boolean isEndOfWorldTick() { return endOfWorldTick; } - public /*? if = 1.21.9 {*//*static*//*?}*/ void handleRenderLast(/*? if >= 26.1 {*//*LevelRenderContext*//*?} else {*/WorldRenderContext/*?}*/ ctx) { + public /*? if = 1.21.9 {*//*static*//*?}*/ void handleRenderLast(/*? if >= 26.1 {*/LevelRenderContext/*?} else {*//*WorldRenderContext*//*?}*/ ctx) { MainRender.render( //? >=1.21.9 { - /*? if >= 26.1 {*//*ctx.poseStack()*//*?} else {*/ctx.matrices()/*?}*/, /*? if != 1.21.9 {*/ctx.gameRenderer().getMainCamera()/*?} else {*//*ctx.camera()*//*?}*/, + /*? if >= 26.1 {*/ctx.poseStack()/*?} else {*//*ctx.matrices()*//*?}*/, /*? if != 1.21.9 {*/ctx.gameRenderer().getMainCamera()/*?} else {*//*ctx.camera()*//*?}*/, //?} else { /*ctx.matrixStack(), ctx.camera(), *///?} diff --git a/src/main/java/ml/mypals/ryansrenderingkit/builders/shapeBuilders/BlockShapeBuilder.java b/src/main/java/ml/mypals/ryansrenderingkit/builders/shapeBuilders/BlockShapeBuilder.java index 5f5a516..9482aa8 100644 --- a/src/main/java/ml/mypals/ryansrenderingkit/builders/shapeBuilders/BlockShapeBuilder.java +++ b/src/main/java/ml/mypals/ryansrenderingkit/builders/shapeBuilders/BlockShapeBuilder.java @@ -3,14 +3,14 @@ import ml.mypals.ryansrenderingkit.shape.Shape; import ml.mypals.ryansrenderingkit.shape.minecraftBuiltIn.BlockShape; import ml.mypals.ryansrenderingkit.transform.shapeTransformers.DefaultTransformer; -import net.minecraft.client.renderer.LightTexture; +import net.minecraft.util.LightCoordsUtil; import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.state.BlockState; public class BlockShapeBuilder extends BaseBuilder { private BlockState blockState = Blocks.AIR.defaultBlockState(); - private int light = LightTexture.FULL_BRIGHT; + private int light = LightCoordsUtil.FULL_BRIGHT; public BlockShapeBuilder block(BlockState blockState) { this.blockState = blockState; diff --git a/src/main/java/ml/mypals/ryansrenderingkit/builders/shapeBuilders/EntityShapeBuilder.java b/src/main/java/ml/mypals/ryansrenderingkit/builders/shapeBuilders/EntityShapeBuilder.java index 4254195..c780688 100644 --- a/src/main/java/ml/mypals/ryansrenderingkit/builders/shapeBuilders/EntityShapeBuilder.java +++ b/src/main/java/ml/mypals/ryansrenderingkit/builders/shapeBuilders/EntityShapeBuilder.java @@ -3,13 +3,13 @@ import ml.mypals.ryansrenderingkit.shape.Shape; import ml.mypals.ryansrenderingkit.shape.minecraftBuiltIn.EntityShape; import ml.mypals.ryansrenderingkit.transform.shapeTransformers.DefaultTransformer; -import net.minecraft.client.renderer.LightTexture; +import net.minecraft.util.LightCoordsUtil; import net.minecraft.world.entity.Entity; public class EntityShapeBuilder extends BaseBuilder { private Entity entity; - private int light = LightTexture.FULL_BRIGHT; + private int light = LightCoordsUtil.FULL_BRIGHT; public EntityShapeBuilder entity(Entity entity) { this.entity = entity; diff --git a/src/main/java/ml/mypals/ryansrenderingkit/builders/shapeBuilders/ItemShapeBuilder.java b/src/main/java/ml/mypals/ryansrenderingkit/builders/shapeBuilders/ItemShapeBuilder.java index d440c1f..eb3942a 100644 --- a/src/main/java/ml/mypals/ryansrenderingkit/builders/shapeBuilders/ItemShapeBuilder.java +++ b/src/main/java/ml/mypals/ryansrenderingkit/builders/shapeBuilders/ItemShapeBuilder.java @@ -3,8 +3,7 @@ import ml.mypals.ryansrenderingkit.shape.Shape; import ml.mypals.ryansrenderingkit.shape.minecraftBuiltIn.ItemShape; import ml.mypals.ryansrenderingkit.transform.shapeTransformers.DefaultTransformer; -import net.minecraft.client.renderer.LightTexture; -import net.minecraft.client.renderer.block.model.ItemTransforms; +import net.minecraft.util.LightCoordsUtil; //? if >1.18.2 { import net.minecraft.world.item.ItemDisplayContext; //?} else { @@ -17,7 +16,7 @@ public class ItemShapeBuilder extends BaseBuilder1.18.2 {*/ ItemDisplayContext/*?} else {*//*ItemTransforms.TransformType*//*?}*/ displayContext = /*? if >1.18.2 {*/ ItemDisplayContext/*?} else {*//*ItemTransforms.TransformType*//*?}*/ .FIXED; - private int light = LightTexture.FULL_BRIGHT; + private int light = LightCoordsUtil.FULL_BRIGHT; public ItemShapeBuilder itemStack(ItemStack itemStack) { this.itemStack = itemStack; diff --git a/src/main/java/ml/mypals/ryansrenderingkit/builders/vertexBuilders/BufferedVertexBuilder.java b/src/main/java/ml/mypals/ryansrenderingkit/builders/vertexBuilders/BufferedVertexBuilder.java index c893050..ee9696f 100644 --- a/src/main/java/ml/mypals/ryansrenderingkit/builders/vertexBuilders/BufferedVertexBuilder.java +++ b/src/main/java/ml/mypals/ryansrenderingkit/builders/vertexBuilders/BufferedVertexBuilder.java @@ -317,9 +317,9 @@ public void draw(Vec3 cameraPos) { } *///?} else { - GpuBufferSlice gpuBufferSlice = RenderSystem.getDynamicUniforms().writeTransform(RenderSystem.getModelViewMatrix(), new Vector4f(1.0F, 1.0F, 1.0F, 1.0F), + GpuBufferSlice gpuBufferSlice = RenderSystem.getDynamicUniforms().writeTransform(RenderSystem.getModelViewMatrixCopy(), new Vector4f(1.0F, 1.0F, 1.0F, 1.0F), new Vector3f(), - /*? if <1.21.11 {*//*RenderSystem.getTextureMatrix(), RenderSystem.getShaderLineWidth()*//*?} else {*/bufferedRenderMethod.normalRenderType().state.textureTransform.getMatrix()/*?}*/); + /*? if <1.21.11 {*//*RenderSystem.getTextureMatrix(), RenderSystem.getShaderLineWidth()*//*?} else {*/bufferedRenderMethod.normalRenderType().state.textureTransform.createMatrix()/*?}*/); var state = bufferedRenderMethod.normalRenderType().state; RenderTarget renderTarget = state./*? if >=1.21.11 {*/outputTarget/*?} else {*//*outputState*//*?}*/.getRenderTarget(); GpuTextureView gpuTextureView = RenderSystem.outputColorTextureOverride != null ? RenderSystem.outputColorTextureOverride : renderTarget.getColorTextureView(); diff --git a/src/main/java/ml/mypals/ryansrenderingkit/builders/vertexBuilders/VertexBuilder.java b/src/main/java/ml/mypals/ryansrenderingkit/builders/vertexBuilders/VertexBuilder.java index b3d5e05..547daa9 100644 --- a/src/main/java/ml/mypals/ryansrenderingkit/builders/vertexBuilders/VertexBuilder.java +++ b/src/main/java/ml/mypals/ryansrenderingkit/builders/vertexBuilders/VertexBuilder.java @@ -4,7 +4,7 @@ //?} import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.BufferBuilder; -import com.mojang.blaze3d.vertex.Tesselator; +import com.mojang.blaze3d.vertex.ByteBufferBuilder; import ml.mypals.ryansrenderingkit.render.RenderMethod; import ml.mypals.ryansrenderingkit.shape.Shape; import net.minecraft.world.phys.Vec3; @@ -45,7 +45,7 @@ protected void begin(RenderMethod renderMethod) { } //? if > 1.20.6 { - this.bufferBuilder = Tesselator.getInstance().begin(renderMethod.mode(), renderMethod.format()); + this.bufferBuilder = new BufferBuilder(new ByteBufferBuilder(786432), renderMethod.mode(), renderMethod.format()); //?} else { /*this.bufferBuilder = Tesselator.getInstance().getBuilder(); //? if <=1.18.2 { @@ -88,8 +88,8 @@ public void putVertex(Vector3f v, float r, float g, float b, float a) { this.bufferBuilder.addVertex(positionMatrix, v.x, v.y, v.z).setColor(r, g, b, a); //?} else { /*this.bufferBuilder.vertex(convertToMojangIfNeeded(positionMatrix), v.x(), v.y(), v.z()).color(r, g, b, a).endVertex(); - *///?} - } + *///?} + } public void putVertex(Vector3f v, float r, float g, float b, float a, Vector3f normal,float width) { //? if > 1.20.6 { @@ -98,8 +98,8 @@ public void putVertex(Vector3f v, float r, float g, float b, float a, Vector3f n .setNormal(normal.x, normal.y, normal.z) //? if >=1.21.11 { .setLineWidth(width) - //?} - ; + //?} + ; //?} else { /*this.bufferBuilder.vertex(convertToMojangIfNeeded(positionMatrix), v.x(), v.y(), v.z()) .color(r, g, b, a) @@ -141,9 +141,9 @@ public void putVertex(Vec3 v, Vec3 normal,float width) { public void putVertex(Vector3f v) { //? if > 1.20.6 { this.bufferBuilder.addVertex(positionMatrix, v.x, v.y, v.z).setColor(r, g, b, a); - //?} else { + //?} else { /*this.bufferBuilder.vertex(convertToMojangIfNeeded(positionMatrix), v.x(), v.y(), v.z()).color(r, g, b, a).endVertex(); - *///?} + *///?} } public void putVertex(Vector3f v, Vector3f normal,float width) { @@ -153,8 +153,8 @@ public void putVertex(Vector3f v, Vector3f normal,float width) { .setNormal(normal.x, normal.y, normal.z) //? if >=1.21.11 { .setLineWidth(width) - //?} - ; + //?} + ; //?} else { /*this.bufferBuilder.vertex(convertToMojangIfNeeded(positionMatrix), v.x(), v.y(), v.z()) .color(r, g, b, a) @@ -179,14 +179,14 @@ public void setUpRendererSystem(@Nullable Shape shape) { //? >=1.21.5 { GlStateManager._disableDepthTest(); //?} else { - /*RenderSystem.disableDepthTest(); - *///?} + /*RenderSystem.disableDepthTest(); + *///?} } else { //? >=1.21.5 { GlStateManager._enableDepthTest(); //?} else { - /*RenderSystem.enableDepthTest(); - *///?} + /*RenderSystem.enableDepthTest(); + *///?} } //? >=1.21.5 { @@ -200,13 +200,13 @@ public void setUpRendererSystem(@Nullable Shape shape) { *///?} //? < 1.21.6 { /*RenderSystem.setShaderColor(1,1,1,1); - *///?} -} + *///?} + } public void restoreRendererSystem() { //? if <1.21.11 { /*RenderSystem.lineWidth(1.0f); - *///?} + *///?} //? >=1.21.5 { GlStateManager._enableDepthTest(); GlStateManager._disablePolygonOffset(); @@ -218,6 +218,6 @@ public void restoreRendererSystem() { *///?} //? < 1.21.6 { /*RenderSystem.setShaderColor(1,1,1,1); - *///?} + *///?} } } \ No newline at end of file diff --git a/src/main/java/ml/mypals/ryansrenderingkit/render/renderTypes/RyansRenderingKitRenderTypes.java b/src/main/java/ml/mypals/ryansrenderingkit/render/renderTypes/RyansRenderingKitRenderTypes.java index 944a91a..effc752 100644 --- a/src/main/java/ml/mypals/ryansrenderingkit/render/renderTypes/RyansRenderingKitRenderTypes.java +++ b/src/main/java/ml/mypals/ryansrenderingkit/render/renderTypes/RyansRenderingKitRenderTypes.java @@ -1,7 +1,8 @@ package ml.mypals.ryansrenderingkit.render.renderTypes; //? if >= 1.21.5 { +import com.mojang.blaze3d.pipeline.DepthStencilState; import com.mojang.blaze3d.pipeline.RenderPipeline; -import com.mojang.blaze3d.platform.DepthTestFunction; +import com.mojang.blaze3d.platform.CompareOp; import com.mojang.blaze3d.vertex.DefaultVertexFormat; import com.mojang.blaze3d.vertex.VertexFormat; import net.minecraft.client.renderer.RenderPipelines; @@ -15,6 +16,7 @@ import net.minecraft.client.renderer.rendertype.RenderType; import net.minecraft.resources.Identifier; +import java.util.Optional; import java.util.OptionalDouble; import static ml.mypals.ryansrenderingkit.RyansRenderingKit.MOD_ID; @@ -49,8 +51,7 @@ public class RyansRenderingKitRenderTypes { //? if >= 1.21.5 { private static final RenderPipeline noDepthTriangles = RenderPipeline.builder(RenderPipelines.DEBUG_FILLED_SNIPPET) .withLocation(Identifier.fromNamespaceAndPath(MOD_ID, "no_depth_quads")) - .withDepthTestFunction(DepthTestFunction.NO_DEPTH_TEST) - .withDepthWrite(false) + .withDepthStencilState(Optional.empty()) .withCull(false) .withVertexFormat(DefaultVertexFormat.POSITION_COLOR, VertexFormat.Mode.TRIANGLES) .build(); @@ -79,8 +80,7 @@ public class RyansRenderingKitRenderTypes { private static final RenderPipeline noDepthLines = RenderPipeline.builder(RenderPipelines.LINES_SNIPPET) .withLocation(Identifier.fromNamespaceAndPath(MOD_ID, "no_depth_lines")) - .withDepthTestFunction(DepthTestFunction.NO_DEPTH_TEST) - .withDepthWrite(false) + .withDepthStencilState(Optional.empty()) .withCull(false) //? if <1.21.11 { /*.withVertexFormat(DefaultVertexFormat.POSITION_COLOR, VertexFormat.Mode.LINES) @@ -113,8 +113,7 @@ public class RyansRenderingKitRenderTypes { *///?} private static final RenderPipeline noDepthLineStrip = RenderPipeline.builder(RenderPipelines.LINES_SNIPPET) .withLocation(Identifier.fromNamespaceAndPath(MOD_ID, "no_depth_line_strip")) - .withDepthTestFunction(DepthTestFunction.NO_DEPTH_TEST) - .withDepthWrite(false) + .withDepthStencilState(Optional.empty()) .withCull(false) //? if <1.21.11 { /*.withVertexFormat(DefaultVertexFormat.POSITION_COLOR, VertexFormat.Mode.LINES) @@ -131,7 +130,7 @@ public class RyansRenderingKitRenderTypes { private static final RenderPipeline lineStrip = RenderPipeline.builder(RenderPipelines.DEBUG_FILLED_SNIPPET) .withLocation(Identifier.fromNamespaceAndPath(MOD_ID, "no_depth_line_strip")) - .withDepthWrite(false) + .withDepthStencilState(new DepthStencilState(CompareOp.LESS_THAN_OR_EQUAL, false)) .withCull(false) .withVertexFormat(DefaultVertexFormat.POSITION_COLOR_NORMAL_LINE_WIDTH, VertexFormat.Mode.DEBUG_LINE_STRIP) .build(); diff --git a/src/main/java/ml/mypals/ryansrenderingkit/shape/minecraftBuiltIn/BlockShape.java b/src/main/java/ml/mypals/ryansrenderingkit/shape/minecraftBuiltIn/BlockShape.java index cd0be62..56e9101 100644 --- a/src/main/java/ml/mypals/ryansrenderingkit/shape/minecraftBuiltIn/BlockShape.java +++ b/src/main/java/ml/mypals/ryansrenderingkit/shape/minecraftBuiltIn/BlockShape.java @@ -2,22 +2,26 @@ import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.PoseStack; +import it.unimi.dsi.fastutil.objects.ObjectArrayList; import ml.mypals.ryansrenderingkit.builders.vertexBuilders.VertexBuilder; import ml.mypals.ryansrenderingkit.shape.Shape; import ml.mypals.ryansrenderingkit.shape.basics.tags.EmptyMesh; import ml.mypals.ryansrenderingkit.transform.shapeTransformers.DefaultTransformer; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.MultiBufferSource; -import net.minecraft.client.renderer.block.BlockRenderDispatcher; -import net.minecraft.client.renderer.block.model.BakedQuad; +import net.minecraft.client.renderer.block.BlockStateModelSet; +import net.minecraft.client.renderer.block.ModelBlockRenderer; +import net.minecraft.client.renderer.block.dispatch.BlockStateModel; +import net.minecraft.client.renderer.block.dispatch.BlockStateModelPart; import net.minecraft.client.renderer.blockentity.BlockEntityRenderDispatcher; +import net.minecraft.client.renderer.rendertype.RenderTypes; import net.minecraft.client.renderer.texture.OverlayTexture; //? <1.21.5 { /*import net.minecraft.client.resources.model.BakedModel; *///?} else { -import net.minecraft.client.renderer.block.model.BlockModelPart; -import net.minecraft.client.renderer.block.model.BlockStateModel; //?} +import net.minecraft.client.renderer.texture.TextureAtlas; +import net.minecraft.client.resources.model.geometry.BakedQuad; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.world.level.block.EntityBlock; @@ -37,7 +41,7 @@ //? if >=1.21.9 { import net.minecraft.client.renderer.SubmitNodeCollector; import net.minecraft.client.renderer.blockentity.state.BlockEntityRenderState; -import net.minecraft.client.renderer.state.CameraRenderState; +import net.minecraft.client.renderer.state.level.CameraRenderState; //?} public class BlockShape extends Shape implements EmptyMesh { @@ -64,7 +68,7 @@ protected void generateRawGeometry(boolean lerp) { Minecraft mc = Minecraft.getInstance(); List indices = new ArrayList<>(); if (mc.level == null) return; - BlockRenderDispatcher dispatcher = mc.getBlockRenderer(); + BlockStateModelSet dispatcher = mc.getModelManager().getBlockStateModelSet(); //? <1.21.5 { /*BakedModel bakedModel = dispatcher.getBlockModel(blockState); @@ -82,8 +86,10 @@ protected void generateRawGeometry(boolean lerp) { } } *///?} else { - BlockStateModel bakedModel = dispatcher.getBlockModel(blockState); - for (BlockModelPart bakedQuads : bakedModel.collectParts(mc.level.getRandom())) { + BlockStateModel bakedModel = dispatcher.get(blockState); + List parts = new ObjectArrayList<>(); + bakedModel.collectParts(mc.level.getRandom(), parts); + for (BlockStateModelPart bakedQuads : parts) { for(Direction direction : Direction.values()) { for(BakedQuad bakedQuad : bakedQuads.getQuads(direction)) { int base = model_vertexes.size(); @@ -137,7 +143,8 @@ public static List decodeQuad(BakedQuad quad) { protected void drawInternal(VertexBuilder builder) { Minecraft mc = Minecraft.getInstance(); - BlockRenderDispatcher dispatcher = mc.getBlockRenderer(); + boolean ambientOcclusion = mc.options.ambientOcclusion().get(); + ModelBlockRenderer blockRenderer = new ModelBlockRenderer(ambientOcclusion, false, mc.getBlockColors()); MultiBufferSource multiBufferSource = mc.renderBuffers().bufferSource(); //? < 1.21.6 { @@ -153,7 +160,11 @@ protected void drawInternal(VertexBuilder builder) { //poseStack.mulPoseMatrix(convertToMojangIfNeeded(builder.getPositionMatrix())); - dispatcher.renderSingleBlock(blockState, poseStack, multiBufferSource, light, OverlayTexture.NO_OVERLAY); + BlockStateModel model = mc.getModelManager().getBlockStateModelSet().get(blockState); + List parts = new ObjectArrayList<>(); + model.collectParts(mc.level.getRandom(), parts); + SubmitNodeCollector submitNodeCollector = mc.gameRenderer.getSubmitNodeStorage(); + submitNodeCollector.submitBlockModel(poseStack, RenderTypes.entityTranslucent(TextureAtlas.LOCATION_BLOCKS), parts, new int[0], light, OverlayTexture.NO_OVERLAY, 0); if (blockState.getBlock() instanceof EntityBlock) { BlockEntityRenderDispatcher blockEntityRenderDispatcher = mc.getBlockEntityRenderDispatcher(); @@ -161,10 +172,9 @@ protected void drawInternal(VertexBuilder builder) { //? if <1.21.9 { /*blockEntityRenderDispatcher.render(blockEntity, transformer.getTickDelta(), poseStack, multiBufferSource); - *///?} else { + *///?} else { BlockEntityRenderState blockEntityRenderState = blockEntityRenderDispatcher.tryExtractRenderState(blockEntity, transformer.getTickDelta(),null); - SubmitNodeCollector submitNodeCollector = mc.gameRenderer.getSubmitNodeStorage(); - CameraRenderState cameraRenderState = mc.gameRenderer.getLevelRenderState().cameraRenderState; + net.minecraft.client.renderer.state.level.CameraRenderState cameraRenderState = mc.gameRenderer.getGameRenderState().levelRenderState.cameraRenderState; blockEntityRenderDispatcher.submit(blockEntityRenderState,poseStack,submitNodeCollector,cameraRenderState); //?} } diff --git a/src/main/java/ml/mypals/ryansrenderingkit/shape/minecraftBuiltIn/EntityShape.java b/src/main/java/ml/mypals/ryansrenderingkit/shape/minecraftBuiltIn/EntityShape.java index 9e5ba28..51936dc 100644 --- a/src/main/java/ml/mypals/ryansrenderingkit/shape/minecraftBuiltIn/EntityShape.java +++ b/src/main/java/ml/mypals/ryansrenderingkit/shape/minecraftBuiltIn/EntityShape.java @@ -8,7 +8,6 @@ import ml.mypals.ryansrenderingkit.transform.shapeTransformers.DefaultTransformer; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.MultiBufferSource; -import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.client.renderer.entity.EntityRenderDispatcher; import net.minecraft.world.entity.Entity; import net.minecraft.world.phys.Vec3; @@ -21,7 +20,7 @@ import net.minecraft.client.renderer.entity.state.EntityRenderState; import net.minecraft.client.renderer.SubmitNodeCollection; import net.minecraft.client.renderer.SubmitNodeCollector; -import net.minecraft.client.renderer.state.CameraRenderState; +import net.minecraft.client.renderer.state.level.CameraRenderState; //?} import static ml.mypals.ryansrenderingkit.RyansRenderingKit.isEndOfWorldTick; @@ -103,7 +102,7 @@ protected void drawInternal(VertexBuilder builder) { *///?} else { EntityRenderState entityRenderState = dispatcher.extractEntity(entity, transformer.getTickDelta()); SubmitNodeCollector submitNodeCollector = mc.gameRenderer.getSubmitNodeStorage(); - CameraRenderState cameraRenderState = mc.gameRenderer.getLevelRenderState().cameraRenderState; + CameraRenderState cameraRenderState = mc.gameRenderer.getGameRenderState().levelRenderState.cameraRenderState; dispatcher.submit(entityRenderState,cameraRenderState,0,0,0,poseStack,submitNodeCollector); //?} poseStack.popPose(); diff --git a/src/main/java/ml/mypals/ryansrenderingkit/shape/minecraftBuiltIn/ItemShape.java b/src/main/java/ml/mypals/ryansrenderingkit/shape/minecraftBuiltIn/ItemShape.java index 6669f8d..3875c15 100644 --- a/src/main/java/ml/mypals/ryansrenderingkit/shape/minecraftBuiltIn/ItemShape.java +++ b/src/main/java/ml/mypals/ryansrenderingkit/shape/minecraftBuiltIn/ItemShape.java @@ -8,7 +8,7 @@ import ml.mypals.ryansrenderingkit.transform.shapeTransformers.DefaultTransformer; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.MultiBufferSource; -import net.minecraft.client.renderer.entity.ItemRenderer; +import net.minecraft.client.renderer.entity.EntityRenderDispatcher; import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.world.entity.item.ItemEntity; //? if >1.18.2 { @@ -84,8 +84,6 @@ protected void generateRawGeometry(boolean lerp) { protected void drawInternal(VertexBuilder builder) { Minecraft mc = Minecraft.getInstance(); - ItemRenderer itemRenderer = mc.getItemRenderer(); - MultiBufferSource multiBufferSource = mc.renderBuffers().bufferSource(); //? < 1.21.6 { /*RenderSystem.setShaderColor((float) this.baseColor.getRed() / 255, diff --git a/src/main/java/ml/mypals/ryansrenderingkit/shape/minecraftBuiltIn/TextShape.java b/src/main/java/ml/mypals/ryansrenderingkit/shape/minecraftBuiltIn/TextShape.java index d98477c..702ae66 100644 --- a/src/main/java/ml/mypals/ryansrenderingkit/shape/minecraftBuiltIn/TextShape.java +++ b/src/main/java/ml/mypals/ryansrenderingkit/shape/minecraftBuiltIn/TextShape.java @@ -10,7 +10,7 @@ import net.minecraft.client.Camera; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Font; -import net.minecraft.client.renderer.LightTexture; +import net.minecraft.util.LightCoordsUtil; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; @@ -134,7 +134,7 @@ protected void drawInternal(VertexBuilder builder) { color.getRGB(), multiplyRGB(color.getRGB(), 0.8f), convertToMojangIfNeeded(builder.getPositionMatrix()), - bufferSource, LightTexture.FULL_BRIGHT); + bufferSource, LightCoordsUtil.FULL_BRIGHT); } else { font.drawInBatch( text, @@ -149,7 +149,7 @@ protected void drawInternal(VertexBuilder builder) { /*seeThrough, *///?} backgroundColor.getRGB(), - LightTexture.FULL_BRIGHT + LightCoordsUtil.FULL_BRIGHT //? if <=1.18.2 //,false ); diff --git a/src/main/java/ml/mypals/ryansrenderingkit/test/Debug.java b/src/main/java/ml/mypals/ryansrenderingkit/test/Debug.java index 675c4ac..440b6aa 100644 --- a/src/main/java/ml/mypals/ryansrenderingkit/test/Debug.java +++ b/src/main/java/ml/mypals/ryansrenderingkit/test/Debug.java @@ -18,17 +18,16 @@ import ml.mypals.ryansrenderingkit.transform.shapeTransformers.DefaultTransformer; //? if >1.18.2 { import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback; -import net.fabricmc.fabric.api.client.command.v2.ClientCommandManager; +import net.fabricmc.fabric.api.client.command.v2.ClientCommands; import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource; import net.minecraft.world.item.ItemDisplayContext; //?} else { -/*import net.fabricmc.fabric.api.client.command.v1.ClientCommandManager; +/*import net.fabricmc.fabric.api.client.command.v1.ClientCommands; import net.fabricmc.fabric.api.client.command.v1.FabricClientCommandSource; *///?} import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents; import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.LightTexture; -import net.minecraft.client.renderer.block.model.ItemTransforms; +import net.minecraft.util.LightCoordsUtil; import net.minecraft.network.chat.Component; import net.minecraft.resources.Identifier; import net.minecraft.util.Mth; @@ -69,8 +68,8 @@ static float xPos() { public static void registerDebugCommands(CommandDispatcher dispatcher) { dispatcher.register( - ClientCommandManager.literal("ryansRenderingKit_DEBUG") - .then(ClientCommandManager.literal("toggle") + ClientCommands.literal("ryansRenderingKit_DEBUG") + .then(ClientCommands.literal("toggle") .executes(ctx -> { boolean newValue = toggleDebugMode(); ctx.getSource().sendFeedback( @@ -79,14 +78,14 @@ public static void registerDebugCommands(CommandDispatcher { added = false; ctx.getSource().sendFeedback( Component.nullToEmpty("Ryan's Rendering Kit Debug Shapes Reloaded.")); return 0; }) - ).then(ClientCommandManager.literal("profile") + ).then(ClientCommands.literal("profile") .executes(ctx -> { RENDER_PROFILER.print(); RENDER_PROFILER.reset(); @@ -113,10 +112,10 @@ private static boolean toggleDebugMode() { public static void init() { //? if >= 26.1 { - /*ClientTickEvents.START_LEVEL_TICK.register(client -> { - *///?} else { - ClientTickEvents.START_WORLD_TICK.register(client -> { - //?} + ClientTickEvents.START_LEVEL_TICK.register(client -> { + //?} else { + /*ClientTickEvents.START_WORLD_TICK.register(client -> { + *///?} if (added || !ENABLE_DEBUG) return; index = 0; ShapeManagers.removeShapes( @@ -493,7 +492,7 @@ public static void init() { t.shape, t); }) .block(Blocks.GLASS.defaultBlockState()) - .light(LightTexture.FULL_BLOCK) + .light(240) .build(); ShapeManagers.addShape( Identifier.fromNamespaceAndPath(MOD_ID, "test/demo_block_shape"), @@ -506,7 +505,7 @@ public static void init() { t.shape, t); }, new Vec3(xPos(), 0, 0), - Items.DRAGON_EGG.getDefaultInstance(), /*? if >1.18.2 {*/ ItemDisplayContext/*?} else {*//*ItemTransforms.TransformType*//*?}*/ .FIXED, LightTexture.FULL_BLOCK); + Items.DRAGON_EGG.getDefaultInstance(), /*? if >1.18.2 {*/ ItemDisplayContext/*?} else {*//*ItemTransforms.TransformType*//*?}*/ .FIXED, 240); ShapeManagers.addShape( Identifier.fromNamespaceAndPath(MOD_ID, "test/demo_item_shape"), itemShape @@ -519,7 +518,7 @@ public static void init() { t.setShapeWorldRotationDegrees(time * 2, time * 3, time * 1.5f); }, new Vec3(xPos(), 0, 0), - Minecraft.getInstance().player, LightTexture.FULL_BLOCK); + Minecraft.getInstance().player, 240); ShapeManagers.addShape( Identifier.fromNamespaceAndPath(MOD_ID, "test/demo_entity_shape"), entityShape diff --git a/src/main/java/ml/mypals/ryansrenderingkit/utils/Helpers.java b/src/main/java/ml/mypals/ryansrenderingkit/utils/Helpers.java index 8cd083d..7a4812e 100644 --- a/src/main/java/ml/mypals/ryansrenderingkit/utils/Helpers.java +++ b/src/main/java/ml/mypals/ryansrenderingkit/utils/Helpers.java @@ -12,7 +12,9 @@ //? if >1.21.1 { import net.minecraft.client.renderer.LevelRenderer; -import net.minecraft.client.renderer.ShapeRenderer; +//? if <26.2 { +/*import net.minecraft.client.renderer.ShapeRenderer; +*///?} //?} else { /*import net.minecraft.client.renderer.GameRenderer; import net.minecraft.client.renderer.LevelRenderer; diff --git a/stonecutter.gradle.kts b/stonecutter.gradle.kts index 86bb64c..dd8ab1d 100644 --- a/stonecutter.gradle.kts +++ b/stonecutter.gradle.kts @@ -5,7 +5,7 @@ plugins { // id("me.modmuss50.mod-publish-plugin") version "1.0.+" apply false } -stonecutter active "1.21.11" +stonecutter active "26.2" /* // Make newer versions be published last diff --git a/unobfuscated.gradle.kts b/unobfuscated.gradle.kts index 80bf1ef..8da4050 100644 --- a/unobfuscated.gradle.kts +++ b/unobfuscated.gradle.kts @@ -175,49 +175,4 @@ publishing { } } } -}*/ -mavenPublishing { - publishToMavenCentral() - - signAllPublications() - coordinates( - "io.github.hotpad100c", - "ryansrenderingkit", - project.version.toString() - ) - pom { - name.set("Ryans Rendering Kit") - description.set("A Fabric rendering utility library for Minecraft mods.") - url.set("https://github.com/hotpad100c/ryansrenderingkit") - - licenses { - license { - name.set("MIT License") - url.set("https://opensource.org/licenses/MIT") - } - } - - scm { - url.set("https://github.com/hotpad100c/ryansrenderingkit") - connection.set("scm:git:https://github.com/hotpad100c/ryansrenderingkit.git") - developerConnection.set("scm:git:ssh://git@github.com:hotpad100c/ryansrenderingkit.git") - } - - developers { - developer { - id.set("hotpad100c") - name.set("Ryan100C") - email.set("hotpad100c@gmail.com") - } - } - } -} - -signing { - useInMemoryPgpKeys( - findProperty("signing.keyId") as String, - file("C:\\Users\\Ryan\\.gnupg\\private.key").readText(), - findProperty("signing.password") as String - ) - sign(publishing.publications) -} \ No newline at end of file +}*/ \ No newline at end of file diff --git a/versions/26.1/gradle.properties b/versions/26.1/gradle.properties index 0dbb5d3..3ee73e5 100644 --- a/versions/26.1/gradle.properties +++ b/versions/26.1/gradle.properties @@ -1,12 +1,12 @@ -deps.fabric_api=0.143.2+26.1 +deps.fabric_api=0.145.3+26.1.1 # Minecraft dependency for fabric.mod.json -mod.mc_dep=^26.1- +mod.mc_dep=^26.1 # Release title for Modrinth and Curseforge -mod.mc_title=26.1-snapshot-6 +mod.mc_title=26.1.1 # Space-separated compatible versions for publishing -mod.mc_targets=26.1-snapshot-6 +mod.mc_targets=26.1.1 -minecraft=26.1-snapshot-6 \ No newline at end of file +minecraft=26.1.1 \ No newline at end of file diff --git a/versions/26.2/gradle.properties b/versions/26.2/gradle.properties new file mode 100644 index 0000000..1bf0400 --- /dev/null +++ b/versions/26.2/gradle.properties @@ -0,0 +1,12 @@ +deps.fabric_api=0.145.5+26.2 + +# Minecraft dependency for fabric.mod.json +mod.mc_dep=^26.1 + +# Release title for Modrinth and Curseforge +mod.mc_title=26.2-snapshot-1 + +# Space-separated compatible versions for publishing +mod.mc_targets=26.2-snapshot-1 + +minecraft=26.2-snapshot-1 \ No newline at end of file