From e2cbe1a66899ad92be1f91aab8edea830b72a057 Mon Sep 17 00:00:00 2001 From: Sea-Kerman Date: Fri, 8 Mar 2024 13:58:40 -0800 Subject: [PATCH] crg model tweaks --- .../crystal_resonance_generator.md | 2 +- .../CrystalResonanceGeneratorBlock.java | 36 +++++++++--------- .../appeng/init/client/InitRenderTypes.java | 1 + .../block/crystal_resonance_generator.json | 20 +++++----- .../block/{rtg_bottom.png => crg_bottom.png} | Bin .../{rtg_emissive.png => crg_emissive.png} | Bin ...ive.png.mcmeta => crg_emissive.png.mcmeta} | 0 .../block/{rtg_side.png => crg_side.png} | Bin .../block/{rtg_top.png => crg_top.png} | Bin 9 files changed, 30 insertions(+), 29 deletions(-) rename src/main/resources/assets/ae2/textures/block/{rtg_bottom.png => crg_bottom.png} (100%) rename src/main/resources/assets/ae2/textures/block/{rtg_emissive.png => crg_emissive.png} (100%) rename src/main/resources/assets/ae2/textures/block/{rtg_emissive.png.mcmeta => crg_emissive.png.mcmeta} (100%) rename src/main/resources/assets/ae2/textures/block/{rtg_side.png => crg_side.png} (100%) rename src/main/resources/assets/ae2/textures/block/{rtg_top.png => crg_top.png} (100%) diff --git a/guidebook/items-blocks-machines/crystal_resonance_generator.md b/guidebook/items-blocks-machines/crystal_resonance_generator.md index 98579ad77dc..f9b660ae1e2 100644 --- a/guidebook/items-blocks-machines/crystal_resonance_generator.md +++ b/guidebook/items-blocks-machines/crystal_resonance_generator.md @@ -5,7 +5,7 @@ navigation: icon: crystal_resonance_generator position: 110 categories: -- devices +- network infrastructure item_ids: - ae2:crystal_resonance_generator --- diff --git a/src/main/java/appeng/block/networking/CrystalResonanceGeneratorBlock.java b/src/main/java/appeng/block/networking/CrystalResonanceGeneratorBlock.java index fe37994661c..07780339773 100644 --- a/src/main/java/appeng/block/networking/CrystalResonanceGeneratorBlock.java +++ b/src/main/java/appeng/block/networking/CrystalResonanceGeneratorBlock.java @@ -97,40 +97,40 @@ private VoxelShape getVoxelShape(BlockState state) { switch (forward) { case DOWN -> { - minZ = minX = 3.0 / 16.0; - maxZ = maxX = 13.0 / 16.0; + minZ = minX = 2.0 / 16.0; + maxZ = maxX = 14.0 / 16.0; maxY = 1.0; - minY = 5.0 / 16.0; + minY = 1.0 / 16.0; } case EAST -> { - minZ = minY = 3.0 / 16.0; - maxZ = maxY = 13.0 / 16.0; - maxX = 11.0 / 16.0; + minZ = minY = 2.0 / 16.0; + maxZ = maxY = 14.0 / 16.0; + maxX = 15.0 / 16.0; minX = 0.0; } case NORTH -> { - minY = minX = 3.0 / 16.0; - maxY = maxX = 13.0 / 16.0; + minY = minX = 2.0 / 16.0; + maxY = maxX = 14.0 / 16.0; maxZ = 1.0; - minZ = 5.0 / 16.0; + minZ = 1.0 / 16.0; } case SOUTH -> { - minY = minX = 3.0 / 16.0; - maxY = maxX = 13.0 / 16.0; - maxZ = 11.0 / 16.0; + minY = minX = 2.0 / 16.0; + maxY = maxX = 14.0 / 16.0; + maxZ = 15.0 / 16.0; minZ = 0.0; } case UP -> { - minZ = minX = 3.0 / 16.0; - maxZ = maxX = 13.0 / 16.0; - maxY = 11.0 / 16.0; + minZ = minX = 2.0 / 16.0; + maxZ = maxX = 14.0 / 16.0; + maxY = 15.0 / 16.0; minY = 0.0; } case WEST -> { - minZ = minY = 3.0 / 16.0; - maxZ = maxY = 13.0 / 16.0; + minZ = minY = 2.0 / 16.0; + maxZ = maxY = 14.0 / 16.0; maxX = 1.0; - minX = 5.0 / 16.0; + minX = 1.0 / 16.0; } default -> { } diff --git a/src/main/java/appeng/init/client/InitRenderTypes.java b/src/main/java/appeng/init/client/InitRenderTypes.java index bda3b09ef59..f3250888628 100644 --- a/src/main/java/appeng/init/client/InitRenderTypes.java +++ b/src/main/java/appeng/init/client/InitRenderTypes.java @@ -64,6 +64,7 @@ public final class InitRenderTypes { AEBlocks.QUARTZ_CLUSTER, AEBlocks.MYSTERIOUS_CUBE, AEBlocks.NOT_SO_MYSTERIOUS_CUBE, + AEBlocks.CRYSTAL_RESONANCE_GENERATOR, }; private InitRenderTypes() { diff --git a/src/main/resources/assets/ae2/models/block/crystal_resonance_generator.json b/src/main/resources/assets/ae2/models/block/crystal_resonance_generator.json index a854af077da..0aead836af1 100644 --- a/src/main/resources/assets/ae2/models/block/crystal_resonance_generator.json +++ b/src/main/resources/assets/ae2/models/block/crystal_resonance_generator.json @@ -2,11 +2,11 @@ "parent": "block/block", "credit": "Made with Blockbench by Sea_Kerman", "textures": { - "particle": "ae2:block/rtg_top", - "top": "ae2:block/rtg_top", - "bottom": "ae2:block/rtg_bottom", - "side": "ae2:block/rtg_side", - "core": "ae2:block/rtg_emissive" + "particle": "ae2:block/crg_side", + "top": "ae2:block/crg_top", + "bottom": "ae2:block/crg_bottom", + "side": "ae2:block/crg_side", + "core": "ae2:block/crg_emissive" }, "elements": [ { @@ -26,11 +26,11 @@ "from": [4, 4, 4], "to": [12, 16, 12], "faces": { - "north": { "uv": [8, 0, 16, 12], "texture": "#core" }, - "east": { "uv": [8, 0, 16, 12], "texture": "#core" }, - "south": { "uv": [8, 0, 16, 12], "texture": "#core" }, - "west": { "uv": [8, 0, 16, 12], "texture": "#core" }, - "up": { "uv": [0, 0, 8, 8], "texture": "#core", "cullface": "up" } + "north": { "uv": [8, 0, 16, 12], "texture": "#core", "unlit": true}, + "east": { "uv": [8, 0, 16, 12], "texture": "#core", "unlit": true}, + "south": { "uv": [8, 0, 16, 12], "texture": "#core", "unlit": true}, + "west": { "uv": [8, 0, 16, 12], "texture": "#core", "unlit": true}, + "up": { "uv": [0, 0, 8, 8], "texture": "#core", "cullface": "up", "unlit": true} } }, { diff --git a/src/main/resources/assets/ae2/textures/block/rtg_bottom.png b/src/main/resources/assets/ae2/textures/block/crg_bottom.png similarity index 100% rename from src/main/resources/assets/ae2/textures/block/rtg_bottom.png rename to src/main/resources/assets/ae2/textures/block/crg_bottom.png diff --git a/src/main/resources/assets/ae2/textures/block/rtg_emissive.png b/src/main/resources/assets/ae2/textures/block/crg_emissive.png similarity index 100% rename from src/main/resources/assets/ae2/textures/block/rtg_emissive.png rename to src/main/resources/assets/ae2/textures/block/crg_emissive.png diff --git a/src/main/resources/assets/ae2/textures/block/rtg_emissive.png.mcmeta b/src/main/resources/assets/ae2/textures/block/crg_emissive.png.mcmeta similarity index 100% rename from src/main/resources/assets/ae2/textures/block/rtg_emissive.png.mcmeta rename to src/main/resources/assets/ae2/textures/block/crg_emissive.png.mcmeta diff --git a/src/main/resources/assets/ae2/textures/block/rtg_side.png b/src/main/resources/assets/ae2/textures/block/crg_side.png similarity index 100% rename from src/main/resources/assets/ae2/textures/block/rtg_side.png rename to src/main/resources/assets/ae2/textures/block/crg_side.png diff --git a/src/main/resources/assets/ae2/textures/block/rtg_top.png b/src/main/resources/assets/ae2/textures/block/crg_top.png similarity index 100% rename from src/main/resources/assets/ae2/textures/block/rtg_top.png rename to src/main/resources/assets/ae2/textures/block/crg_top.png