From 20a69c7ccc0496e858bff88d7f256dd658973728 Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Thu, 2 Dec 2021 23:02:58 +0100 Subject: [PATCH] last???? fixes --- build.gradle | 8 +++++++- src/main/java/de/ellpeck/prettypipes/PrettyPipes.java | 3 +-- .../de/ellpeck/prettypipes/misc/ItemTerminalWidget.java | 5 +---- .../prettypipes/pipe/containers/AbstractPipeGui.java | 8 ++++++-- .../prettypipes/pipe/modules/craft/CraftingModuleGui.java | 5 ++++- .../pipe/modules/modifier/FilterModifierModuleGui.java | 5 ++++- .../ellpeck/prettypipes/pressurizer/PressurizerGui.java | 5 ++++- .../prettypipes/terminal/containers/ItemTerminalGui.java | 8 ++++++-- 8 files changed, 33 insertions(+), 14 deletions(-) diff --git a/build.gradle b/build.gradle index 8929d33..202a864 100644 --- a/build.gradle +++ b/build.gradle @@ -76,6 +76,12 @@ minecraft { } } } + + all { + lazyToken('minecraft_classpath') { + configurations.embed.copyRecursive().resolve().collect { it.absolutePath }.join(File.pathSeparator) + } + } } } @@ -156,7 +162,7 @@ publishing { artifact deobfJar { classifier 'deobf' } - + artifact sourcesJar { classifier 'sources' } diff --git a/src/main/java/de/ellpeck/prettypipes/PrettyPipes.java b/src/main/java/de/ellpeck/prettypipes/PrettyPipes.java index ee4aa51..1687da1 100644 --- a/src/main/java/de/ellpeck/prettypipes/PrettyPipes.java +++ b/src/main/java/de/ellpeck/prettypipes/PrettyPipes.java @@ -1,7 +1,6 @@ package de.ellpeck.prettypipes; import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.eventbus.api.IEventBus; import net.minecraftforge.fml.DistExecutor; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; @@ -14,6 +13,6 @@ public final class PrettyPipes { public PrettyPipes() { var bus = FMLJavaModLoadingContext.get().getModEventBus(); bus.addListener(Registry::setup); - DistExecutor.safeRunWhenOn(Dist.CLIENT, () -> () -> bus.addListener(Registry.Client::setup)); + DistExecutor.unsafeRunWhenOn(Dist.CLIENT, () -> () -> bus.addListener(Registry.Client::setup)); } } diff --git a/src/main/java/de/ellpeck/prettypipes/misc/ItemTerminalWidget.java b/src/main/java/de/ellpeck/prettypipes/misc/ItemTerminalWidget.java index b47b611..890c5d8 100644 --- a/src/main/java/de/ellpeck/prettypipes/misc/ItemTerminalWidget.java +++ b/src/main/java/de/ellpeck/prettypipes/misc/ItemTerminalWidget.java @@ -46,10 +46,7 @@ public class ItemTerminalWidget extends AbstractWidget { renderer.renderGuiItem(this.stack, this.x, this.y); var amount = !this.craftable ? this.stack.getCount() : 0; var amountStrg = this.stack.getCount() >= 1000 ? amount / 1000 + "k" : String.valueOf(amount); - matrix.pushPose(); - matrix.scale(0.8F, 0.8F, 1); - renderer.renderGuiItemDecorations(mc.font, this.stack, (int) (this.x / 0.8F) + 4, (int) (this.y / 0.8F) + 4, amountStrg); - matrix.popPose(); + renderer.renderGuiItemDecorations(mc.font, this.stack, this.x, this.y, amountStrg); renderer.blitOffset = 0; this.setBlitOffset(0); diff --git a/src/main/java/de/ellpeck/prettypipes/pipe/containers/AbstractPipeGui.java b/src/main/java/de/ellpeck/prettypipes/pipe/containers/AbstractPipeGui.java index 2a5219b..4a1384c 100644 --- a/src/main/java/de/ellpeck/prettypipes/pipe/containers/AbstractPipeGui.java +++ b/src/main/java/de/ellpeck/prettypipes/pipe/containers/AbstractPipeGui.java @@ -1,5 +1,6 @@ package de.ellpeck.prettypipes.pipe.containers; +import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.PoseStack; import de.ellpeck.prettypipes.PrettyPipes; import de.ellpeck.prettypipes.Registry; @@ -8,6 +9,7 @@ import de.ellpeck.prettypipes.packets.PacketButton; import de.ellpeck.prettypipes.packets.PacketHandler; import net.minecraft.client.gui.components.AbstractWidget; import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen; +import net.minecraft.client.renderer.GameRenderer; import net.minecraft.client.resources.sounds.SimpleSoundInstance; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; @@ -76,7 +78,8 @@ public abstract class AbstractPipeGui> extend @Override protected void renderBg(PoseStack matrix, float partialTicks, int mouseX, int mouseY) { - this.getMinecraft().getTextureManager().bindForSetup(TEXTURE); + RenderSystem.setShader(GameRenderer::getPositionTexShader); + RenderSystem.setShaderTexture(0, TEXTURE); this.blit(matrix, this.leftPos, this.topPos + 32, 0, 0, 176, 171); for (var tab : this.tabs) @@ -139,7 +142,8 @@ public abstract class AbstractPipeGui> extend AbstractPipeGui.this.blit(matrix, this.x, this.y + y, 176, v, 28, height); AbstractPipeGui.this.itemRenderer.renderGuiItem(this.moduleStack, this.x + 6, this.y + itemOffset); - AbstractPipeGui.this.getMinecraft().getTextureManager().bindForSetup(TEXTURE); + RenderSystem.setShader(GameRenderer::getPositionTexShader); + RenderSystem.setShaderTexture(0, TEXTURE); } private void drawForeground(PoseStack matrix, int mouseX, int mouseY) { diff --git a/src/main/java/de/ellpeck/prettypipes/pipe/modules/craft/CraftingModuleGui.java b/src/main/java/de/ellpeck/prettypipes/pipe/modules/craft/CraftingModuleGui.java index 9185e0b..126f6f5 100644 --- a/src/main/java/de/ellpeck/prettypipes/pipe/modules/craft/CraftingModuleGui.java +++ b/src/main/java/de/ellpeck/prettypipes/pipe/modules/craft/CraftingModuleGui.java @@ -1,7 +1,9 @@ package de.ellpeck.prettypipes.pipe.modules.craft; +import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.PoseStack; import de.ellpeck.prettypipes.pipe.containers.AbstractPipeGui; +import net.minecraft.client.renderer.GameRenderer; import net.minecraft.network.chat.Component; import net.minecraft.world.entity.player.Inventory; @@ -14,7 +16,8 @@ public class CraftingModuleGui extends AbstractPipeGui @Override protected void renderBg(PoseStack matrix, float partialTicks, int mouseX, int mouseY) { super.renderBg(matrix, partialTicks, mouseX, mouseY); - this.getMinecraft().getTextureManager().bindForSetup(TEXTURE); + RenderSystem.setShader(GameRenderer::getPositionTexShader); + RenderSystem.setShaderTexture(0, TEXTURE); this.blit(matrix, this.leftPos + 176 / 2 - 16 / 2, this.topPos + 32 + 18 * 2, 176, 80, 16, 16); } } diff --git a/src/main/java/de/ellpeck/prettypipes/pipe/modules/modifier/FilterModifierModuleGui.java b/src/main/java/de/ellpeck/prettypipes/pipe/modules/modifier/FilterModifierModuleGui.java index de19a39..19204bc 100644 --- a/src/main/java/de/ellpeck/prettypipes/pipe/modules/modifier/FilterModifierModuleGui.java +++ b/src/main/java/de/ellpeck/prettypipes/pipe/modules/modifier/FilterModifierModuleGui.java @@ -1,9 +1,11 @@ package de.ellpeck.prettypipes.pipe.modules.modifier; +import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.PoseStack; import de.ellpeck.prettypipes.packets.PacketButton; import de.ellpeck.prettypipes.pipe.containers.AbstractPipeGui; import net.minecraft.ChatFormatting; +import net.minecraft.client.renderer.GameRenderer; import net.minecraft.client.resources.sounds.SimpleSoundInstance; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; @@ -123,7 +125,8 @@ public class FilterModifierModuleGui extends AbstractPipeGui= 9 * 4) { @@ -311,7 +314,8 @@ public class ItemTerminalGui extends AbstractContainerScreen