diff --git a/src/main/java/ru/betterend/blocks/EndPortalBlock.java b/src/main/java/ru/betterend/blocks/EndPortalBlock.java index f13b0b0d..0af2e3af 100644 --- a/src/main/java/ru/betterend/blocks/EndPortalBlock.java +++ b/src/main/java/ru/betterend/blocks/EndPortalBlock.java @@ -43,7 +43,7 @@ public class EndPortalBlock extends NetherPortalBlock implements IRenderTypeable public static final IntProperty PORTAL = BlockProperties.PORTAL; public EndPortalBlock() { - super(FabricBlockSettings.copyOf(Blocks.NETHER_PORTAL).resistance(Blocks.BEDROCK.getBlastResistance()).luminance(state -> 12)); + super(FabricBlockSettings.copyOf(Blocks.NETHER_PORTAL).resistance(Blocks.BEDROCK.getBlastResistance()).luminance(15)); } @Override diff --git a/src/main/java/ru/betterend/world/generator/LayerOptions.java b/src/main/java/ru/betterend/world/generator/LayerOptions.java index 7995e4fd..ede1ecd9 100644 --- a/src/main/java/ru/betterend/world/generator/LayerOptions.java +++ b/src/main/java/ru/betterend/world/generator/LayerOptions.java @@ -33,7 +33,7 @@ public class LayerOptions { } private float clampCoverage(float value) { - return MathHelper.clamp(value, 0, 1) * 2 - 1; + return 0.9999F - MathHelper.clamp(value, 0, 1) * 2; } private int clampCenter(int value) { diff --git a/src/main/resources/assets/betterend/blockstates/end_portal_block.json b/src/main/resources/assets/betterend/blockstates/end_portal_block.json index 439c2b9d..a9d558f3 100644 --- a/src/main/resources/assets/betterend/blockstates/end_portal_block.json +++ b/src/main/resources/assets/betterend/blockstates/end_portal_block.json @@ -1,10 +1,6 @@ { "variants": { - "axis=x": { - "model": "betterend:block/end_portal_ax" - }, - "axis=z": { - "model": "betterend:block/end_portal_az" - } + "axis=x": { "model": "betterend:block/end_portal" }, + "axis=z": { "model": "betterend:block/end_portal", "y": 90 } } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/materialmaps/block/end_portal_block.json b/src/main/resources/assets/betterend/materialmaps/block/end_portal_block.json new file mode 100644 index 00000000..a72e6e79 --- /dev/null +++ b/src/main/resources/assets/betterend/materialmaps/block/end_portal_block.json @@ -0,0 +1,3 @@ +{ + "defaultMaterial": "betterend:glow_all" +} diff --git a/src/main/resources/assets/betterend/models/block/end_portal_ax.json b/src/main/resources/assets/betterend/models/block/end_portal.json similarity index 53% rename from src/main/resources/assets/betterend/models/block/end_portal_ax.json rename to src/main/resources/assets/betterend/models/block/end_portal.json index 8448f5c0..8cdabc6d 100644 --- a/src/main/resources/assets/betterend/models/block/end_portal_ax.json +++ b/src/main/resources/assets/betterend/models/block/end_portal.json @@ -8,8 +8,8 @@ "from": [ 0, 0, 6 ], "to": [ 16, 16, 10 ], "faces": { - "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#portal" }, - "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#portal" } + "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#portal", "tintindex": 0 }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#portal", "tintindex": 0 } } } ] diff --git a/src/main/resources/assets/betterend/models/block/end_portal_az.json b/src/main/resources/assets/betterend/models/block/end_portal_az.json deleted file mode 100644 index 35c5f76a..00000000 --- a/src/main/resources/assets/betterend/models/block/end_portal_az.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "textures": { - "particle": "betterend:block/end_portal", - "portal": "betterend:block/end_portal" - }, - "elements": [ - { - "from": [ 6, 0, 0 ], - "to": [ 10, 16, 16 ], - "faces": { - "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#portal" }, - "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#portal" } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/end_portal_grey.json b/src/main/resources/assets/betterend/models/block/end_portal_grey.json new file mode 100644 index 00000000..41f66eab --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/end_portal_grey.json @@ -0,0 +1,16 @@ +{ + "textures": { + "particle": "betterend:block/end_portal_grey", + "portal": "betterend:block/end_portal_grey" + }, + "elements": [ + { + "from": [ 0, 0, 6 ], + "to": [ 16, 16, 10 ], + "faces": { + "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#portal", "tintindex": 0 }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#portal", "tintindex": 0 } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/textures/block/end_portal.png b/src/main/resources/assets/betterend/textures/block/end_portal.png index 2e168bd1..4c79d3e2 100644 Binary files a/src/main/resources/assets/betterend/textures/block/end_portal.png and b/src/main/resources/assets/betterend/textures/block/end_portal.png differ diff --git a/src/main/resources/assets/betterend/textures/block/end_portal_grey.png b/src/main/resources/assets/betterend/textures/block/end_portal_grey.png new file mode 100644 index 00000000..c04fe031 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/end_portal_grey.png differ