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

revert beep commit

Browse Source
This commit is contained in:
Mysticpasta1 2023-03-05 17:01:56 -06:00
parent 99187b3081
commit 83e0094a56
4 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build.gradle
View File

@ -12,7 +12,7 @@ java.toolchain.languageVersion = JavaLanguageVersion.of(17)
println('Java: ' + System.getProperty('java.version') + ' JVM: ' + System.getProperty('java.vm.version') + '(' + System.getProperty('java.vendor') + ') Arch: ' + System.getProperty('os.arch')) println('Java: ' + System.getProperty('java.version') + ' JVM: ' + System.getProperty('java.vm.version') + '(' + System.getProperty('java.vendor') + ') Arch: ' + System.getProperty('os.arch'))
minecraft { minecraft {
mappings channel: 'official', version: '1.19.2' mappings channel: 'official', version: '1.19'
accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg') accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')
@ -74,7 +74,7 @@ repositories{
dependencies { dependencies {
minecraft 'net.minecraftforge:forge:1.19.2-43.2.6' minecraft 'net.minecraftforge:forge:1.19.2-43.2.6'
annotationProcessor 'org.spongepowered:mixin:0.8.5:processor' annotationProcessor 'org.spongepowered:mixin:0.8.5:processor'
implementation fg.deobf("com.github.Mysticpasta1:mcef-forge:107b3b848a") implementation fg.deobf("com.github.Mysticpasta1:mcef-forge:107b3b848a")
implementation fg.deobf("curse.maven:cloth_config_forge-348521:3972423") implementation fg.deobf("curse.maven:cloth_config_forge-348521:3972423")
implementation fg.deobf("curse.maven:SU-370704:4410614") implementation fg.deobf("curse.maven:SU-370704:4410614")

3
src/main/java/net/montoyo/wd/SharedProxy.java
View File

@ -27,6 +27,9 @@ public class SharedProxy {
public void init() { public void init() {
} }
public void postInit() {
}
public Level getWorld(ResourceKey<Level> dim) { public Level getWorld(ResourceKey<Level> dim) {
return getServer().getLevel(dim); return getServer().getLevel(dim);
} }

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

@ -171,9 +171,11 @@ public class WebDisplays {
MinecraftForge.EVENT_BUS.register(this); MinecraftForge.EVENT_BUS.register(this);
//Other things //Other things
PROXY.init(); PROXY.init();
PROXY.postInit();
hasOC = ModList.get().isLoaded("opencomputers"); hasOC = ModList.get().isLoaded("opencomputers");
hasCC = ModList.get().isLoaded("computercraft"); hasCC = ModList.get().isLoaded("computercraft");

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

@ -95,8 +95,7 @@ public class ClientProxy extends SharedProxy implements IDisplayHandler, IJSQuer
} }
private Minecraft mc = Minecraft.getInstance(); private Minecraft mc;
private net.montoyo.mcef.api.API mcef; private net.montoyo.mcef.api.API mcef;
private MinePadRenderer minePadRenderer; private MinePadRenderer minePadRenderer;
private JSQueryDispatcher jsDispatcher; private JSQueryDispatcher jsDispatcher;
@ -129,9 +128,8 @@ public class ClientProxy extends SharedProxy implements IDisplayHandler, IJSQuer
/**************************************** INHERITED METHODS ****************************************/ /**************************************** INHERITED METHODS ****************************************/
@SubscribeEvent @SubscribeEvent
public void onClientSetup(FMLClientSetupEvent event) { public static void onClientSetup(FMLClientSetupEvent event) {
BlockEntityRenderers.register(TileInit.SCREEN_BLOCK_ENTITY.get(), new ScreenRenderer.ScreenRendererProvider()); BlockEntityRenderers.register(TileInit.SCREEN_BLOCK_ENTITY.get(), new ScreenRenderer.ScreenRendererProvider());
((ReloadableResourceManager) Minecraft.getInstance().getResourceManager()).registerReloadListener(this);
} }
@SubscribeEvent @SubscribeEvent
@ -146,6 +144,7 @@ public class ClientProxy extends SharedProxy implements IDisplayHandler, IJSQuer
@Override @Override
public void preInit() { public void preInit() {
mc = Minecraft.getInstance();
MinecraftForge.EVENT_BUS.register(this); MinecraftForge.EVENT_BUS.register(this);
mcef = MCEFApi.getAPI(); mcef = MCEFApi.getAPI();
if(mcef != null) if(mcef != null)
@ -166,6 +165,11 @@ public class ClientProxy extends SharedProxy implements IDisplayHandler, IJSQuer
findAdvancementToProgressField(); findAdvancementToProgressField();
} }
@Override
public void postInit() {
((ReloadableResourceManager) mc.getResourceManager()).registerReloadListener(this);
}
@Override @Override
public Level getWorld(ResourceKey<Level> dim) { public Level getWorld(ResourceKey<Level> dim) {
Level ret = mc.level; Level ret = mc.level;