From 0b32c5afc17443fd3bd9e9c67de6d7a5b89d3188 Mon Sep 17 00:00:00 2001 From: Martin Prokoph Date: Wed, 31 Jul 2024 11:31:06 +0200 Subject: [PATCH] Code cleanup --- .../motschen/decorative/DecorativeMain.java | 6 ++-- .../sound/DecorativeSoundEvents.java | 6 +++- .../blockstates/old_television.json | 31 +++++------------- .../block/kitchen_tiles (Kopieren).png | Bin 202 -> 0 bytes 4 files changed, 17 insertions(+), 26 deletions(-) delete mode 100755 src/main/resources/assets/decorative/textures/block/kitchen_tiles (Kopieren).png diff --git a/src/main/java/eu/midnightdust/motschen/decorative/DecorativeMain.java b/src/main/java/eu/midnightdust/motschen/decorative/DecorativeMain.java index ae87ad1..37935c4 100755 --- a/src/main/java/eu/midnightdust/motschen/decorative/DecorativeMain.java +++ b/src/main/java/eu/midnightdust/motschen/decorative/DecorativeMain.java @@ -17,7 +17,9 @@ import net.fabricmc.api.ModInitializer; import net.fabricmc.fabric.api.itemgroup.v1.FabricItemGroup; import net.minecraft.block.Block; import net.minecraft.block.Blocks; -import net.minecraft.item.*; +import net.minecraft.item.ItemConvertible; +import net.minecraft.item.ItemGroup; +import net.minecraft.item.ItemStack; import net.minecraft.registry.Registries; import net.minecraft.registry.Registry; import net.minecraft.state.property.EnumProperty; @@ -108,7 +110,7 @@ public class DecorativeMain implements ModInitializer { DoubleLamps.init(); Clocks.init(); OreFeatures.init(); - new DecorativeSoundEvents(); + DecorativeSoundEvents.init(); } public static Identifier id(String path) { return Identifier.of(MOD_ID, path); diff --git a/src/main/java/eu/midnightdust/motschen/decorative/sound/DecorativeSoundEvents.java b/src/main/java/eu/midnightdust/motschen/decorative/sound/DecorativeSoundEvents.java index 49e1b4d..d6e4ace 100755 --- a/src/main/java/eu/midnightdust/motschen/decorative/sound/DecorativeSoundEvents.java +++ b/src/main/java/eu/midnightdust/motschen/decorative/sound/DecorativeSoundEvents.java @@ -8,7 +8,11 @@ import net.minecraft.util.Identifier; import static eu.midnightdust.motschen.decorative.DecorativeMain.id; public class DecorativeSoundEvents { - public static final SoundEvent CEILINGFAN_AMBIENT = register(id("ceiling_fan.ambient")); + public static SoundEvent CEILINGFAN_AMBIENT; + + public static void init() { + CEILINGFAN_AMBIENT = register(id("ceiling_fan.ambient")); + } private static SoundEvent register(Identifier id) { return Registry.register(Registries.SOUND_EVENT, id, SoundEvent.of(id)); diff --git a/src/main/resources/assets/decorative/blockstates/old_television.json b/src/main/resources/assets/decorative/blockstates/old_television.json index 91d8d05..e57b003 100755 --- a/src/main/resources/assets/decorative/blockstates/old_television.json +++ b/src/main/resources/assets/decorative/blockstates/old_television.json @@ -1,28 +1,13 @@ { "variants": { - "facing=south,program=off": { "model": "decorative:block/old_television_off", "uvlock": true }, - "facing=west,program=off": { "model": "decorative:block/old_television_off", "uvlock": true, "y": 90 }, - "facing=north,program=off": { "model": "decorative:block/old_television_off", "uvlock": true, "y": 180 }, - "facing=east,program=off": { "model": "decorative:block/old_television_off", "uvlock": true, "y": 270 }, + "facing=south,powered=false": { "model": "decorative:block/old_television_off", "uvlock": true }, + "facing=west,powered=false": { "model": "decorative:block/old_television_off", "uvlock": true, "y": 90 }, + "facing=north,powered=false": { "model": "decorative:block/old_television_off", "uvlock": true, "y": 180 }, + "facing=east,powered=false": { "model": "decorative:block/old_television_off", "uvlock": true, "y": 270 }, - "facing=south,program=nyancat": { "model": "decorative:block/old_television_nyancat", "uvlock": true }, - "facing=west,program=nyancat": { "model": "decorative:block/old_television_nyancat", "uvlock": true, "y": 90 }, - "facing=north,program=nyancat": { "model": "decorative:block/old_television_nyancat", "uvlock": true, "y": 180 }, - "facing=east,program=nyancat": { "model": "decorative:block/old_television_nyancat", "uvlock": true, "y": 270 }, - - "facing=south,program=creeper": { "model": "decorative:block/old_television_creeper", "uvlock": true }, - "facing=west,program=creeper": { "model": "decorative:block/old_television_creeper", "uvlock": true, "y": 90 }, - "facing=north,program=creeper": { "model": "decorative:block/old_television_creeper", "uvlock": true, "y": 180 }, - "facing=east,program=creeper": { "model": "decorative:block/old_television_creeper", "uvlock": true, "y": 270 }, - - "facing=south,program=crabrave": { "model": "decorative:block/old_television_crabrave", "uvlock": true }, - "facing=west,program=crabrave": { "model": "decorative:block/old_television_crabrave", "uvlock": true, "y": 90 }, - "facing=north,program=crabrave": { "model": "decorative:block/old_television_crabrave", "uvlock": true, "y": 180 }, - "facing=east,program=crabrave": { "model": "decorative:block/old_television_crabrave", "uvlock": true, "y": 270 }, - - "facing=south,program=tater": { "model": "decorative:block/old_television_tater", "uvlock": true }, - "facing=west,program=tater": { "model": "decorative:block/old_television_tater", "uvlock": true, "y": 90 }, - "facing=north,program=tater": { "model": "decorative:block/old_television_tater", "uvlock": true, "y": 180 }, - "facing=east,program=tater": { "model": "decorative:block/old_television_tater", "uvlock": true, "y": 270 } + "facing=south,powered=true": { "model": "decorative:block/old_television_on", "uvlock": true }, + "facing=west,powered=true": { "model": "decorative:block/old_television_on", "uvlock": true, "y": 90 }, + "facing=north,powered=true": { "model": "decorative:block/old_television_on", "uvlock": true, "y": 180 }, + "facing=east,powered=true": { "model": "decorative:block/old_television_on", "uvlock": true, "y": 270 } } } diff --git a/src/main/resources/assets/decorative/textures/block/kitchen_tiles (Kopieren).png b/src/main/resources/assets/decorative/textures/block/kitchen_tiles (Kopieren).png deleted file mode 100755 index 1091e62ad07f125f92d0b183b9ddb517e443e9ae..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 202 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBuf-vKbiP>*~g7Ka%jv*HQPcJSMWKiT`aS-Zs3S^Q^U18{K znlY=RE9KrCj?d5HH>;ID3dvYIHSSKV%NZWqggfWg$y}Ht{P9Zl{p!UmSE8JGW<-Vt s`h{e>@_1<`_slV_DtIbi#}`z^U@IeX_3x6UAgdTWUHx3vIVCg!0KS+(W&i*H