diff --git a/gradle.properties b/gradle.properties index c39921f..b678dac 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ minecraft_version=1.20.1 yarn_mappings=1.20.1+build.10 loader_version=0.18.3 # Mod Properties -mod_version=26.3.2 +mod_version=26.3.2.1 maven_group=dev.tggamesyt archives_base_name=szar # Dependencies diff --git a/src/client/java/dev/tggamesyt/szar/client/SzarClient.java b/src/client/java/dev/tggamesyt/szar/client/SzarClient.java index 15d7544..0608e16 100644 --- a/src/client/java/dev/tggamesyt/szar/client/SzarClient.java +++ b/src/client/java/dev/tggamesyt/szar/client/SzarClient.java @@ -305,6 +305,38 @@ public class SzarClient implements ClientModInitializer { Szar.CANNABIS_BLOCK, RenderLayer.getCutout() ); + BlockRenderLayerMap.INSTANCE.putBlock( + ROULETTE_BLOCK, + RenderLayer.getCutout() + ); + BlockRenderLayerMap.INSTANCE.putBlock( + SLOT_MACHINE_BLOCK, + RenderLayer.getCutout() + ); + BlockRenderLayerMap.INSTANCE.putBlock( + C_BLOCK, + RenderLayer.getCutout() + ); + BlockRenderLayerMap.INSTANCE.putBlock( + A_BLOCK, + RenderLayer.getCutout() + ); + BlockRenderLayerMap.INSTANCE.putBlock( + S_BLOCK, + RenderLayer.getCutout() + ); + BlockRenderLayerMap.INSTANCE.putBlock( + I_BLOCK, + RenderLayer.getCutout() + ); + BlockRenderLayerMap.INSTANCE.putBlock( + N_BLOCK, + RenderLayer.getCutout() + ); + BlockRenderLayerMap.INSTANCE.putBlock( + O_BLOCK, + RenderLayer.getCutout() + ); HudRenderCallback.EVENT.register((drawContext, tickDelta) -> { MinecraftClient client = MinecraftClient.getInstance(); diff --git a/src/main/java/dev/tggamesyt/szar/BasicRotatableModelBlock.java b/src/main/java/dev/tggamesyt/szar/BasicRotatableModelBlock.java index 3b62333..5d49cad 100644 --- a/src/main/java/dev/tggamesyt/szar/BasicRotatableModelBlock.java +++ b/src/main/java/dev/tggamesyt/szar/BasicRotatableModelBlock.java @@ -74,4 +74,20 @@ public class BasicRotatableModelBlock extends Block { protected void appendProperties(StateManager.Builder builder) { builder.add(FACING); } + + @Override + public BlockState rotate(BlockState state, BlockRotation rotation) { + if (state.contains(FACING)) { + return state.with(FACING, rotation.rotate(state.get(FACING))); + } + return state; + } + + @Override + public BlockState mirror(BlockState state, BlockMirror mirror) { + if (state.contains(FACING)) { + return state.rotate(mirror.getRotation(state.get(FACING))); + } + return state; + } } diff --git a/src/main/java/dev/tggamesyt/szar/SlotMachineBlock.java b/src/main/java/dev/tggamesyt/szar/SlotMachineBlock.java index 342d247..ebdcfc9 100644 --- a/src/main/java/dev/tggamesyt/szar/SlotMachineBlock.java +++ b/src/main/java/dev/tggamesyt/szar/SlotMachineBlock.java @@ -162,4 +162,20 @@ public class SlotMachineBlock extends Block implements BlockEntityProvider { } }; } + + @Override + public BlockState rotate(BlockState state, BlockRotation rotation) { + if (state.contains(FACING)) { + return state.with(FACING, rotation.rotate(state.get(FACING))); + } + return state; + } + + @Override + public BlockState mirror(BlockState state, BlockMirror mirror) { + if (state.contains(FACING)) { + return state.rotate(mirror.getRotation(state.get(FACING))); + } + return state; + } } \ No newline at end of file diff --git a/src/main/resources/data/szar/tags/worldgen/biome/normal_land.json b/src/main/resources/data/szar/tags/worldgen/biome/normal_land.json new file mode 100644 index 0000000..e73ab65 --- /dev/null +++ b/src/main/resources/data/szar/tags/worldgen/biome/normal_land.json @@ -0,0 +1,41 @@ +{ + "replace": false, + "values": [ + "minecraft:badlands", + "minecraft:bamboo_jungle", + "minecraft:beach", + "minecraft:birch_forest", + "minecraft:dark_forest", + "minecraft:deep_dark", + "minecraft:desert", + "minecraft:eroded_badlands", + "minecraft:flower_forest", + "minecraft:forest", + "minecraft:grove", + "minecraft:ice_spikes", + "minecraft:jagged_peaks", + "minecraft:jungle", + "minecraft:meadow", + "minecraft:mushroom_fields", + "minecraft:old_growth_birch_forest", + "minecraft:old_growth_pine_taiga", + "minecraft:old_growth_spruce_taiga", + "minecraft:plains", + "minecraft:savanna", + "minecraft:savanna_plateau", + "minecraft:snowy_beach", + "minecraft:snowy_plains", + "minecraft:snowy_slopes", + "minecraft:snowy_taiga", + "minecraft:sparse_jungle", + "minecraft:stony_peaks", + "minecraft:stony_shore", + "minecraft:sunflower_plains", + "minecraft:taiga", + "minecraft:windswept_forest", + "minecraft:windswept_gravelly_hills", + "minecraft:windswept_hills", + "minecraft:windswept_savanna", + "minecraft:wooded_badlands" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/szar/worldgen/structure/casino.json b/src/main/resources/data/szar/worldgen/structure/casino.json index e583905..489bd63 100644 --- a/src/main/resources/data/szar/worldgen/structure/casino.json +++ b/src/main/resources/data/szar/worldgen/structure/casino.json @@ -1,6 +1,6 @@ { "type": "szar:casino", - "biomes": "#minecraft:is_overworld", + "biomes": "#szar:normal_land", "step": "surface_structures", "terrain_adaptation": "beard_thin", "spawn_overrides": {}, diff --git a/src/main/resources/data/szar/worldgen/structure/two_towers.json b/src/main/resources/data/szar/worldgen/structure/two_towers.json index a872c48..4bfdfee 100644 --- a/src/main/resources/data/szar/worldgen/structure/two_towers.json +++ b/src/main/resources/data/szar/worldgen/structure/two_towers.json @@ -1,6 +1,6 @@ { "type": "szar:two_towers", - "biomes": "#minecraft:is_overworld", + "biomes": "#szar:normal_land", "spawn_overrides": {}, "step": "surface_structures", "terrain_adaptation": "beard_thin"