diff --git a/src/main/java/net/montoyo/wd/client/ClientProxy.java b/src/main/java/net/montoyo/wd/client/ClientProxy.java index b6a739f..b4f3705 100644 --- a/src/main/java/net/montoyo/wd/client/ClientProxy.java +++ b/src/main/java/net/montoyo/wd/client/ClientProxy.java @@ -596,18 +596,6 @@ public class ClientProxy extends SharedProxy implements CefDisplayHandler/*, IJS /**************************************** EVENT METHODS ****************************************/ - @SubscribeEvent - public void onStitchTextures(TextureStitchEvent ev) { - TextureAtlas texMap = ev.getAtlas(); - - if (texMap.location().equals(TextureAtlas.LOCATION_BLOCKS)) { - for (Material materialsSide : ScreenModelLoader.MATERIALS_SIDES) { - // TODO: what? -// texMap.addSprite(materialsSide.texture()); - } - } - } - // @SubscribeEvent // public void onBakeModel(ModelBakeEvent ev) { // for(ResourceModelPair pair : modelBakers) diff --git a/src/main/java/net/montoyo/wd/client/renderers/ScreenModelLoader.java b/src/main/java/net/montoyo/wd/client/renderers/ScreenModelLoader.java index cd456ae..abf57dc 100644 --- a/src/main/java/net/montoyo/wd/client/renderers/ScreenModelLoader.java +++ b/src/main/java/net/montoyo/wd/client/renderers/ScreenModelLoader.java @@ -21,7 +21,7 @@ import java.util.function.Function; public class ScreenModelLoader implements IGeometryLoader { public static final ResourceLocation SCREEN_LOADER = new ResourceLocation("webdisplays", "screen_loader"); - public static final ResourceLocation SCREEN_SIDE = new ResourceLocation("webdisplays", "blocks/screen"); + public static final ResourceLocation SCREEN_SIDE = new ResourceLocation("webdisplays", "block/screen"); private static final ResourceLocation[] SIDES = new ResourceLocation[16]; public static final Material[] MATERIALS_SIDES = new Material[16]; diff --git a/src/main/resources/assets/minecraft/atlases/blocks.json b/src/main/resources/assets/minecraft/atlases/blocks.json deleted file mode 100644 index 19f2c74..0000000 --- a/src/main/resources/assets/minecraft/atlases/blocks.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "sources": [ - { - "type": "single", - "resource": "block/screen0" - } - ] -}