Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 1 addition & 46 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
}*/
1 change: 0 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -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
Expand Down
9 changes: 6 additions & 3 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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"
}
}
Expand Down
40 changes: 20 additions & 20 deletions src/main/java/ml/mypals/ryansrenderingkit/RyansRenderingKit.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -47,31 +47,31 @@ 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();
}
endOfWorldTick = true;
});

//? 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();
Expand All @@ -84,7 +84,7 @@ public void onInitializeClient() {
registerDebugCommands(dispatcher)
);
//?} else {
/*registerDebugCommands(ClientCommandManager.DISPATCHER);
/*registerDebugCommands(ClientCommands.DISPATCHER);
*///?}
Debug.init();
}
Expand All @@ -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(),
*///?}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<BlockShapeBuilder, DefaultTransformer> {

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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<EntityShapeBuilder, DefaultTransformer> {

private Entity entity;
private int light = LightTexture.FULL_BRIGHT;
private int light = LightCoordsUtil.FULL_BRIGHT;

public EntityShapeBuilder entity(Entity entity) {
this.entity = entity;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -17,7 +16,7 @@ public class ItemShapeBuilder extends BaseBuilder<ItemShapeBuilder, DefaultTrans
private ItemStack itemStack = ItemStack.EMPTY;
private /*? if >1.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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand All @@ -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)
Expand Down Expand Up @@ -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) {
Expand All @@ -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)
Expand All @@ -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 {
Expand All @@ -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();
Expand All @@ -218,6 +218,6 @@ public void restoreRendererSystem() {
*///?}
//? < 1.21.6 {
/*RenderSystem.setShaderColor(1,1,1,1);
*///?}
*///?}
}
}
Loading