diff --git a/gradle.properties b/gradle.properties index 613738eb8..e6103baec 100644 --- a/gradle.properties +++ b/gradle.properties @@ -19,7 +19,7 @@ aether_version=1.20.4-1.4.1-neoforge nitrogen_version=1.20.4-1.1.4-neoforge cumulus_version=1.20.4-1.0.1-neoforge curios_version=7.3.4 -zenith_version=1.0.12 +zenith_version=1.0.13 aeroblender_version=5271794 terrablender_version=1.20.4-3.3.0.12 terrablender_version_minimum=1.20.4-3.3.0.0 diff --git a/src/main/java/net/zepalesque/redux/block/natural/ReduxDoubleDropsWall.java b/src/main/java/net/zepalesque/redux/block/natural/ReduxDoubleDropsWall.java index 189ed907a..137728fda 100644 --- a/src/main/java/net/zepalesque/redux/block/natural/ReduxDoubleDropsWall.java +++ b/src/main/java/net/zepalesque/redux/block/natural/ReduxDoubleDropsWall.java @@ -31,20 +31,20 @@ protected void createBlockStateDefinition(StateDefinition.Builder shapeByIndex = wallBlockAccessor.redux$getShapeByIndex(); - shapeByIndex = fixShapeMap(shapeByIndex).build(); + shapeByIndex = fixShapeMap(shapeByIndex); wallBlockAccessor.redux$setShapeByIndex(shapeByIndex); Map collisionShapeByIndex = wallBlockAccessor.redux$getCollisionShapeByIndex(); - collisionShapeByIndex = fixShapeMap(collisionShapeByIndex).build(); + collisionShapeByIndex = fixShapeMap(collisionShapeByIndex); wallBlockAccessor.redux$setCollisionShapeByIndex(collisionShapeByIndex); } - protected ImmutableMap.Builder fixShapeMap(Map map) { + protected ImmutableMap fixShapeMap(Map map) { ImmutableMap.Builder builder = ImmutableMap.builder(); builder.putAll(map); for (BlockState state : map.keySet()) { builder.put(state.cycle(AetherBlockStateProperties.DOUBLE_DROPS), map.get(state)); } - return builder; + return builder.build(); } } \ No newline at end of file diff --git a/src/main/java/net/zepalesque/redux/block/natural/ReduxNaturalWall.java b/src/main/java/net/zepalesque/redux/block/natural/ReduxNaturalWall.java index c12a0e82c..e2573f21a 100644 --- a/src/main/java/net/zepalesque/redux/block/natural/ReduxNaturalWall.java +++ b/src/main/java/net/zepalesque/redux/block/natural/ReduxNaturalWall.java @@ -6,6 +6,7 @@ import net.minecraft.world.level.block.state.StateDefinition; import net.minecraft.world.phys.shapes.VoxelShape; import net.zepalesque.redux.block.state.ReduxStates; +import net.zepalesque.redux.mixin.mixins.common.accessor.WallBlockAccessor; import java.util.Map; @@ -13,21 +14,28 @@ public class ReduxNaturalWall extends ReduxDoubleDropsWall { public ReduxNaturalWall(Properties properties) { super(properties); this.registerDefaultState(this.defaultBlockState().setValue(ReduxStates.NATURAL_GEN, false)); - this.fixShapeMaps(); + this.fixShapeMaps2(); } - @Override - protected void createBlockStateDefinition(StateDefinition.Builder builder) { - super.createBlockStateDefinition(builder); - builder.add(ReduxStates.NATURAL_GEN); + + private void fixShapeMaps2() { + WallBlockAccessor accessor = (WallBlockAccessor) this; + Map shapeByIndex = accessor.redux$getShapeByIndex(); + shapeByIndex = fixShapeMap2(shapeByIndex); + accessor.redux$setShapeByIndex(shapeByIndex); + + Map collisionShapeByIndex = accessor.redux$getCollisionShapeByIndex(); + collisionShapeByIndex = fixShapeMap2(collisionShapeByIndex); + accessor.redux$setCollisionShapeByIndex(collisionShapeByIndex); } - @Override - protected ImmutableMap.Builder fixShapeMap(Map map) { - ImmutableMap.Builder builder = super.fixShapeMap(map); + private static Map fixShapeMap2(Map map) { + ImmutableMap.Builder builder = ImmutableMap.builder(); + builder.putAll(map); for (BlockState state : map.keySet()) { builder.put(state.cycle(ReduxStates.NATURAL_GEN), map.get(state)); } - return builder; + return builder.build(); } + } diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index 4db49e420..64b858c57 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -8,12 +8,15 @@ version="${mod_version}" displayName="${mod_name}" displayURL = "https://github.com/Zepalesque/The-Aether-Redux" logoFile = "redux.png" +credits = "The Aether Team, Aerod, BrianIsBro, Emile van Kreiken, 345boneshoss, RazorDevs, unroman, Parallel113, IcyCrystal, ModdingLegacy, Builderdog841, Jonathing, LlamaLad7, Shimmer.shine" authors = "Zepalesque" description = ''' -Zenith is a library designed to simplify a variety of tedious processes in a way that is dynamic and easily expandable, along with adding useful APIs that can be used for mods. - -The main reason the mod exists is for the Aether: Redux, but it may be used in the future, and may be useful as well. +The Aether: Redux is an expansive addon mod for the well-known Aether mod, adding a wide variety of new content ranging from several new biomes to an overhaul to the mod's first dungeon. There are a variety of other new features as well! \n\nA whole lot of new mob models have also been implemented, which are all configurable as well, so you can choose between Redux's upgraded versions and the originals if you prefer them. \n\nYou can also configure Redux's built-in asset overrides resource pack, using the new in-game config system created specifically for this, so you can change the appearance of various parts of the mod to your hearts content! \n\nSpeaking of configuration, the mod also has a ton of configuration options, so check those out, as you could very well prefer certain options over others. ''' + +[[mixins]] +config="${mod_id}.mixins.json" + [[dependencies.aether_redux]] #optional modId="neoforge" #mandatory type="required" #mandatory