Leisuretimedock/webdisplays
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

screen is working finally

Browse Source
This commit is contained in:
Mysticpasta1 2022-06-29 17:53:44 -05:00
parent e4df9322bc
commit 1e6dc60724
8 changed files with 23 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -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.

12
src/main/java/net/montoyo/wd/client/ClientProxy.java
View File

@ -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<Level> dim) {
Level ret = mc.level;

2
src/main/java/net/montoyo/wd/client/gui/GuiMinePad.java
View File

@ -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();

4
src/main/java/net/montoyo/wd/client/renderers/MinePadRenderer.java
View File

@ -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);
}
}

16
src/main/java/net/montoyo/wd/client/renderers/ScreenRenderer.java
View File

@ -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<TileEntityScreen> {
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();
}

2
src/main/java/net/montoyo/wd/config/ModConfig.java
View File

@ -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;

35
src/main/java/net/montoyo/wd/mixins/MainMixin.java
View File

@ -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");
}
}
}
}

1
src/main/resources/webdisplays.mixin.json
View File

@ -4,7 +4,6 @@
"package": "net.montoyo.wd.mixins",
"compatibilityLevel": "JAVA_17",
"mixins": [
"MainMixin"
],
"client": [
],