From 1e6dc60724113c39f087b641a5e367127e92c3d0 Mon Sep 17 00:00:00 2001 From: Mysticpasta1 Date: Wed, 29 Jun 2022 17:53:44 -0500 Subject: [PATCH] screen is working finally --- build.gradle | 2 +- .../net/montoyo/wd/client/ClientProxy.java | 12 +++---- .../net/montoyo/wd/client/gui/GuiMinePad.java | 2 +- .../wd/client/renderers/MinePadRenderer.java | 4 ++- .../wd/client/renderers/ScreenRenderer.java | 16 ++++++--- .../java/net/montoyo/wd/config/ModConfig.java | 2 +- .../java/net/montoyo/wd/mixins/MainMixin.java | 35 ------------------- src/main/resources/webdisplays.mixin.json | 1 - 8 files changed, 23 insertions(+), 51 deletions(-) delete mode 100644 src/main/java/net/montoyo/wd/mixins/MainMixin.java diff --git a/build.gradle b/build.gradle index 71a12dc..e88f3e6 100644 --- a/build.gradle +++ b/build.gradle @@ -41,7 +41,7 @@ dependencies { } forge "net.minecraftforge:forge:${project.forge_version}" - modImplementation "com.github.Mysticpasta1:mcef-forge:0be185605d" + modImplementation "com.github.Mysticpasta1:mcef-forge:805b7eec8a" modImplementation "curse.maven:cloth_config_forge-348521:3546623" // Uncomment the following line to enable the deprecated Fabric API modules. // These are included in the Fabric API production distribution and allow you to update your mod to the latest modules at a later more convenient time. diff --git a/src/main/java/net/montoyo/wd/client/ClientProxy.java b/src/main/java/net/montoyo/wd/client/ClientProxy.java index 800e967..975fd32 100644 --- a/src/main/java/net/montoyo/wd/client/ClientProxy.java +++ b/src/main/java/net/montoyo/wd/client/ClientProxy.java @@ -163,20 +163,20 @@ public class ClientProxy extends SharedProxy implements IDisplayHandler, IJSQuer jsDispatcher = new JSQueryDispatcher(this); minePadRenderer = new MinePadRenderer(); laserPointerRenderer = new LaserPointerRenderer(); - } - - @Override - public void postInit() { - ((ReloadableResourceManager) mc.getResourceManager()).registerReloadListener(this); if(mcef == null) throw new RuntimeException("MCEF is missing"); mcef.registerDisplayHandler(this); - // mcef.registerJSQueryHandler(this); //TODO why crashing on this method! + //mcef.registerJSQueryHandler(this); //TODO why crashing on this method! findAdvancementToProgressField(); } + @Override + public void postInit() { + ((ReloadableResourceManager) mc.getResourceManager()).registerReloadListener(this); + } + @Override public Level getWorld(ResourceKey dim) { Level ret = mc.level; diff --git a/src/main/java/net/montoyo/wd/client/gui/GuiMinePad.java b/src/main/java/net/montoyo/wd/client/gui/GuiMinePad.java index 72ce7fd..a328977 100644 --- a/src/main/java/net/montoyo/wd/client/gui/GuiMinePad.java +++ b/src/main/java/net/montoyo/wd/client/gui/GuiMinePad.java @@ -75,7 +75,7 @@ public class GuiMinePad extends WDScreen { if (pad.view != null) { glColor4f(1.0f, 1.0f, 1.0f, 1.0f); - pad.view.draw(vx, vy + vh, vx + vw, vy); + pad.view.draw(poseStack, vx, vy + vh, vx + vw, vy); } RenderSystem.enableCull(); diff --git a/src/main/java/net/montoyo/wd/client/renderers/MinePadRenderer.java b/src/main/java/net/montoyo/wd/client/renderers/MinePadRenderer.java index 227ae0b..3768189 100644 --- a/src/main/java/net/montoyo/wd/client/renderers/MinePadRenderer.java +++ b/src/main/java/net/montoyo/wd/client/renderers/MinePadRenderer.java @@ -6,6 +6,8 @@ package net.montoyo.wd.client.renderers; import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.PoseStack; +import com.mojang.math.Matrix3f; +import com.mojang.math.Matrix4f; import com.mojang.math.Vector3f; import net.minecraft.client.Minecraft; import net.minecraft.client.player.AbstractClientPlayer; @@ -97,7 +99,7 @@ public final class MinePadRenderer implements IItemRenderer { if(pd != null) { stack.translate(0.063f, 0.28f, 0.001f); RenderSystem.disableTexture(); - pd.view.draw(0.0, 0.0, 27.65 / 32.0 + 0.01, 14.0 / 32.0 + 0.002); + pd.view.draw(stack,0.0, 0.0, 27.65 / 32.0 + 0.01, 14.0 / 32.0 + 0.002); } } diff --git a/src/main/java/net/montoyo/wd/client/renderers/ScreenRenderer.java b/src/main/java/net/montoyo/wd/client/renderers/ScreenRenderer.java index 87d00c8..cbc2ac4 100644 --- a/src/main/java/net/montoyo/wd/client/renderers/ScreenRenderer.java +++ b/src/main/java/net/montoyo/wd/client/renderers/ScreenRenderer.java @@ -4,8 +4,10 @@ package net.montoyo.wd.client.renderers; +import com.mojang.blaze3d.platform.GlStateManager; import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.*; +import net.minecraft.client.renderer.GameRenderer; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.blockentity.BlockEntityRenderer; import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider; @@ -123,13 +125,17 @@ public class ScreenRenderer implements BlockEntityRenderer { Tesselator tesselator = Tesselator.getInstance(); BufferBuilder builder = tesselator.getBuilder(); //TODO: Use tesselator + RenderSystem.enableDepthTest(); + RenderSystem.setShader(GameRenderer::getPositionTexColorShader); RenderSystem._setShaderTexture(0, scr.browser.getTextureID()); - builder.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_COLOR_TEX); - builder.vertex(poseStack.last().pose(),-sw, -sh, 0.505f).color(1.f, 1.f, 1.f, 1.f).uv(0.f, 1.f).endVertex(); - builder.vertex(poseStack.last().pose(), sw, -sh, 0.505f).color(1.f, 1.f, 1.f, 1.f).uv(1.f, 1.f).endVertex(); - builder.vertex(poseStack.last().pose(), sw, sh, 0.505f).color(1.f, 1.f, 1.f, 1.f).uv(1.f, 0.f).endVertex(); - builder.vertex(poseStack.last().pose(),-sw, sh, 0.505f).color(1.f, 1.f, 1.f, 1.f).uv(0.f, 0.f).endVertex(); + RenderSystem.setShaderColor(1.0f, 1.0f, 1.0f, 1.0f); + builder.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_TEX_COLOR); + builder.vertex(poseStack.last().pose(),-sw, -sh, 0.505f).uv(0.f, 1.f).color(1.f, 1.f, 1.f, 1.f).endVertex(); + builder.vertex(poseStack.last().pose(), sw, -sh, 0.505f).uv(1.f, 1.f).color(1.f, 1.f, 1.f, 1.f).endVertex(); + builder.vertex(poseStack.last().pose(), sw, sh, 0.505f).uv(1.f, 0.f).color(1.f, 1.f, 1.f, 1.f).endVertex(); + builder.vertex(poseStack.last().pose(),-sw, sh, 0.505f).uv(0.f, 0.f).color(1.f, 1.f, 1.f, 1.f).endVertex(); tesselator.end();//Minecraft does shit with mah texture otherwise... + RenderSystem.disableDepthTest(); poseStack.popPose(); } diff --git a/src/main/java/net/montoyo/wd/config/ModConfig.java b/src/main/java/net/montoyo/wd/config/ModConfig.java index 67f5d4e..a15e781 100644 --- a/src/main/java/net/montoyo/wd/config/ModConfig.java +++ b/src/main/java/net/montoyo/wd/config/ModConfig.java @@ -27,7 +27,7 @@ public class ModConfig implements ConfigData { public boolean hardRecipes = true; @ConfigEntry.Gui.Tooltip - public String homepage = "mod://webdisplays/main.html"; + public String homepage = "https://www.google.com"; @ConfigEntry.Gui.Tooltip public boolean disableOwnershipThief = false; diff --git a/src/main/java/net/montoyo/wd/mixins/MainMixin.java b/src/main/java/net/montoyo/wd/mixins/MainMixin.java deleted file mode 100644 index 7ed0542..0000000 --- a/src/main/java/net/montoyo/wd/mixins/MainMixin.java +++ /dev/null @@ -1,35 +0,0 @@ -package net.montoyo.wd.mixins; - -import net.minecraft.client.main.Main; -import org.apache.logging.log4j.Logger; -import org.lwjgl.system.Configuration; -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.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; - -import java.nio.file.Files; -import java.nio.file.Paths; - -@Mixin(value = Main.class, remap = false) -public class MainMixin { - - @Shadow - @Final - private static Logger LOGGER; - - @Inject(method = "main", at = @At("HEAD")) - private static void generations_initRenderdoc(CallbackInfo ci) { - if (true) { - Configuration.DEBUG_STREAM.set(System.err); - Configuration.DEBUG.set(true); - LOGGER.warn("Enabled LWJGL Debugging"); - if (Files.exists(Paths.get("C:/Program Files/RenderDoc/renderdoc.dll"))) { - System.load("C:/Program Files/RenderDoc/renderdoc.dll"); - LOGGER.warn("Loaded Render Debugging"); - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/webdisplays.mixin.json b/src/main/resources/webdisplays.mixin.json index db6b792..5c69d38 100644 --- a/src/main/resources/webdisplays.mixin.json +++ b/src/main/resources/webdisplays.mixin.json @@ -4,7 +4,6 @@ "package": "net.montoyo.wd.mixins", "compatibilityLevel": "JAVA_17", "mixins": [ - "MainMixin" ], "client": [ ],