Skip to content
Merged
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
package com.altnoir.poopsky.mixin;

import com.altnoir.poopsky.util.ClientUtil;
import net.minecraft.client.gui.screens.worldselection.CreateWorldScreen;
import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.ModifyArg;

import java.util.function.BooleanSupplier;

@Mixin(targets = "net.minecraft.client.gui.screens.worldselection.CreateWorldScreen$WorldTab")
public class CreateWorldScreenWorldTabMixin {
@Shadow
@Final
private CreateWorldScreen this$0;

@ModifyArg(
method = "<init>",
at = @At(
value = "INVOKE",
target = "Lnet/minecraft/client/gui/screens/worldselection/SwitchGrid$SwitchBuilder;withIsActiveCondition(Ljava/util/function/BooleanSupplier;)Lnet/minecraft/client/gui/screens/worldselection/SwitchGrid$SwitchBuilder;",
ordinal = 1
)
)
private BooleanSupplier poopsky$disableBonusChestForPoopSky(BooleanSupplier original) {
return () -> original.getAsBoolean() && !ClientUtil.isPoopSkyWorldType(this.this$0.getUiState());
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
package com.altnoir.poopsky.mixin;

import com.altnoir.poopsky.util.ClientUtil;
import net.minecraft.client.gui.screens.worldselection.WorldCreationUiState;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;

@Mixin(WorldCreationUiState.class)
public abstract class WorldCreationUiStateMixin {
@Shadow
private boolean bonusChest;

@Inject(method = "setBonusChest", at = @At("HEAD"), cancellable = true)
private void poopsky$preventBonusChestForPoopSky(boolean bonusChest, CallbackInfo ci) {
if (bonusChest && ClientUtil.isPoopSkyWorldType((WorldCreationUiState)(Object)this)) {
this.bonusChest = false;
ci.cancel();
}
}

@Inject(method = "setWorldType", at = @At("HEAD"))
private void poopsky$clearBonusChestForPoopSky(WorldCreationUiState.WorldTypeEntry worldType, CallbackInfo ci) {
if (ClientUtil.isPoopSkyWorldType(worldType)) {
this.bonusChest = false;
}
}

@Inject(method = "isBonusChest", at = @At("HEAD"), cancellable = true)
private void poopsky$hideBonusChestForPoopSky(CallbackInfoReturnable<Boolean> cir) {
if (ClientUtil.isPoopSkyWorldType((WorldCreationUiState)(Object)this)) {
cir.setReturnValue(false);
}
}
}
15 changes: 15 additions & 0 deletions src/main/java/com/altnoir/poopsky/util/ClientUtil.java
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
package com.altnoir.poopsky.util;

import com.altnoir.poopsky.util.asm.ASMHooks;
import com.mojang.blaze3d.systems.RenderSystem;
import com.mojang.blaze3d.vertex.*;
import com.mojang.math.Axis;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiGraphics;
import net.minecraft.client.gui.screens.worldselection.WorldCreationUiState;
import net.minecraft.client.renderer.ItemBlockRenderTypes;
import net.minecraft.client.renderer.MultiBufferSource;
import net.minecraft.client.renderer.RenderType;
Expand All @@ -25,6 +27,8 @@
import org.joml.Matrix4fStack;
import org.joml.Vector3f;

import java.util.Optional;

public class ClientUtil {
private static final FluidState EMPTY = Fluids.EMPTY.defaultFluidState();
private static final BlockState AIR = Blocks.AIR.defaultBlockState();
Expand Down Expand Up @@ -143,4 +147,15 @@ public int getMinBuildHeight() {
return 0;
}
}

public static boolean isPoopSkyWorldType(WorldCreationUiState uiState) {
return isPoopSkyWorldType(uiState.getWorldType());
}

public static boolean isPoopSkyWorldType(WorldCreationUiState.WorldTypeEntry worldType) {
return Optional.ofNullable(worldType.preset())
.flatMap(holder -> holder.unwrapKey())
.filter(ASMHooks.POOPSKY::equals)
.isPresent();
}
}
Loading