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

things are just barely able to be considered as working

Browse Source
This commit is contained in:
GiantLuigi4 2023-09-22 15:40:17 -04:00
parent 0867dd68d7
commit 2c931928d8
11 changed files with 6 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/net/montoyo/wd/WebDisplays.java
View File

@ -66,14 +66,7 @@ public class WebDisplays {
public static SharedProxy PROXY = null;
public static final boolean cursorSupport;
static {
ArtifactVersion ver = ModList.get().getModFileById("forgecef").getMods().get(0).getVersion();
cursorSupport = (ver.getMajorVersion() >= 1 && ver.getMinorVersion() >= 2 && ver.getIncrementalVersion() >= 4);
}
// public static WDCreativeTab CREATIVE_TAB;
// public static ceativeTab CREATIVE_TAB;
public static final ResourceLocation ADV_PAD_BREAK = new ResourceLocation("webdisplays", "webdisplays/pad_break");
public static final String BLACKLIST_URL = "mod://webdisplays/blacklisted.html";
public static final Gson GSON = new Gson();

4
src/main/java/net/montoyo/wd/client/gui/GuiServer.java
View File

@ -103,7 +103,6 @@ public class GuiServer extends WDScreen {
int y = (height - 176) / 2;
// RenderSystem.enableTexture();
GL11.glEnable(GL11.GL_TEXTURE_2D);
RenderSystem.setShaderTexture(0, BG_IMAGE);
RenderSystem.setShaderColor(1.0f, 1.0f, 1.0f, 1.0f);
// blit(poseStack, x, y, 0, 0, 256, 176);
@ -134,7 +133,6 @@ public class GuiServer extends WDScreen {
drawWhiteQuad(x + 1, y, 6, 8);
// RenderSystem.enableTexture();
GL11.glEnable(GL11.GL_TEXTURE_2D);
RenderSystem.enableBlend();
RenderSystem.blendFunc(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA);
RenderSystem.setShaderTexture(0, FG_IMAGE);
@ -150,7 +148,6 @@ public class GuiServer extends WDScreen {
float zd = (float) getBlitOffset();
// RenderSystem.disableTexture();
GL11.glDisable(GL11.GL_TEXTURE_2D);
RenderSystem.setShaderColor(1.0f, 1.0f, 1.0f, 1.0f);
Tesselator t = Tesselator.getInstance();
BufferBuilder bb = t.getBuilder();
@ -160,7 +157,6 @@ public class GuiServer extends WDScreen {
bb.vertex(xd2, yd, zd).endVertex();
bb.vertex(xd, yd, zd).endVertex();
t.end();
GL11.glEnable(GL11.GL_TEXTURE_2D);
// RenderSystem.enableTexture();
}

4
src/main/java/net/montoyo/wd/client/gui/controls/Control.java
View File

@ -121,7 +121,6 @@ public abstract class Control {
RenderSystem.setShaderColor(((float) r) / 255.f, ((float) g) / 255.f, ((float) b) / 255.f, ((float) a) / 255.f);
// RenderSystem.disableTexture();
glDisable(GL_TEXTURE_2D);
RenderSystem.enableBlend();
RenderSystem.blendFunc(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA);
@ -134,7 +133,6 @@ public abstract class Control {
RenderSystem.disableBlend();
// RenderSystem.enableTexture();
glEnable(GL_TEXTURE_2D);
}
public void fillTexturedRect(PoseStack poseStack, int x, int y, int w, int h, double u1, double v1, double u2, double v2) {
@ -182,7 +180,6 @@ public abstract class Control {
RenderSystem.setShaderColor(((float) r) / 255.f, ((float) g) / 255.f, ((float) b) / 255.f, ((float) a) / 255.f);
// RenderSystem.enableTexture();
glEnable(GL_TEXTURE_2D);
RenderSystem.enableBlend();
RenderSystem.blendFunc(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA);
@ -214,7 +211,6 @@ public abstract class Control {
RenderSystem.disableBlend();
// RenderSystem.enableTexture();
glEnable(GL_TEXTURE_2D);
}
public PoseStack beginFramebuffer(RenderTarget fbo, float vpW, float vpH) {

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

@ -103,7 +103,6 @@ public class ControlGroup extends Container {
poseStack.pose().pushPose();
RenderSystem.setShaderColor(0.5f, 0.5f, 0.5f, 1.f);
// RenderSystem.disableTexture();
GL11.glDisable(GL_TEXTURE_2D);
RenderSystem.enableBlend();
RenderSystem.blendFunc(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA);
@ -163,7 +162,6 @@ public class ControlGroup extends Container {
RenderSystem.disableBlend();
// RenderSystem.enableTexture();
GL11.glEnable(GL_TEXTURE_2D);
poseStack.pose().popPose();
// if(labelW != 0)

1
src/main/java/net/montoyo/wd/client/gui/controls/Icon.java
View File

@ -50,7 +50,6 @@ public class Icon extends BasicControl {
if(texture != null) {
poseStack.pose().pushPose();
// RenderSystem.enableTexture();
GL11.glEnable(GL11.GL_TEXTURE_2D);
RenderSystem.setShaderTexture(1, texture);
RenderSystem.bindTexture(1);
RenderSystem.enableBlend();

2
src/main/java/net/montoyo/wd/client/renderers/LaserPointerRenderer.java
View File

@ -48,7 +48,6 @@ public final class LaserPointerRenderer implements IItemRenderer {
public boolean render(PoseStack poseStack, ItemStack is, float handSideSign, float swingProgress, float equipProgress, MultiBufferSource multiBufferSource, int packedLight) {
RenderSystem.disableCull();
// RenderSystem.disableTexture();
GL11.glDisable(GL11.GL_TEXTURE_2D);
RenderSystem.enableDepthTest();
RenderSystem.enableBlend();
@ -102,7 +101,6 @@ public final class LaserPointerRenderer implements IItemRenderer {
RenderSystem.disableBlend();
RenderSystem.disableDepthTest();
// RenderSystem.enableTexture(); //Fix for shitty minecraft fire
GL11.glEnable(GL11.GL_TEXTURE_2D);
RenderSystem.enableCull();
poseStack.popPose();

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

@ -41,7 +41,6 @@ public class ScreenRenderer implements BlockEntityRenderer<TileEntityScreen> {
//Disable lighting
// RenderSystem.enableTexture();
GL11.glEnable(GL11.GL_TEXTURE_2D);
// RenderSystem.disableCull();
RenderSystem.disableBlend();

4
src/main/java/net/montoyo/wd/entity/TileEntityScreen.java
View File

@ -45,6 +45,7 @@ import net.montoyo.wd.net.client_bound.S2CMessageJSResponse;
import net.montoyo.wd.net.client_bound.S2CMessageScreenUpdate;
import net.montoyo.wd.utilities.*;
import org.cef.browser.CefBrowser;
import org.lwjgl.opengl.GL11;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
@ -232,8 +233,7 @@ public class TileEntityScreen extends BlockEntity {
else
mcefBrowser.resize(resolution.x, resolution.y);
if (WebDisplays.cursorSupport)
mcefBrowser.setCursorChangeListener((type) -> mouseType = type);
mcefBrowser.setCursorChangeListener((type) -> mouseType = type);
}
doTurnOnAnim = doAnim;

6
src/main/resources/META-INF/mods.toml
View File

@ -35,13 +35,13 @@ side="BOTH"
[[dependencies.webdisplays]]
modId="minecraft"
mandatory=true
versionRange="[1.19.2,1.19.3)"
versionRange="[1.20.1,)"
ordering="NONE"
side="BOTH"
[[dependencies.webdisplays]]
modId="forgecef"
modId="mcef"
mandatory=true
versionRange="[1.2.3, )"
versionRange="[1.20.1-2.4.17, )"
ordering="NONE"
side="BOTH"

34
src/main/resources/fabric.mod.json
View File

@ -1,34 +0,0 @@
{
"schemaVersion": 1,
"id": "webdisplays",
"version": "${version}",
"name": "Web Displays",
"description": "Web Displays for 1.19.2 fabric",
"authors": [
"Montoyo, Waterpicker, Mysticpasta1"
],
"contact": {
"homepage": "",
"sources": "https://github.com/Mysticpasta1/webdisplays"
},
"license": "Public Domain",
"environment": "*",
"entrypoints": {
"main": [
"net.montoyo.wd.WebDisplays"
]
},
"mixins": [
"webdisplays.mixins.json"
],
"depends": {
"fabricloader": ">=0.14.8",
"fabric": "*",
"minecraft": "~1.19.2",
"java": ">=17"
}
}

16
src/main/resources/mcmod.info
View File

@ -1,16 +0,0 @@
[
{
"modid": "webdisplays",
"name": "WebDisplays",
"description": "Web Screens! Yayyy!!",
"version": "${version}",
"mcversion": "${mcversion}",
"url": "https://montoyo.net/wd2.php",
"updateUrl": "",
"authorList": [ "montoyo" ],
"credits": "Thanks to sadreminderwindows for the Chinese translation. Thanks to binary1230 for the ComputerCraft support.",
"logoFile": "",
"screenshots": [],
"dependencies": []
}
]