Skip to content

Commit

Permalink
fix: forge data
Browse files Browse the repository at this point in the history
  • Loading branch information
Zepalesque committed Jun 16, 2024
1 parent f6140fa commit 8f0d400
Show file tree
Hide file tree
Showing 23 changed files with 119 additions and 127 deletions.
8 changes: 0 additions & 8 deletions src/main/java/net/zepalesque/redux/pack/ReduxPackConfig.java
Original file line number Diff line number Diff line change
@@ -1,21 +1,13 @@
package net.zepalesque.redux.pack;

import com.google.common.collect.ImmutableMap;
import com.mojang.datafixers.util.Pair;
import net.minecraft.SharedConstants;
import net.minecraft.network.chat.Component;
import net.minecraft.server.packs.PackResources;
import net.minecraft.server.packs.PackType;
import net.minecraft.server.packs.PathPackResources;
import net.minecraft.server.packs.metadata.pack.PackMetadataSection;
import net.neoforged.fml.ModList;
import net.neoforged.neoforge.common.ModConfigSpec;
import net.zepalesque.redux.Redux;
import net.zepalesque.redux.config.ReduxConfig;

import java.nio.file.Path;
import java.util.HashMap;
import java.util.Map;
import java.util.function.Supplier;

public class ReduxPackConfig {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
"shade": false,
"rotation": {"angle": 45, "axis": "y", "origin": [8, 8, 8], "rescale": true},
"faces": {
"north": {"uv": [0, 0, 16, 16], "texture": "#cross", "forge_data": { "block_light": 15, "sky_light": 15 } },
"south": {"uv": [0, 0, 16, 16], "texture": "#cross", "forge_data": { "block_light": 15, "sky_light": 15 } }
"north": {"uv": [0, 0, 16, 16], "texture": "#cross", "neoforge_data": { "block_light": 15, "sky_light": 15 } },
"south": {"uv": [0, 0, 16, 16], "texture": "#cross", "neoforge_data": { "block_light": 15, "sky_light": 15 } }
}
},
{
Expand All @@ -23,8 +23,8 @@
"shade": false,
"rotation": {"angle": 45, "axis": "y", "origin": [8, 8, 8], "rescale": true},
"faces": {
"east": {"uv": [0, 0, 16, 16], "texture": "#cross", "forge_data": { "block_light": 15, "sky_light": 15 } },
"west": {"uv": [0, 0, 16, 16], "texture": "#cross", "forge_data": { "block_light": 15, "sky_light": 15 } }
"east": {"uv": [0, 0, 16, 16], "texture": "#cross", "neoforge_data": { "block_light": 15, "sky_light": 15 } },
"west": {"uv": [0, 0, 16, 16], "texture": "#cross", "neoforge_data": { "block_light": 15, "sky_light": 15 } }
}
}
]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
"shade": false,
"rotation": {"angle": 45, "axis": "y", "origin": [8, 8, 8], "rescale": true},
"faces": {
"north": {"uv": [0, 0, 16, 16], "texture": "#overlay", "forge_data": { "block_light": 15, "sky_light": 15 } },
"south": {"uv": [0, 0, 16, 16], "texture": "#overlay", "forge_data": { "block_light": 15, "sky_light": 15 } }
"north": {"uv": [0, 0, 16, 16], "texture": "#overlay", "neoforge_data": { "block_light": 15, "sky_light": 15 } },
"south": {"uv": [0, 0, 16, 16], "texture": "#overlay", "neoforge_data": { "block_light": 15, "sky_light": 15 } }
}
},
{
Expand All @@ -43,8 +43,8 @@
"shade": false,
"rotation": {"angle": 45, "axis": "y", "origin": [8, 8, 8], "rescale": true},
"faces": {
"east": {"uv": [0, 0, 16, 16], "texture": "#overlay", "forge_data": { "block_light": 15, "sky_light": 15 } },
"west": {"uv": [0, 0, 16, 16], "texture": "#overlay", "forge_data": { "block_light": 15, "sky_light": 15 } }
"east": {"uv": [0, 0, 16, 16], "texture": "#overlay", "neoforge_data": { "block_light": 15, "sky_light": 15 } },
"west": {"uv": [0, 0, 16, 16], "texture": "#overlay", "neoforge_data": { "block_light": 15, "sky_light": 15 } }
}
}
]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
"shade": false,
"rotation": {"angle": 45, "axis": "y", "origin": [8, 8, 8], "rescale": true},
"faces": {
"north": {"uv": [0, 0, 16, 16], "texture": "#glow", "forge_data": { "block_light": 15, "sky_light": 15 } },
"south": {"uv": [0, 0, 16, 16], "texture": "#glow", "forge_data": { "block_light": 15, "sky_light": 15 } }
"north": {"uv": [0, 0, 16, 16], "texture": "#glow", "neoforge_data": { "block_light": 15, "sky_light": 15 } },
"south": {"uv": [0, 0, 16, 16], "texture": "#glow", "neoforge_data": { "block_light": 15, "sky_light": 15 } }
}
},
{
Expand Down Expand Up @@ -54,8 +54,8 @@
"shade": false,
"rotation": {"angle": 45, "axis": "y", "origin": [8, 8, 8], "rescale": true},
"faces": {
"east": {"uv": [0, 0, 16, 16], "texture": "#glow", "forge_data": { "block_light": 15, "sky_light": 15 } },
"west": {"uv": [0, 0, 16, 16], "texture": "#glow", "forge_data": { "block_light": 15, "sky_light": 15 } }
"east": {"uv": [0, 0, 16, 16], "texture": "#glow", "neoforge_data": { "block_light": 15, "sky_light": 15 } },
"west": {"uv": [0, 0, 16, 16], "texture": "#glow", "neoforge_data": { "block_light": 15, "sky_light": 15 } }
}
},
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
"shade": false,
"rotation": {"angle": 45, "axis": "y", "origin": [8, 8, 8], "rescale": true},
"faces": {
"north": {"uv": [0, 0, 16, 16], "texture": "#overlay", "forge_data": { "block_light": 15, "sky_light": 15 } },
"south": {"uv": [0, 0, 16, 16], "texture": "#overlay", "forge_data": { "block_light": 15, "sky_light": 15 } }
"north": {"uv": [0, 0, 16, 16], "texture": "#overlay", "neoforge_data": { "block_light": 15, "sky_light": 15 } },
"south": {"uv": [0, 0, 16, 16], "texture": "#overlay", "neoforge_data": { "block_light": 15, "sky_light": 15 } }
}
},
{
Expand All @@ -43,8 +43,8 @@
"shade": false,
"rotation": {"angle": 45, "axis": "y", "origin": [8, 8, 8], "rescale": true},
"faces": {
"east": {"uv": [0, 0, 16, 16], "texture": "#overlay", "forge_data": { "block_light": 15, "sky_light": 15 } },
"west": {"uv": [0, 0, 16, 16], "texture": "#overlay", "forge_data": { "block_light": 15, "sky_light": 15 } }
"east": {"uv": [0, 0, 16, 16], "texture": "#overlay", "neoforge_data": { "block_light": 15, "sky_light": 15 } },
"west": {"uv": [0, 0, 16, 16], "texture": "#overlay", "neoforge_data": { "block_light": 15, "sky_light": 15 } }
}
}
]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,12 +83,12 @@
"to": [8, 16, 13.4],
"rotation": {"angle": 45, "axis": "y", "origin": [8, 8, 8], "rescale": true},
"faces": {
"north": {"uv": [0, 0, 16, 16], "texture": "#overlay", "forge_data": { "block_light": 15, "sky_light": 15 } },
"east": {"uv": [0, 0, 16, 16], "texture": "#overlay", "forge_data": { "block_light": 15, "sky_light": 15 } },
"south": {"uv": [0, 0, 16, 16], "texture": "#overlay", "forge_data": { "block_light": 15, "sky_light": 15 } },
"west": {"uv": [0, 0, 16, 16], "texture": "#overlay", "forge_data": { "block_light": 15, "sky_light": 15 } },
"up": {"uv": [0, 0, 16, 16], "texture": "#overlay", "forge_data": { "block_light": 15, "sky_light": 15 } },
"down": {"uv": [0, 0, 16, 16], "texture": "#overlay", "forge_data": { "block_light": 15, "sky_light": 15 } }
"north": {"uv": [0, 0, 16, 16], "texture": "#overlay", "neoforge_data": { "block_light": 15, "sky_light": 15 } },
"east": {"uv": [0, 0, 16, 16], "texture": "#overlay", "neoforge_data": { "block_light": 15, "sky_light": 15 } },
"south": {"uv": [0, 0, 16, 16], "texture": "#overlay", "neoforge_data": { "block_light": 15, "sky_light": 15 } },
"west": {"uv": [0, 0, 16, 16], "texture": "#overlay", "neoforge_data": { "block_light": 15, "sky_light": 15 } },
"up": {"uv": [0, 0, 16, 16], "texture": "#overlay", "neoforge_data": { "block_light": 15, "sky_light": 15 } },
"down": {"uv": [0, 0, 16, 16], "texture": "#overlay", "neoforge_data": { "block_light": 15, "sky_light": 15 } }
}
},
{
Expand All @@ -97,12 +97,12 @@
"to": [13.4, 16, 8],
"rotation": {"angle": 45, "axis": "y", "origin": [8, 8, 8], "rescale": true},
"faces": {
"north": {"uv": [0, 0, 16, 16], "texture": "#overlay", "forge_data": { "block_light": 15, "sky_light": 15 } },
"east": {"uv": [0, 0, 16, 16], "texture": "#overlay", "forge_data": { "block_light": 15, "sky_light": 15 } },
"south": {"uv": [0, 0, 16, 16], "texture": "#overlay", "forge_data": { "block_light": 15, "sky_light": 15 } },
"west": {"uv": [0, 0, 16, 16], "texture": "#overlay", "forge_data": { "block_light": 15, "sky_light": 15 } },
"up": {"uv": [0, 0, 16, 16], "texture": "#overlay", "forge_data": { "block_light": 15, "sky_light": 15 } },
"down": {"uv": [0, 0, 16, 16], "texture": "#overlay", "forge_data": { "block_light": 15, "sky_light": 15 } }
"north": {"uv": [0, 0, 16, 16], "texture": "#overlay", "neoforge_data": { "block_light": 15, "sky_light": 15 } },
"east": {"uv": [0, 0, 16, 16], "texture": "#overlay", "neoforge_data": { "block_light": 15, "sky_light": 15 } },
"south": {"uv": [0, 0, 16, 16], "texture": "#overlay", "neoforge_data": { "block_light": 15, "sky_light": 15 } },
"west": {"uv": [0, 0, 16, 16], "texture": "#overlay", "neoforge_data": { "block_light": 15, "sky_light": 15 } },
"up": {"uv": [0, 0, 16, 16], "texture": "#overlay", "neoforge_data": { "block_light": 15, "sky_light": 15 } },
"down": {"uv": [0, 0, 16, 16], "texture": "#overlay", "neoforge_data": { "block_light": 15, "sky_light": 15 } }
}
}
]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,16 +73,16 @@
"to": [ 13.4, 16, 8 ],
"rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true },
"faces": {
"north": { "uv": [ 0, 0, 16, 16 ], "texture": "#glow", "forge_data": { "block_light": 15, "sky_light": 15 } },
"south": { "uv": [ 0, 0, 16, 16 ], "texture": "#glow", "forge_data": { "block_light": 15, "sky_light": 15 } }
"north": { "uv": [ 0, 0, 16, 16 ], "texture": "#glow", "neoforge_data": { "block_light": 15, "sky_light": 15 } },
"south": { "uv": [ 0, 0, 16, 16 ], "texture": "#glow", "neoforge_data": { "block_light": 15, "sky_light": 15 } }
}
},
{ "from": [ 8, 4, 2.6 ],
"to": [ 8, 16, 13.4 ],
"rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true },
"faces": {
"west": { "uv": [ 0, 0, 16, 16 ], "texture": "#glow", "forge_data": { "block_light": 15, "sky_light": 15 } },
"east": { "uv": [ 0, 0, 16, 16 ], "texture": "#glow", "forge_data": { "block_light": 15, "sky_light": 15 } }
"west": { "uv": [ 0, 0, 16, 16 ], "texture": "#glow", "neoforge_data": { "block_light": 15, "sky_light": 15 } },
"east": { "uv": [ 0, 0, 16, 16 ], "texture": "#glow", "neoforge_data": { "block_light": 15, "sky_light": 15 } }
}
},
{ "from": [ 2.6, 4, 8 ],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,16 +73,16 @@
"to": [ 13.4, 16, 8 ],
"rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true },
"faces": {
"north": { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay", "forge_data": { "block_light": 15, "sky_light": 15 } },
"south": { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay", "forge_data": { "block_light": 15, "sky_light": 15 } }
"north": { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay", "neoforge_data": { "block_light": 15, "sky_light": 15 } },
"south": { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay", "neoforge_data": { "block_light": 15, "sky_light": 15 } }
}
},
{ "from": [ 8, 4, 2.6 ],
"to": [ 8, 16, 13.4 ],
"rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true },
"faces": {
"west": { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay", "forge_data": { "block_light": 15, "sky_light": 15 } },
"east": { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay", "forge_data": { "block_light": 15, "sky_light": 15 } }
"west": { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay", "neoforge_data": { "block_light": 15, "sky_light": 15 } },
"east": { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay", "neoforge_data": { "block_light": 15, "sky_light": 15 } }
}
}
]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
"shade": false,
"rotation": {"angle": 45, "axis": "y", "origin": [8, 8, 8], "rescale": true},
"faces": {
"north": {"uv": [0, 0, 16, 16], "texture": "#cross", "forge_data": { "block_light": 15, "sky_light": 15 } },
"south": {"uv": [0, 0, 16, 16], "texture": "#cross", "forge_data": { "block_light": 15, "sky_light": 15 } }
"north": {"uv": [0, 0, 16, 16], "texture": "#cross", "neoforge_data": { "block_light": 15, "sky_light": 15 } },
"south": {"uv": [0, 0, 16, 16], "texture": "#cross", "neoforge_data": { "block_light": 15, "sky_light": 15 } }
}
},
{
Expand All @@ -23,8 +23,8 @@
"shade": false,
"rotation": {"angle": 45, "axis": "y", "origin": [8, 8, 8], "rescale": true},
"faces": {
"east": {"uv": [0, 0, 16, 16], "texture": "#cross", "forge_data": { "block_light": 15, "sky_light": 15 } },
"west": {"uv": [0, 0, 16, 16], "texture": "#cross", "forge_data": { "block_light": 15, "sky_light": 15 } }
"east": {"uv": [0, 0, 16, 16], "texture": "#cross", "neoforge_data": { "block_light": 15, "sky_light": 15 } },
"west": {"uv": [0, 0, 16, 16], "texture": "#cross", "neoforge_data": { "block_light": 15, "sky_light": 15 } }
}
}
]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
"shade": false,
"rotation": {"angle": 45, "axis": "y", "origin": [8, 8, 8], "rescale": true},
"faces": {
"north": {"uv": [0, 0, 16, 16], "texture": "#overlay", "forge_data": { "block_light": 15, "sky_light": 15 } },
"south": {"uv": [0, 0, 16, 16], "texture": "#overlay", "forge_data": { "block_light": 15, "sky_light": 15 } }
"north": {"uv": [0, 0, 16, 16], "texture": "#overlay", "neoforge_data": { "block_light": 15, "sky_light": 15 } },
"south": {"uv": [0, 0, 16, 16], "texture": "#overlay", "neoforge_data": { "block_light": 15, "sky_light": 15 } }
}
},
{
Expand All @@ -43,8 +43,8 @@
"shade": false,
"rotation": {"angle": 45, "axis": "y", "origin": [8, 8, 8], "rescale": true},
"faces": {
"east": {"uv": [0, 0, 16, 16], "texture": "#overlay", "forge_data": { "block_light": 15, "sky_light": 15 } },
"west": {"uv": [0, 0, 16, 16], "texture": "#overlay", "forge_data": { "block_light": 15, "sky_light": 15 } }
"east": {"uv": [0, 0, 16, 16], "texture": "#overlay", "neoforge_data": { "block_light": 15, "sky_light": 15 } },
"west": {"uv": [0, 0, 16, 16], "texture": "#overlay", "neoforge_data": { "block_light": 15, "sky_light": 15 } }
}
}
]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
"shade": false,
"rotation": {"angle": 45, "axis": "y", "origin": [8, 8, 8], "rescale": true},
"faces": {
"north": {"uv": [0, 0, 16, 16], "texture": "#glow", "forge_data": { "block_light": 15, "sky_light": 15 } },
"south": {"uv": [0, 0, 16, 16], "texture": "#glow", "forge_data": { "block_light": 15, "sky_light": 15 } }
"north": {"uv": [0, 0, 16, 16], "texture": "#glow", "neoforge_data": { "block_light": 15, "sky_light": 15 } },
"south": {"uv": [0, 0, 16, 16], "texture": "#glow", "neoforge_data": { "block_light": 15, "sky_light": 15 } }
}
},
{
Expand Down Expand Up @@ -54,8 +54,8 @@
"shade": false,
"rotation": {"angle": 45, "axis": "y", "origin": [8, 8, 8], "rescale": true},
"faces": {
"east": {"uv": [0, 0, 16, 16], "texture": "#glow", "forge_data": { "block_light": 15, "sky_light": 15 } },
"west": {"uv": [0, 0, 16, 16], "texture": "#glow", "forge_data": { "block_light": 15, "sky_light": 15 } }
"east": {"uv": [0, 0, 16, 16], "texture": "#glow", "neoforge_data": { "block_light": 15, "sky_light": 15 } },
"west": {"uv": [0, 0, 16, 16], "texture": "#glow", "neoforge_data": { "block_light": 15, "sky_light": 15 } }
}
},
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
"shade": false,
"rotation": {"angle": 45, "axis": "y", "origin": [8, 8, 8], "rescale": true},
"faces": {
"north": {"uv": [0, 0, 16, 16], "texture": "#glow", "forge_data": { "block_light": 15, "sky_light": 15 } },
"south": {"uv": [0, 0, 16, 16], "texture": "#glow", "forge_data": { "block_light": 15, "sky_light": 15 } }
"north": {"uv": [0, 0, 16, 16], "texture": "#glow", "neoforge_data": { "block_light": 15, "sky_light": 15 } },
"south": {"uv": [0, 0, 16, 16], "texture": "#glow", "neoforge_data": { "block_light": 15, "sky_light": 15 } }
}
},
{
Expand Down Expand Up @@ -54,8 +54,8 @@
"shade": false,
"rotation": {"angle": 45, "axis": "y", "origin": [8, 8, 8], "rescale": true},
"faces": {
"east": {"uv": [0, 0, 16, 16], "texture": "#glow", "forge_data": { "block_light": 15, "sky_light": 15 } },
"west": {"uv": [0, 0, 16, 16], "texture": "#glow", "forge_data": { "block_light": 15, "sky_light": 15 } }
"east": {"uv": [0, 0, 16, 16], "texture": "#glow", "neoforge_data": { "block_light": 15, "sky_light": 15 } },
"west": {"uv": [0, 0, 16, 16], "texture": "#glow", "neoforge_data": { "block_light": 15, "sky_light": 15 } }
}
},
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
"shade": false,
"rotation": {"angle": 45, "axis": "y", "origin": [8, 8, 8], "rescale": true},
"faces": {
"north": {"uv": [0, 0, 16, 16], "texture": "#overlay", "forge_data": { "block_light": 15, "sky_light": 15 } },
"south": {"uv": [0, 0, 16, 16], "texture": "#overlay", "forge_data": { "block_light": 15, "sky_light": 15 } }
"north": {"uv": [0, 0, 16, 16], "texture": "#overlay", "neoforge_data": { "block_light": 15, "sky_light": 15 } },
"south": {"uv": [0, 0, 16, 16], "texture": "#overlay", "neoforge_data": { "block_light": 15, "sky_light": 15 } }
}
},
{
Expand All @@ -43,8 +43,8 @@
"shade": false,
"rotation": {"angle": 45, "axis": "y", "origin": [8, 8, 8], "rescale": true},
"faces": {
"east": {"uv": [0, 0, 16, 16], "texture": "#overlay", "forge_data": { "block_light": 15, "sky_light": 15 } },
"west": {"uv": [0, 0, 16, 16], "texture": "#overlay", "forge_data": { "block_light": 15, "sky_light": 15 } }
"east": {"uv": [0, 0, 16, 16], "texture": "#overlay", "neoforge_data": { "block_light": 15, "sky_light": 15 } },
"west": {"uv": [0, 0, 16, 16], "texture": "#overlay", "neoforge_data": { "block_light": 15, "sky_light": 15 } }
}
}
]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@
{ "from": [ 0, 0, 0 ],
"to": [ 16, 16, 16 ],
"faces": {
"down": { "texture": "#down_glow", "cullface": "down", "forge_data": { "block_light": 15, "sky_light": 15 } },
"up": { "texture": "#up_glow", "rotation": 180, "cullface": "up", "forge_data": { "block_light": 15, "sky_light": 15 } },
"north": { "texture": "#north_glow", "cullface": "north", "forge_data": { "block_light": 15, "sky_light": 15 } },
"south": { "texture": "#south_glow", "cullface": "south", "forge_data": { "block_light": 15, "sky_light": 15 } },
"west": { "texture": "#west_glow", "cullface": "west", "forge_data": { "block_light": 15, "sky_light": 15 } },
"east": { "texture": "#east_glow", "cullface": "east", "forge_data": { "block_light": 15, "sky_light": 15 } }
"down": { "texture": "#down_glow", "cullface": "down", "neoforge_data": { "block_light": 15, "sky_light": 15 } },
"up": { "texture": "#up_glow", "rotation": 180, "cullface": "up", "neoforge_data": { "block_light": 15, "sky_light": 15 } },
"north": { "texture": "#north_glow", "cullface": "north", "neoforge_data": { "block_light": 15, "sky_light": 15 } },
"south": { "texture": "#south_glow", "cullface": "south", "neoforge_data": { "block_light": 15, "sky_light": 15 } },
"west": { "texture": "#west_glow", "cullface": "west", "neoforge_data": { "block_light": 15, "sky_light": 15 } },
"east": { "texture": "#east_glow", "cullface": "east", "neoforge_data": { "block_light": 15, "sky_light": 15 } }
}
}
],
Expand Down
Loading

0 comments on commit 8f0d400

Please sign in to comment.