Skip to content
Open
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
5 changes: 3 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ apply plugin: 'org.spongepowered.mixin'

mixin {
add sourceSets.main, "observerlib.refmap.json"
config 'assets/observerlib/observerlib.mixins.json'
}

version = '1.18.2-1.6.0'
Expand Down Expand Up @@ -100,6 +101,7 @@ minecraft {
property 'forge.enabledGameTestNamespaces', 'observerlib'
property 'Dmixin.debug.export', 'true'

args "-mixin.config=assets/observerlib/observerlib.mixins.json"
args '--mod', 'observerlib', '--all', '--output', file('src/generated/resources/')

mods {
Expand All @@ -113,7 +115,7 @@ minecraft {

dependencies {

minecraft 'net.minecraftforge:forge:1.18.2-40.1.25'
minecraft 'net.minecraftforge:forge:1.18.2-40.2.0'
annotationProcessor 'org.spongepowered:mixin:0.8.5:processor'

}
Expand Down Expand Up @@ -151,7 +153,6 @@ jar {
"Implementation-Version": "${version}",
"Implementation-Vendor" : "hellfirepvp",
"Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ"),
"MixinConnector": "hellfirepvp.observerlib.MixinConnector"
])
}
}
Expand Down
19 changes: 0 additions & 19 deletions src/main/java/hellfirepvp/observerlib/MixinConnector.java

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
package hellfirepvp.observerlib.api.client;

import com.mojang.blaze3d.vertex.PoseStack;
import com.mojang.blaze3d.systems.RenderSystem;
import com.mojang.blaze3d.vertex.VertexConsumer;
import hellfirepvp.observerlib.api.structure.Structure;
import hellfirepvp.observerlib.client.util.LightmapUtil;
import hellfirepvp.observerlib.client.util.RenderSystemUtil;
import hellfirepvp.observerlib.client.util.RenderTypeDecorator;
import hellfirepvp.observerlib.common.block.BlockAirRequirement;
import hellfirepvp.observerlib.common.util.RegistryUtil;
import net.minecraft.core.Holder;
Expand Down Expand Up @@ -174,9 +171,9 @@ public void render3DSliceGUI(PoseStack renderStack, double x, double y, float pT
renderStack.translate(pos.getX(), pos.getY(), pos.getZ());

if (!view.getFluidState().isEmpty()) {
this.renderFluid(pos, view, view.getFluidState(), buffers.getBuffer(wrapBlockRenderType(RenderType.translucent())));
this.renderFluid(pos, view, view.getFluidState(), buffers.getBuffer(RenderType.translucent()));
}
RenderType type = wrapBlockRenderType(ItemBlockRenderTypes.getMovingBlockRenderType(view));
RenderType type = ItemBlockRenderTypes.getMovingBlockRenderType(view);
if (this.isolateIndividualBlockRender) {
this.world.pushContentFilter(wPos -> wPos.equals(pos));
this.renderBlock(pos, view, buffers.getBuffer(type), renderStack);
Expand Down Expand Up @@ -218,10 +215,6 @@ public void render3DSliceGUI(PoseStack renderStack, double x, double y, float pT
renderStack.popPose();
}

private RenderType wrapBlockRenderType(RenderType type) {
return RenderTypeDecorator.wrapSetup(type, RenderSystemUtil::disableLighting, () -> {});
}

private void renderFluid(BlockPos pos, BlockState state, FluidState fluidState, VertexConsumer buf) {
BlockRenderDispatcher brd = Minecraft.getInstance().getBlockRenderer();
brd.renderLiquid(pos, this.world, buf, state, fluidState);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,6 @@ void render(Level renderWorld, PoseStack renderStack, Vec3 playerPos) {
.setColorDecorator(colorDecorator);

Runnable transparentSetup = () -> {
RenderSystemUtil.disableAlphaTest();
RenderSystem.disableDepthTest();
RenderSystem.enableBlend();
RenderSystem.blendFuncSeparate(GlStateManager.SourceFactor.ONE, GlStateManager.DestFactor.SRC_ALPHA,
Expand All @@ -138,7 +137,6 @@ void render(Level renderWorld, PoseStack renderStack, Vec3 playerPos) {
RenderSystem.defaultBlendFunc();
RenderSystem.disableBlend();
RenderSystem.enableDepthTest();
RenderSystemUtil.enableAlphaTest();
};

Vec3 vec = new Vec3(0, 0, 0);
Expand Down

This file was deleted.

32 changes: 6 additions & 26 deletions src/main/java/hellfirepvp/observerlib/mixin/MixinLevelChunk.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package hellfirepvp.observerlib.mixin;

import hellfirepvp.observerlib.ObserverLib;
import hellfirepvp.observerlib.common.event.BlockChangeNotifier;
import net.minecraft.core.BlockPos;
import net.minecraft.world.level.Level;
Expand All @@ -24,8 +25,6 @@
@Mixin(LevelChunk.class)
public abstract class MixinLevelChunk {

private BlockState prevState = null;

@Shadow @Final Level level;

@Shadow public abstract BlockState getBlockState(BlockPos p_62923_);
Expand All @@ -36,33 +35,14 @@ public abstract class MixinLevelChunk {
value = "INVOKE",
target = "Lnet/minecraft/world/level/block/state/BlockState;getBlock()Lnet/minecraft/world/level/block/Block;",
ordinal = 0
)
),
locals = LocalCapture.CAPTURE_FAILHARD
)
public void onBlockStateUpdate(BlockPos pos, BlockState newState, boolean arg2, CallbackInfoReturnable<BlockState> cir) {
if (this.prevState == null || this.level.isClientSide() || this.prevState == newState) {
return;
}
if (this.level.captureBlockSnapshots) {
return;
}
LevelChunk thisLevelChunk = (LevelChunk)(Object) this;
BlockChangeNotifier.onBlockChange(this.level, thisLevelChunk, pos, this.prevState, newState);
this.prevState = null;
}

@Inject(
method = "setBlockState",
at = @At(
value = "INVOKE",
target = "Lnet/minecraft/world/level/chunk/LevelChunkSection;setBlockState(IIILnet/minecraft/world/level/block/state/BlockState;)Lnet/minecraft/world/level/block/state/BlockState;",
shift = At.Shift.BEFORE
)
)
public void preBlockStateUpdate(BlockPos pos, BlockState newState, boolean p_62867_, CallbackInfoReturnable<BlockState> cir) {
public void onBlockStateUpdate(BlockPos p_62865_, BlockState p_62866_, boolean p_62867_, CallbackInfoReturnable<BlockState> cir, int i, LevelChunkSection levelchunksection, boolean flag, int j, int k, int l, BlockState blockstate) {
if (this.level.isClientSide()) {
return;
}
this.prevState = this.getBlockState(pos);
LevelChunk thisLevelChunk = (LevelChunk)(Object) this;
BlockChangeNotifier.onBlockChange(this.level, thisLevelChunk, p_62865_, blockstate, p_62866_);
}

}
1 change: 0 additions & 1 deletion src/main/resources/META-INF/MANIFEST.MF

This file was deleted.