5 Commits
v1.6.7 ... dev

7 changed files with 43 additions and 22 deletions

View File

@@ -4,7 +4,7 @@ import fr.altarik.CreateTag
plugins {
id "com.modrinth.minotaur" version "2.+"
id 'fabric-loom' version '1.6-SNAPSHOT'
id 'fabric-loom' version "${loom_version}"
id 'maven-publish'
}
@@ -36,9 +36,9 @@ base {
sourceSets {
main {
resources {
srcDirs += {
srcDirs += [
'src/generated'
}
]
}
}
}

View File

@@ -5,18 +5,19 @@ org.gradle.jvmargs=-Xmx1G
# check these on https://modmuss50.me/fabric.html
minecraft_version=1.20.4
yarn_mappings=1.20.4+build.3
loader_version=0.15.11
loader_version=0.17.2
# Mod Properties
modrinth_id = jCpoCBpn
mod_version = 1.6.7
mod_version = 1.6.9-SNAPSHOT
maven_group = fr.adrien1106
archives_base_name = ReFramed
mod_id = reframed
# Dependencies
# check this on https://modmuss50.me/fabric.html
fabric_version=0.97.0+1.20.4
fabric_version=0.97.3+1.20.4
loom_version=1.11-SNAPSHOT
git_owner=Altarik
git_repo=ReFramed

View File

@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME

View File

@@ -138,8 +138,8 @@ public class ReFramed implements ModInitializer {
.sounds(BlockSoundGroup.WOOD)
.hardness(0.2f)
.suffocates(Blocks::never)
.solidBlock(Blocks::always)
.blockVision(Blocks::always);
.solidBlock(Blocks::always);
// .blockVision(Blocks::always);
}
private static <I extends Item> I registerItem(String path, I item) {

View File

@@ -94,7 +94,7 @@ public class RenderHelper {
} catch (NullPointerException e) { // this can happen if mod haven't thought about inner faces
return true;
}
return !self_theme.isOpaque() || !other_theme.isOpaque();
return self_theme.isOpaque() != other_theme.isOpaque() && self_theme.isOpaque();
}
// Doing this method from scratch as it is simpler to do than injecting everywhere
@@ -141,7 +141,7 @@ public class RenderHelper {
if (self_theme.isSideInvisible(other_state, side)) return false;
// Opaque is also simple as each model are rendered one by one
if (other_state.isOpaque() && self.isSolid()) {
if (other_state.isOpaque()) {
// no cache section :( because it differs between each instance of the frame
VoxelShape self_shape = self_block.getShape(self_state, theme_index).getFace(side);
if (self_shape.isEmpty()) return true;

View File

@@ -1,17 +1,27 @@
{
"credit": "Made with Blockbench",
"textures": {
"particle": "#side"
},
"elements": [
{
"from": [0, 0, 0],
"from": [0, 0, 8],
"to": [8, 8, 16],
"faces": {
"north": {"uv": [8, 8, 16, 16], "texture": "#side", "cullface": "north"},
"south": {"uv": [0, 8, 8, 16], "texture": "#side", "cullface": "south"},
"west": {"uv": [0, 8, 16, 16], "texture": "#side", "cullface": "west"},
"up": {"uv": [0, 0, 8, 16], "texture": "#top"},
"down": {"uv": [0, 0, 8, 16], "texture": "#bottom", "cullface": "down"}
"west": {"uv": [8, 8, 16, 16], "texture": "#side", "cullface": "west"},
"up": {"uv": [0, 8, 8, 16], "texture": "#top"},
"down": {"uv": [0, 0, 8, 8], "texture": "#bottom", "cullface": "down"}
}
},
{
"from": [0, 0, 0],
"to": [8, 8, 8],
"faces": {
"north": {"uv": [8, 8, 16, 16], "texture": "#side", "cullface": "north"},
"west": {"uv": [0, 8, 8, 16], "texture": "#side", "cullface": "west"},
"up": {"uv": [0, 0, 8, 8], "texture": "#top"},
"down": {"uv": [0, 8, 8, 16], "texture": "#bottom", "cullface": "down"}
}
},
{

View File

@@ -1,16 +1,26 @@
{
"credit": "Made with Blockbench",
"textures": {
"particle": "#side"
},
"elements": [
{
"from": [8, 0, 0],
"from": [8, 8, 0],
"to": [16, 16, 8],
"faces": {
"north": {"uv": [0, 0, 8, 16], "texture": "#side", "cullface": "north"},
"east": {"uv": [8, 0, 16, 16], "texture": "#side", "cullface": "east"},
"west": {"uv": [0, 0, 8, 16], "texture": "#side"},
"up": {"uv": [8, 0, 16, 8], "texture": "#top", "cullface": "up"},
"north": {"uv": [0, 0, 8, 8], "texture": "#side", "cullface": "north"},
"east": {"uv": [8, 0, 16, 8], "texture": "#side", "cullface": "east"},
"west": {"uv": [0, 0, 8, 8], "texture": "#side"},
"up": {"uv": [8, 0, 16, 8], "texture": "#top", "cullface": "up"}
}
},
{
"from": [8, 0, 0],
"to": [16, 8, 8],
"faces": {
"north": {"uv": [0, 8, 8, 16], "texture": "#side", "cullface": "north"},
"east": {"uv": [8, 8, 16, 16], "texture": "#side", "cullface": "east"},
"west": {"uv": [0, 8, 8, 16], "texture": "#side"},
"down": {"uv": [8, 8, 16, 16], "texture": "#bottom", "cullface": "down"}
}
},
@@ -50,7 +60,7 @@
"name": "outer_stairs",
"origin": [8, 8, 8],
"color": 0,
"children": [0, 1, 2, 3]
"children": [0, 1, 2, 3, 4]
}
]
}