Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rewrite Sodium/Embeddium support #977

Draft
wants to merge 3 commits into
base: 1.20
Choose a base branch
from
Draft
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
19 changes: 16 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ repositories {
maven {
url "https://maven.blamejared.com"
}
flatDir {
dirs 'lib'
}
}

group= "team.creative" + project.mod_id
Expand Down Expand Up @@ -45,7 +48,7 @@ minecraft {
client {
taskName "littletiles_client"
workingDirectory project.file('run')

property 'forge.logging.console.level', 'debug'
arg '--mixin.config'
arg 'creativecore.mixins.json'
Expand Down Expand Up @@ -85,9 +88,19 @@ minecraft {
}

dependencies {
implementation fg.deobf("net.caffeinemc:sodium:0.6.0")
implementation fg.deobf("net.fabricmc:fabric_api_base:0.6.0")
implementation fg.deobf("net.fabricmc:fabric_block_view_api_v2:0.6.0")
implementation fg.deobf("net.fabricmc:fabric_renderer_api_v1:0.6.0")
implementation fg.deobf("net.fabricmc:fabric_rendering_data_attachment_v1:0.6.0")
minecraftLibrary("com.lodborg:interval-tree:1.0.0")

minecraftLibrary fg.deobf("curse.maven:oculus-581495:5299671")
implementation fg.deobf("org.embeddedt:embeddium-1.20.1:0.3.20-git-b21cfd8+mc1.20.1")

compileOnly fg.deobf("org.embeddedt:embeddium-1.20.1:0.3.20-git-b21cfd8+mc1.20.1")

runtimeOnly("io.github.llamalad7:mixinextras-common:0.3.6")
runtimeOnly("io.github.llamalad7:mixinextras-forge:0.3.6")

minecraft "net.minecraftforge:forge:${project.property 'minecraft_version'}-${project.property 'forge_version'}"

implementation project(':CreativeCore')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,6 @@
import team.creative.littletiles.client.level.LevelHandlersClient;
import team.creative.littletiles.client.level.LittleAnimationHandlerClient;
import team.creative.littletiles.client.level.LittleVanillaInteractionHandlerClient;
import team.creative.littletiles.client.mod.oculus.OculusManager;
import team.creative.littletiles.client.mod.rubidium.RubidiumManager;
import team.creative.littletiles.client.player.LittleClientPlayerConnection;
import team.creative.littletiles.client.render.block.BETilesRenderer;
import team.creative.littletiles.client.render.block.LittleBlockClientRegistry;
Expand Down Expand Up @@ -237,9 +235,6 @@ public void onResourceManagerReload(ResourceManager manager) {
ItemProperties.register(LittleTilesRegistry.CYAN_COLOR.get(), filled, function);
ItemProperties.register(LittleTilesRegistry.MAGENTA_COLOR.get(), filled, function);
ItemProperties.register(LittleTilesRegistry.YELLOW_COLOR.get(), filled, function);

RubidiumManager.init();
OculusManager.init();
}

public static void modelLoader(RegisterAdditional event) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

import javax.annotation.Nullable;

import net.minecraftforge.fml.ModList;
import org.joml.Matrix4f;

import com.google.common.collect.Lists;
Expand Down Expand Up @@ -62,7 +63,6 @@
import team.creative.creativecore.common.util.type.itr.FilterIterator;
import team.creative.littletiles.LittleTiles;
import team.creative.littletiles.api.client.entity.LevelTransitionListener;
import team.creative.littletiles.client.mod.rubidium.RubidiumManager;
import team.creative.littletiles.client.render.level.LittleRenderChunk;
import team.creative.littletiles.client.render.level.RenderUploader;
import team.creative.littletiles.common.block.mc.BlockTile;
Expand Down Expand Up @@ -351,9 +351,6 @@ public void renderBlockEntitiesAndDestruction(PoseStack pose, Frustum frustum, f

@SubscribeEvent
public void renderChunkLayer(RenderLevelStageEvent event) {
if (RubidiumManager.installed())
return;

RenderType layer = null;

if (event.getStage() == Stage.AFTER_SOLID_BLOCKS)
Expand All @@ -369,12 +366,13 @@ else if (event.getStage() == Stage.AFTER_TRIPWIRE_BLOCKS)

if (layer == null)
return;

PoseStack pose = event.getPoseStack();
Matrix4f projectionMatrix = event.getProjectionMatrix();

layer.setupRenderState();

ShaderInstance shaderinstance = RenderSystem.getShader();

for (int i = 0; i < 12; ++i) {
int j1 = RenderSystem.getShaderTexture(i);
shaderinstance.setSampler("Sampler" + i, j1);
Expand Down Expand Up @@ -425,7 +423,8 @@ else if (event.getStage() == Stage.AFTER_TRIPWIRE_BLOCKS)
animation.getRenderManager().renderChunkLayer(layer, pose, cam.x, cam.y, cam.z, projectionMatrix, offset);
pose.popPose();
}

layer.clearRenderState();

shaderinstance.clear();
}

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
package team.creative.littletiles.client.mod.embeddium;

import me.jellysquid.mods.sodium.client.model.quad.BakedQuadView;
import me.jellysquid.mods.sodium.client.render.chunk.compile.ChunkBuildBuffers;
import me.jellysquid.mods.sodium.client.render.chunk.compile.buffers.ChunkModelBuilder;
import me.jellysquid.mods.sodium.client.world.WorldSlice;
import net.minecraft.client.renderer.RenderType;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
import net.minecraft.world.level.block.state.BlockState;

public interface BlockRendererAccess {
void drawQuad(ChunkModelBuilder builder, Direction face, WorldSlice levelSlice, BakedQuadView quad, BlockState state, RenderType renderType, BlockPos pos, BlockPos offset, int color);
}

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading