From 7fb093de15fd55d004fcbce3d4db218223f65519 Mon Sep 17 00:00:00 2001 From: Motschen Date: Sat, 18 Jun 2022 11:35:05 +0200 Subject: [PATCH] VisualOverhaul 4.1.1 - Update to 1.19 --- build.gradle | 7 +- gradle.properties | 12 +- .../visualoverhaul/VisualOverhaulClient.java | 22 +- .../renderer/JukeboxBlockEntityRenderer.java | 12 +- .../visualoverhaul/config/VOConfig.java | 1 + .../MixinAbstractFurnaceBlockEntity.java | 4 +- .../mixin/MixinBlastFurnaceBlock.java | 3 +- .../mixin/MixinBrewingStandBlockEntity.java | 4 +- .../mixin/MixinJukeboxBlock.java | 4 +- .../mixin/MixinJukeboxBlockEntity.java | 26 +- .../mixin/MixinSmokerBlock.java | 3 +- .../visualoverhaul/util/sound/SoundTest.java | 23 - .../coloredwaterbucket/pack.mcmeta | 2 +- .../resourcepacks/fancyfurnace/pack.mcmeta | 2 +- .../models/block/brewing_stand_bottle0.json | 25 + .../models/block/brewing_stand_bottle1.json | 27 + .../models/block/brewing_stand_bottle2.json | 27 + .../nobrewingbottles/pack.mcmeta | 2 +- .../minecraft/models/item/music_disc_5.json | 15 + .../models/item/music_disc_5_round.json | 6 + .../recordable/models/item/copper_record.json | 25 + .../models/item/copper_record_round.json | 557 ++++++++++++++++++ .../resourcepacks/rounddiscs/pack.mcmeta | 2 +- 23 files changed, 721 insertions(+), 90 deletions(-) delete mode 100644 src/main/java/eu/midnightdust/visualoverhaul/util/sound/SoundTest.java create mode 100644 src/main/resources/resourcepacks/nobrewingbottles/assets/minecraft/models/block/brewing_stand_bottle0.json create mode 100644 src/main/resources/resourcepacks/nobrewingbottles/assets/minecraft/models/block/brewing_stand_bottle1.json create mode 100644 src/main/resources/resourcepacks/nobrewingbottles/assets/minecraft/models/block/brewing_stand_bottle2.json create mode 100755 src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_5.json create mode 100755 src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_5_round.json create mode 100755 src/main/resources/resourcepacks/rounddiscs/assets/recordable/models/item/copper_record.json create mode 100755 src/main/resources/resourcepacks/rounddiscs/assets/recordable/models/item/copper_record_round.json diff --git a/build.gradle b/build.gradle index 67c2ff3..00e429d 100755 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'fabric-loom' version '0.10-SNAPSHOT' + id 'fabric-loom' version '0.12-SNAPSHOT' id 'maven-publish' } @@ -10,9 +10,6 @@ archivesBaseName = project.archives_base_name version = project.mod_version group = project.maven_group -minecraft { -} - repositories { maven { url "https://jitpack.io" } maven { url "https://api.modrinth.com/maven" } @@ -46,7 +43,7 @@ tasks.withType(JavaCompile).configureEach { it.options.encoding = "UTF-8" // Minecraft 1.17 (21w19a) upwards uses Java 16. - it.options.release = 16 + it.options.release = 17 } java { diff --git a/gradle.properties b/gradle.properties index 9666fc3..afa79e5 100755 --- a/gradle.properties +++ b/gradle.properties @@ -3,16 +3,16 @@ org.gradle.jvmargs=-Xmx2G # Fabric Properties # check these on https://fabricmc.net/use - minecraft_version=1.18.2 - yarn_mappings=1.18.2+build.2 - loader_version=0.13.3 + minecraft_version=1.19 + yarn_mappings=1.19+build.4 + loader_version=0.14.8 # Mod Properties - mod_version = 4.1.0 + mod_version = 4.1.1 maven_group = eu.midnightdust archives_base_name = visualoverhaul # Dependencies # currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api - fabric_version=0.47.10+1.18.2 - midnightlib_version=0.4.0 + fabric_version=0.56.0+1.19 + midnightlib_version=0.5.2 diff --git a/src/main/java/eu/midnightdust/visualoverhaul/VisualOverhaulClient.java b/src/main/java/eu/midnightdust/visualoverhaul/VisualOverhaulClient.java index b0b2bde..d823506 100755 --- a/src/main/java/eu/midnightdust/visualoverhaul/VisualOverhaulClient.java +++ b/src/main/java/eu/midnightdust/visualoverhaul/VisualOverhaulClient.java @@ -8,6 +8,7 @@ import eu.midnightdust.visualoverhaul.block.renderer.JukeboxBlockEntityRenderer; import eu.midnightdust.visualoverhaul.config.VOConfig; import net.fabricmc.api.ClientModInitializer; import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents; +import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking; import net.fabricmc.fabric.api.client.rendering.v1.ColorProviderRegistry; import net.fabricmc.fabric.api.client.rendering.v1.EntityModelLayerRegistry; import net.fabricmc.fabric.api.item.v1.FabricItemSettings; @@ -16,7 +17,6 @@ import net.fabricmc.fabric.api.resource.ResourceManagerHelper; import net.fabricmc.fabric.api.resource.ResourcePackActivationType; import net.fabricmc.fabric.impl.blockrenderlayer.BlockRenderLayerMapImpl; import net.fabricmc.fabric.impl.client.rendering.BlockEntityRendererRegistryImpl; -import net.fabricmc.fabric.impl.networking.ClientSidePacketRegistryImpl; import net.fabricmc.loader.api.FabricLoader; import net.minecraft.block.Block; import net.minecraft.block.Blocks; @@ -72,19 +72,19 @@ public class VisualOverhaulClient implements ClientModInitializer { // } Registry.ITEM.forEach((item) -> { - if(item instanceof MusicDiscItem || item.getName().getString().toLowerCase().contains("music_disc") || item.getName().getString().toLowerCase().contains("dynamic_disc")) { + if(item instanceof MusicDiscItem || item.getName().getString().toLowerCase().contains("music_disc") || item.getName().getString().toLowerCase().contains("record") || item.getName().getString().toLowerCase().contains("dynamic_disc")) { FabricModelPredicateProviderRegistry.register(item, new Identifier("round"), (stack, world, entity, seed) -> stack.getCount() == 2 ? 1.0F : 0.0F); } }); - ClientSidePacketRegistryImpl.INSTANCE.register(UPDATE_POTION_BOTTLES, - (packetContext, attachedData) -> { + ClientPlayNetworking.registerGlobalReceiver(UPDATE_POTION_BOTTLES, + (client, handler, attachedData, packetSender) -> { BlockPos pos = attachedData.readBlockPos(); DefaultedList inv = DefaultedList.ofSize(5, ItemStack.EMPTY); for (int i = 0; i < 4; i++) { inv.set(i, attachedData.readItemStack()); } - packetContext.getTaskQueue().execute(() -> { + client.execute(() -> { if (client.world != null && client.world.getBlockEntity(pos) != null && client.world.getBlockEntity(pos) instanceof BrewingStandBlockEntity blockEntity) { blockEntity.setStack(0, inv.get(0)); blockEntity.setStack(1, inv.get(1)); @@ -94,24 +94,24 @@ public class VisualOverhaulClient implements ClientModInitializer { } }); }); - ClientSidePacketRegistryImpl.INSTANCE.register(UPDATE_RECORD, - (packetContext, attachedData) -> { + ClientPlayNetworking.registerGlobalReceiver(UPDATE_RECORD, + (client, handler, attachedData, packetSender) -> { BlockPos pos = attachedData.readBlockPos(); ItemStack record = attachedData.readItemStack(); - packetContext.getTaskQueue().execute(() -> { + client.execute(() -> { if (client.world != null && client.world.getBlockEntity(pos) != null && client.world.getBlockEntity(pos) instanceof JukeboxBlockEntity blockEntity) { blockEntity.setRecord(record); } }); }); - ClientSidePacketRegistryImpl.INSTANCE.register(UPDATE_FURNACE_ITEMS, - (packetContext, attachedData) -> { + ClientPlayNetworking.registerGlobalReceiver(UPDATE_FURNACE_ITEMS, + (client, handler, attachedData, packetSender) -> { BlockPos pos = attachedData.readBlockPos(); DefaultedList inv = DefaultedList.ofSize(3, ItemStack.EMPTY); for (int i = 0; i < 2; i++) { inv.set(i, attachedData.readItemStack()); } - packetContext.getTaskQueue().execute(() -> { + client.execute(() -> { if (client.world != null && client.world.getBlockEntity(pos) != null && client.world.getBlockEntity(pos) instanceof AbstractFurnaceBlockEntity blockEntity) { blockEntity.setStack(0, inv.get(0)); blockEntity.setStack(1, inv.get(1)); diff --git a/src/main/java/eu/midnightdust/visualoverhaul/block/renderer/JukeboxBlockEntityRenderer.java b/src/main/java/eu/midnightdust/visualoverhaul/block/renderer/JukeboxBlockEntityRenderer.java index 2805ca4..04f3f0f 100755 --- a/src/main/java/eu/midnightdust/visualoverhaul/block/renderer/JukeboxBlockEntityRenderer.java +++ b/src/main/java/eu/midnightdust/visualoverhaul/block/renderer/JukeboxBlockEntityRenderer.java @@ -21,10 +21,11 @@ import net.minecraft.util.Identifier; import net.minecraft.util.Util; import net.minecraft.util.math.Direction; import net.minecraft.util.math.Vec3f; +import net.minecraft.util.math.random.Random; import net.minecraft.util.registry.Registry; import org.apache.logging.log4j.LogManager; -import java.util.*; +import java.util.Objects; @Environment(EnvType.CLIENT) public class JukeboxBlockEntityRenderer implements BlockEntityRenderer { @@ -45,16 +46,15 @@ public class JukeboxBlockEntityRenderer implements BlockEntityRenderer minecraft:music_disc_cat) // + // Converts the Sound Id to the item id of the appropriate disc (minecraft:music_disc.cat -> minecraft:music_disc_cat) // discItem = new Identifier(String.valueOf(SoundTest.getSound(blockEntity.getPos())).replace(".", "_")); // Tries to get the disc item from the registry // if (Registry.ITEM.getOrEmpty(discItem).isPresent()) { - record = new ItemStack(Registry.ITEM.get(discItem)); } else { - LogManager.getLogger("VisualOverhaul").warn("Error getting music disc item for" + SoundTest.getSound(blockEntity.getPos())); + if (VOConfig.debug) LogManager.getLogger("VisualOverhaul").warn("Error getting music disc item for " + SoundTest.getSound(blockEntity.getPos())); discItem = null; record = ItemStack.EMPTY; } @@ -80,9 +80,9 @@ public class JukeboxBlockEntityRenderer implements BlockEntityRenderer ServerSidePacketRegistryImpl.INSTANCE.sendToPlayer(player, VisualOverhaul.UPDATE_FURNACE_ITEMS, passedData)); + watchingPlayers.forEach(player -> ServerPlayNetworking.send(player, VisualOverhaul.UPDATE_FURNACE_ITEMS, passedData)); invUpdate = false; } playerUpdate = world.getPlayers().size(); diff --git a/src/main/java/eu/midnightdust/visualoverhaul/mixin/MixinBlastFurnaceBlock.java b/src/main/java/eu/midnightdust/visualoverhaul/mixin/MixinBlastFurnaceBlock.java index 532b819..830016d 100644 --- a/src/main/java/eu/midnightdust/visualoverhaul/mixin/MixinBlastFurnaceBlock.java +++ b/src/main/java/eu/midnightdust/visualoverhaul/mixin/MixinBlastFurnaceBlock.java @@ -7,14 +7,13 @@ import net.minecraft.block.BlockState; import net.minecraft.particle.ParticleTypes; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; +import net.minecraft.util.math.random.Random; import net.minecraft.world.World; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import java.util.Random; - @Mixin(BlastFurnaceBlock.class) public abstract class MixinBlastFurnaceBlock extends AbstractFurnaceBlock { protected MixinBlastFurnaceBlock(Settings settings) { diff --git a/src/main/java/eu/midnightdust/visualoverhaul/mixin/MixinBrewingStandBlockEntity.java b/src/main/java/eu/midnightdust/visualoverhaul/mixin/MixinBrewingStandBlockEntity.java index 4dd77d7..be84d2d 100755 --- a/src/main/java/eu/midnightdust/visualoverhaul/mixin/MixinBrewingStandBlockEntity.java +++ b/src/main/java/eu/midnightdust/visualoverhaul/mixin/MixinBrewingStandBlockEntity.java @@ -3,7 +3,7 @@ package eu.midnightdust.visualoverhaul.mixin; import eu.midnightdust.visualoverhaul.VisualOverhaul; import io.netty.buffer.Unpooled; import net.fabricmc.fabric.api.networking.v1.PlayerLookup; -import net.fabricmc.fabric.impl.networking.ServerSidePacketRegistryImpl; +import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking; import net.minecraft.block.BlockState; import net.minecraft.block.entity.BlockEntityType; import net.minecraft.block.entity.BrewingStandBlockEntity; @@ -43,7 +43,7 @@ public abstract class MixinBrewingStandBlockEntity extends LockableContainerBloc passedData.writeItemStack(blockEntity.getStack(3)); passedData.writeItemStack(blockEntity.getStack(4)); - watchingPlayers.forEach(player -> ServerSidePacketRegistryImpl.INSTANCE.sendToPlayer(player, VisualOverhaul.UPDATE_POTION_BOTTLES, passedData)); + watchingPlayers.forEach(player -> ServerPlayNetworking.send(player, VisualOverhaul.UPDATE_POTION_BOTTLES, passedData)); invUpdate = false; } playerUpdate = world.getPlayers().size(); diff --git a/src/main/java/eu/midnightdust/visualoverhaul/mixin/MixinJukeboxBlock.java b/src/main/java/eu/midnightdust/visualoverhaul/mixin/MixinJukeboxBlock.java index f57d6f7..7a87b10 100755 --- a/src/main/java/eu/midnightdust/visualoverhaul/mixin/MixinJukeboxBlock.java +++ b/src/main/java/eu/midnightdust/visualoverhaul/mixin/MixinJukeboxBlock.java @@ -4,7 +4,7 @@ import eu.midnightdust.visualoverhaul.VisualOverhaul; import eu.midnightdust.visualoverhaul.util.JukeboxPacketUpdate; import io.netty.buffer.Unpooled; import net.fabricmc.fabric.api.networking.v1.PlayerLookup; -import net.fabricmc.fabric.impl.networking.ServerSidePacketRegistryImpl; +import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking; import net.minecraft.block.BlockRenderType; import net.minecraft.block.BlockState; import net.minecraft.block.BlockWithEntity; @@ -47,7 +47,7 @@ public abstract class MixinJukeboxBlock extends BlockWithEntity { passedData.writeBlockPos(pos); passedData.writeItemStack(blockEntity.getRecord()); - watchingPlayers.forEach(player -> ServerSidePacketRegistryImpl.INSTANCE.sendToPlayer(player, VisualOverhaul.UPDATE_RECORD, passedData)); + watchingPlayers.forEach(player -> ServerPlayNetworking.send(player, VisualOverhaul.UPDATE_RECORD, passedData)); JukeboxPacketUpdate.invUpdate = false; } JukeboxPacketUpdate.playerUpdate = world.getPlayers().size(); diff --git a/src/main/java/eu/midnightdust/visualoverhaul/mixin/MixinJukeboxBlockEntity.java b/src/main/java/eu/midnightdust/visualoverhaul/mixin/MixinJukeboxBlockEntity.java index fb2fa35..b95e4f6 100755 --- a/src/main/java/eu/midnightdust/visualoverhaul/mixin/MixinJukeboxBlockEntity.java +++ b/src/main/java/eu/midnightdust/visualoverhaul/mixin/MixinJukeboxBlockEntity.java @@ -1,25 +1,15 @@ package eu.midnightdust.visualoverhaul.mixin; -import eu.midnightdust.visualoverhaul.VisualOverhaul; import eu.midnightdust.visualoverhaul.util.JukeboxPacketUpdate; -import io.netty.buffer.Unpooled; -import net.fabricmc.fabric.api.networking.v1.PlayerLookup; -import net.fabricmc.fabric.impl.networking.ServerSidePacketRegistryImpl; import net.minecraft.block.BlockState; import net.minecraft.block.entity.*; import net.minecraft.item.ItemStack; -import net.minecraft.network.PacketByteBuf; -import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Unique; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import java.util.stream.Stream; - @Mixin(JukeboxBlockEntity.class) public abstract class MixinJukeboxBlockEntity extends BlockEntity { @@ -27,21 +17,7 @@ public abstract class MixinJukeboxBlockEntity extends BlockEntity { super(type, pos, state); } - @Unique - private static void tick(World world, BlockPos pos, BlockState state, JukeboxBlockEntity blockEntity) { - if (!world.isClient && (JukeboxPacketUpdate.invUpdate || world.getPlayers().size() == JukeboxPacketUpdate.playerUpdate)) { - Stream watchingPlayers = PlayerLookup.tracking(blockEntity).stream(); - PacketByteBuf passedData = new PacketByteBuf(Unpooled.buffer()); - passedData.writeBlockPos(pos); - passedData.writeItemStack(blockEntity.getRecord()); - - watchingPlayers.forEach(player -> ServerSidePacketRegistryImpl.INSTANCE.sendToPlayer(player, VisualOverhaul.UPDATE_RECORD, passedData)); - JukeboxPacketUpdate.invUpdate = false; - } - JukeboxPacketUpdate.playerUpdate = world.getPlayers().size(); - } - - @Inject(at = @At("RETURN"), method = "getRecord", cancellable = true) + @Inject(at = @At("RETURN"), method = "getRecord") public void getRecord(CallbackInfoReturnable cir) { JukeboxPacketUpdate.invUpdate = true; } diff --git a/src/main/java/eu/midnightdust/visualoverhaul/mixin/MixinSmokerBlock.java b/src/main/java/eu/midnightdust/visualoverhaul/mixin/MixinSmokerBlock.java index 47cf896..daadb2a 100644 --- a/src/main/java/eu/midnightdust/visualoverhaul/mixin/MixinSmokerBlock.java +++ b/src/main/java/eu/midnightdust/visualoverhaul/mixin/MixinSmokerBlock.java @@ -7,14 +7,13 @@ import net.minecraft.block.SmokerBlock; import net.minecraft.particle.ParticleTypes; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; +import net.minecraft.util.math.random.Random; import net.minecraft.world.World; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import java.util.Random; - @Mixin(SmokerBlock.class) public abstract class MixinSmokerBlock extends AbstractFurnaceBlock { protected MixinSmokerBlock(Settings settings) { diff --git a/src/main/java/eu/midnightdust/visualoverhaul/util/sound/SoundTest.java b/src/main/java/eu/midnightdust/visualoverhaul/util/sound/SoundTest.java deleted file mode 100644 index 1d3c126..0000000 --- a/src/main/java/eu/midnightdust/visualoverhaul/util/sound/SoundTest.java +++ /dev/null @@ -1,23 +0,0 @@ -package eu.midnightdust.visualoverhaul.util.sound; - -import com.google.common.collect.Maps; -import net.minecraft.util.Identifier; -import net.minecraft.util.math.BlockPos; - -import java.util.Map; - -public class SoundTest { - - public static Map soundPos = Maps.newHashMap(); - - /** - * Returns the Sound provided in MixinSoundSystem - * {@link eu.midnightdust.visualoverhaul.mixin.MixinSoundSystem} - */ - public static Identifier getSound(BlockPos pos) { - if (soundPos.containsKey(pos)) { - return soundPos.get(pos); - } - return null; - } -} diff --git a/src/main/resources/resourcepacks/coloredwaterbucket/pack.mcmeta b/src/main/resources/resourcepacks/coloredwaterbucket/pack.mcmeta index f98ff68..b7e3573 100755 --- a/src/main/resources/resourcepacks/coloredwaterbucket/pack.mcmeta +++ b/src/main/resources/resourcepacks/coloredwaterbucket/pack.mcmeta @@ -1,6 +1,6 @@ { "pack": { - "pack_format": 8, + "pack_format": 9, "description": "§2Makes the water bucket respect biome colors" } } diff --git a/src/main/resources/resourcepacks/fancyfurnace/pack.mcmeta b/src/main/resources/resourcepacks/fancyfurnace/pack.mcmeta index 914b8f7..366e60b 100755 --- a/src/main/resources/resourcepacks/fancyfurnace/pack.mcmeta +++ b/src/main/resources/resourcepacks/fancyfurnace/pack.mcmeta @@ -1,6 +1,6 @@ { "pack": { - "pack_format": 8, + "pack_format": 9, "description": "§2Changes the model of the furnace to be 3D" } } diff --git a/src/main/resources/resourcepacks/nobrewingbottles/assets/minecraft/models/block/brewing_stand_bottle0.json b/src/main/resources/resourcepacks/nobrewingbottles/assets/minecraft/models/block/brewing_stand_bottle0.json new file mode 100644 index 0000000..ef34a97 --- /dev/null +++ b/src/main/resources/resourcepacks/nobrewingbottles/assets/minecraft/models/block/brewing_stand_bottle0.json @@ -0,0 +1,25 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "particle": "block/brewing_stand", + "stand": "block/brewing_stand" + }, + "elements": [ + { + "from": [8, 0, 8], + "to": [11, 16, 8], + "faces": { + "north": {"uv": [5, 0, 8, 16], "texture": "#stand"}, + "south": {"uv": [8, 0, 5, 16], "texture": "#stand"} + } + }, + { + "from": [11, 9, 8], + "to": [16, 16, 8], + "faces": { + "north": {"uv": [0, 0, 5, 7], "texture": "#stand"}, + "south": {"uv": [5, 0, 0, 7], "texture": "#stand"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/resourcepacks/nobrewingbottles/assets/minecraft/models/block/brewing_stand_bottle1.json b/src/main/resources/resourcepacks/nobrewingbottles/assets/minecraft/models/block/brewing_stand_bottle1.json new file mode 100644 index 0000000..e758e6d --- /dev/null +++ b/src/main/resources/resourcepacks/nobrewingbottles/assets/minecraft/models/block/brewing_stand_bottle1.json @@ -0,0 +1,27 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "particle": "block/brewing_stand", + "stand": "block/brewing_stand" + }, + "elements": [ + { + "from": [4.59, 0, 8], + "to": [7.59, 16, 8], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [8, 0, 5, 16], "texture": "#stand"}, + "south": {"uv": [5, 0, 8, 16], "texture": "#stand"} + } + }, + { + "from": [-0.41, 9, 8], + "to": [4.59, 16, 8], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [5, 0, 0, 7], "texture": "#stand"}, + "south": {"uv": [0, 0, 5, 7], "texture": "#stand"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/resourcepacks/nobrewingbottles/assets/minecraft/models/block/brewing_stand_bottle2.json b/src/main/resources/resourcepacks/nobrewingbottles/assets/minecraft/models/block/brewing_stand_bottle2.json new file mode 100644 index 0000000..f10c250 --- /dev/null +++ b/src/main/resources/resourcepacks/nobrewingbottles/assets/minecraft/models/block/brewing_stand_bottle2.json @@ -0,0 +1,27 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "particle": "block/brewing_stand", + "stand": "block/brewing_stand" + }, + "elements": [ + { + "from": [4.59, 0, 8], + "to": [7.59, 16, 8], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [8, 0, 5, 16], "texture": "#stand"}, + "south": {"uv": [5, 0, 8, 16], "texture": "#stand"} + } + }, + { + "from": [-0.41, 9, 8], + "to": [4.59, 16, 8], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [5, 0, 0, 7], "texture": "#stand"}, + "south": {"uv": [0, 0, 5, 7], "texture": "#stand"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/resourcepacks/nobrewingbottles/pack.mcmeta b/src/main/resources/resourcepacks/nobrewingbottles/pack.mcmeta index d130d4b..f8c5c6e 100755 --- a/src/main/resources/resourcepacks/nobrewingbottles/pack.mcmeta +++ b/src/main/resources/resourcepacks/nobrewingbottles/pack.mcmeta @@ -1,6 +1,6 @@ { "pack": { - "pack_format": 8, + "pack_format": 9, "description": "§2Removes the bottles from the brewing stand" } } diff --git a/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_5.json b/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_5.json new file mode 100755 index 0000000..93a8051 --- /dev/null +++ b/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_5.json @@ -0,0 +1,15 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "minecraft:item/music_disc_5" + }, + + "overrides": [ + { + "predicate": { + "round": 1 + }, + "model": "minecraft:item/music_disc_5_round" + } + ] +} diff --git a/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_5_round.json b/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_5_round.json new file mode 100755 index 0000000..894d3b1 --- /dev/null +++ b/src/main/resources/resourcepacks/rounddiscs/assets/minecraft/models/item/music_disc_5_round.json @@ -0,0 +1,6 @@ +{ + "parent": "visualoverhaul:item/round_disc", + "textures": { + "0": "minecraft:item/music_disc_5" + } +} diff --git a/src/main/resources/resourcepacks/rounddiscs/assets/recordable/models/item/copper_record.json b/src/main/resources/resourcepacks/rounddiscs/assets/recordable/models/item/copper_record.json new file mode 100755 index 0000000..e297a5d --- /dev/null +++ b/src/main/resources/resourcepacks/rounddiscs/assets/recordable/models/item/copper_record.json @@ -0,0 +1,25 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "recordable:item/copper_record", + "layer1": "recordable:item/copper_record_engravings", + "layer2": "recordable:item/copper_record_cover_1", + "layer3": "recordable:item/copper_record_cover_2", + "layer4": "recordable:item/copper_record_cover_3", + "layer5": "recordable:item/copper_record_cover_4", + "layer6": "recordable:item/copper_record_cover_5", + "layer7": "recordable:item/copper_record_cover_6", + "layer8": "recordable:item/copper_record_cover_7", + "layer9": "recordable:item/copper_record_cover_8", + "layer10": "recordable:item/copper_record_cover_9", + "layer11": "recordable:item/copper_record_cover_10" + }, + "overrides": [ + { + "predicate": { + "round": 1 + }, + "model": "recordable:item/copper_record_round" + } + ] +} diff --git a/src/main/resources/resourcepacks/rounddiscs/assets/recordable/models/item/copper_record_round.json b/src/main/resources/resourcepacks/rounddiscs/assets/recordable/models/item/copper_record_round.json new file mode 100755 index 0000000..523dfb6 --- /dev/null +++ b/src/main/resources/resourcepacks/rounddiscs/assets/recordable/models/item/copper_record_round.json @@ -0,0 +1,557 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "10": "recordable:item/copper_record_cover_10", + "particle": "recordable:item/copper_record", + "base": "recordable:item/copper_record", + "02": "recordable:item/copper_record_cover_2", + "03": "recordable:item/copper_record_cover_3", + "04": "recordable:item/copper_record_cover_4", + "05": "recordable:item/copper_record_cover_5", + "06": "recordable:item/copper_record_cover_6", + "08": "recordable:item/copper_record_cover_8", + "09": "recordable:item/copper_record_cover_9" + }, + "elements": [ + { + "from": [7.5, 0, 7.5], + "to": [8.5, 1, 8.5], + "faces": { + "up": {"uv": [7, 7, 8, 8], "texture": "#base", "tintindex": 0} + } + }, + { + "from": [9.5, 0, 9.5], + "to": [10.5, 1, 10.5], + "rotation": {"angle": 0, "axis": "y", "origin": [10, 8, 10]}, + "faces": { + "up": {"uv": [5, 6, 6, 7], "texture": "#base", "tintindex": 0} + } + }, + { + "from": [5.5, 0, 9.5], + "to": [6.5, 1, 10.5], + "rotation": {"angle": 0, "axis": "y", "origin": [6, 8, 10]}, + "faces": { + "up": {"uv": [9, 6, 10, 7], "texture": "#base", "tintindex": 0} + } + }, + { + "from": [5.5, 0, 5.5], + "to": [6.5, 1, 6.5], + "rotation": {"angle": 0, "axis": "y", "origin": [6, 8, 6]}, + "faces": { + "up": {"uv": [9, 8, 10, 9], "texture": "#base", "tintindex": 0} + } + }, + { + "from": [9.5, 0, 5.5], + "to": [10.5, 1, 6.5], + "rotation": {"angle": 0, "axis": "y", "origin": [10, 8, 6]}, + "faces": { + "up": {"uv": [5, 8, 6, 9], "texture": "#base", "tintindex": 0} + } + }, + { + "from": [6.5, 0, 5.5], + "to": [7.5, 1, 6.5], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 6]}, + "faces": { + "up": {"uv": [6, 8, 7, 9], "texture": "#08", "tintindex": 8} + } + }, + { + "from": [7.5, 0, 5.5], + "to": [8.5, 1, 6.5], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 6]}, + "faces": { + "up": {"uv": [7, 8, 8, 9], "texture": "#09", "tintindex": 9} + } + }, + { + "from": [8.5, 0, 5.5], + "to": [9.5, 1, 6.5], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 6]}, + "faces": { + "up": {"uv": [8, 8, 9, 9], "texture": "#10", "tintindex": 10} + } + }, + { + "from": [2.5, 0, 4.5], + "to": [13.5, 1, 5.5], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 5]}, + "faces": { + "up": {"uv": [2, 9, 13, 10], "texture": "#base", "tintindex": 0} + } + }, + { + "from": [4.5, 0.001, 2.5], + "to": [5.5, 1.001, 13.5], + "rotation": {"angle": 0, "axis": "y", "origin": [5, 8, 8]}, + "faces": { + "up": {"uv": [2, 9, 13, 10], "rotation": 270, "texture": "#base", "tintindex": 0} + } + }, + { + "from": [10.5, 0.001, 2.5], + "to": [11.5, 1.001, 13.5], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 8, 8]}, + "faces": { + "up": {"uv": [2, 9, 13, 10], "rotation": 270, "texture": "#base", "tintindex": 0} + } + }, + { + "from": [2.5, 0, 10.5], + "to": [13.5, 1, 11.5], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 11]}, + "faces": { + "up": {"uv": [2, 5, 13, 6], "texture": "#base", "tintindex": 0} + } + }, + { + "from": [6.5, 0, 9.5], + "to": [7.5, 1, 10.5], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 10]}, + "faces": { + "up": {"uv": [7, 6, 8, 7], "texture": "#02", "tintindex": 1} + } + }, + { + "from": [7.5, 0, 9.5], + "to": [8.5, 1, 10.5], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 10]}, + "faces": { + "up": {"uv": [7, 6, 8, 7], "texture": "#02", "tintindex": 2} + } + }, + { + "from": [8.5, 0, 9.5], + "to": [9.5, 1, 10.5], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 10]}, + "faces": { + "up": {"uv": [8, 6, 9, 7], "texture": "#03", "tintindex": 3} + } + }, + { + "from": [5.5, 0, 8.5], + "to": [6.5, 1, 9.5], + "rotation": {"angle": 0, "axis": "y", "origin": [6, 8, 8]}, + "faces": { + "up": {"uv": [6, 8, 7, 9], "rotation": 270, "texture": "#08", "tintindex": 8} + } + }, + { + "from": [5.5, 0, 7.5], + "to": [6.5, 1, 8.5], + "rotation": {"angle": 0, "axis": "y", "origin": [6, 8, 8]}, + "faces": { + "up": {"uv": [8, 7, 9, 8], "rotation": 270, "texture": "#06", "tintindex": 6} + } + }, + { + "from": [5.5, 0, 6.5], + "to": [6.5, 1, 7.5], + "rotation": {"angle": 0, "axis": "y", "origin": [6, 8, 8]}, + "faces": { + "up": {"uv": [8, 8, 9, 9], "rotation": 270, "texture": "#10", "tintindex": 10} + } + }, + { + "from": [5.5, 0, 8.5], + "to": [6.5, 1, 9.5], + "rotation": {"angle": 0, "axis": "y", "origin": [6, 8, 8]}, + "faces": { + "up": {"uv": [6, 8, 9, 9], "rotation": 270, "texture": "#08", "tintindex": 8} + } + }, + { + "from": [9.5, 0, 8.5], + "to": [10.5, 1, 9.5], + "rotation": {"angle": 0, "axis": "y", "origin": [10, 8, 8]}, + "faces": { + "up": {"uv": [7, 6, 8, 7], "rotation": 270, "texture": "#02", "tintindex": 1} + } + }, + { + "from": [9.5, 0, 7.5], + "to": [10.5, 1, 8.5], + "rotation": {"angle": 0, "axis": "y", "origin": [10, 8, 8]}, + "faces": { + "up": {"uv": [5, 7, 6, 8], "rotation": 270, "texture": "#04", "tintindex": 4} + } + }, + { + "from": [9.5, 0, 6.5], + "to": [10.5, 1, 7.5], + "rotation": {"angle": 0, "axis": "y", "origin": [10, 8, 8]}, + "faces": { + "up": {"uv": [8, 6, 9, 7], "rotation": 270, "texture": "#03", "tintindex": 3} + } + }, + { + "from": [8.5, 0, 6.5], + "to": [9.5, 1, 9.5], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 8]}, + "faces": { + "up": {"uv": [6, 7, 7, 8], "texture": "#05", "tintindex": 5} + } + }, + { + "from": [6.5, 0, 6.5], + "to": [7.5, 1, 9.5], + "rotation": {"angle": 0, "axis": "y", "origin": [7, 8, 8]}, + "faces": { + "up": {"uv": [8, 7, 9, 8], "texture": "#06", "tintindex": 6} + } + }, + { + "from": [7.5, 0, 8.5], + "to": [8.5, 1, 9.5], + "faces": { + "up": {"uv": [6, 7, 7, 8], "texture": "#05", "tintindex": 5} + } + }, + { + "from": [7.5, 0, 6.5], + "to": [8.5, 1, 7.5], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 6]}, + "faces": { + "up": {"uv": [8, 7, 9, 8], "texture": "#06", "tintindex": 6} + } + }, + { + "from": [7.5, -0.001, 11.5], + "to": [12.5, 0.999, 12.5], + "rotation": {"angle": 0, "axis": "y", "origin": [10, 8, 12]}, + "faces": { + "up": {"uv": [3, 5, 8, 6], "rotation": 180, "texture": "#base", "tintindex": 0} + } + }, + { + "from": [3.5, -0.001, 11.5], + "to": [7.5, 0.999, 12.5], + "rotation": {"angle": 0, "axis": "y", "origin": [5, 8, 12]}, + "faces": { + "up": {"uv": [8, 5, 12, 6], "rotation": 180, "texture": "#base", "tintindex": 0} + } + }, + { + "from": [5.5, 0, 12.5], + "to": [10.5, 1, 13.5], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 13]}, + "faces": { + "up": {"uv": [2, 5, 3, 10], "rotation": 90, "texture": "#base", "tintindex": 0} + } + }, + { + "from": [6.5, 0, 13.5], + "to": [11.5, 1, 14.5], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 14]}, + "faces": { + "east": {"uv": [10, 11, 11, 12], "texture": "#base", "tintindex": 0}, + "south": {"uv": [5, 12, 10, 13], "texture": "#base", "tintindex": 0}, + "up": {"uv": [5, 3, 10, 4], "texture": "#base", "tintindex": 0} + } + }, + { + "from": [4.5, 0, 13.5], + "to": [6.5, 1, 14.5], + "rotation": {"angle": 0, "axis": "y", "origin": [4, 8, 14]}, + "faces": { + "south": {"uv": [3, 11, 5, 12], "texture": "#base", "tintindex": 0}, + "west": {"uv": [2, 11, 3, 12], "texture": "#base", "tintindex": 0}, + "up": {"uv": [8, 3, 10, 4], "texture": "#base", "tintindex": 0} + } + }, + { + "from": [3.5, 0, 12.5], + "to": [4.5, 1, 13.5], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 8, 13]}, + "faces": { + "south": {"uv": [13, 10, 14, 11], "texture": "#base", "tintindex": 0}, + "west": {"uv": [13, 10, 14, 11], "texture": "#base", "tintindex": 0}, + "up": {"uv": [10, 4, 11, 5], "texture": "#base", "tintindex": 0} + } + }, + { + "from": [2.5, 0, 11.5], + "to": [3.5, 1, 12.5], + "rotation": {"angle": 0, "axis": "y", "origin": [1, 8, 12]}, + "faces": { + "south": {"uv": [12, 11, 13, 12], "texture": "#base", "tintindex": 0}, + "west": {"uv": [10, 11, 11, 12], "texture": "#base", "tintindex": 0}, + "up": {"uv": [11, 4, 12, 5], "texture": "#base", "tintindex": 0} + } + }, + { + "from": [12.5, 0, 11.5], + "to": [13.5, 1, 12.5], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 8, 12]}, + "faces": { + "east": {"uv": [13, 10, 14, 11], "texture": "#base", "tintindex": 0}, + "south": {"uv": [13, 10, 14, 11], "texture": "#base", "tintindex": 0}, + "up": {"uv": [2, 4, 3, 5], "texture": "#base", "tintindex": 0} + } + }, + { + "from": [11.5, 0, 12.5], + "to": [12.5, 1, 13.5], + "rotation": {"angle": 0, "axis": "y", "origin": [10, 8, 13]}, + "faces": { + "east": {"uv": [12, 11, 13, 12], "texture": "#base", "tintindex": 0}, + "south": {"uv": [11, 11, 12, 12], "texture": "#base", "tintindex": 0}, + "up": {"uv": [4, 4, 5, 5], "texture": "#base", "tintindex": 0} + } + }, + { + "from": [11.5, -0.001, 5.5], + "to": [12.5, 0.999, 10.5], + "rotation": {"angle": 0, "axis": "y", "origin": [12, 8, 8]}, + "faces": { + "up": {"uv": [5, 4, 10, 5], "rotation": 270, "texture": "#base", "tintindex": 0} + } + }, + { + "from": [11.5, -0.001, 3.5], + "to": [12.5, 0.999, 4.5], + "rotation": {"angle": 0, "axis": "y", "origin": [12, 8, 6]}, + "faces": { + "up": {"uv": [2, 9, 3, 10], "rotation": 270, "texture": "#base", "tintindex": 0} + } + }, + { + "from": [12.5, 0, 5.5], + "to": [13.5, 1, 10.5], + "rotation": {"angle": 0, "axis": "y", "origin": [13, 8, 8]}, + "faces": { + "up": {"uv": [2, 5, 3, 10], "texture": "#base", "tintindex": 0} + } + }, + { + "from": [13.5, 0, 4.5], + "to": [14.5, 1, 9.5], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 8, 7]}, + "faces": { + "north": {"uv": [10, 11, 11, 12], "texture": "#base", "tintindex": 0}, + "east": {"uv": [5, 12, 10, 13], "texture": "#base", "tintindex": 0}, + "up": {"uv": [5, 3, 10, 4], "rotation": 270, "texture": "#base", "tintindex": 0} + } + }, + { + "from": [13.5, 0, 9.5], + "to": [14.5, 1, 11.5], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 8, 12]}, + "faces": { + "east": {"uv": [3, 11, 5, 12], "texture": "#base", "tintindex": 0}, + "south": {"uv": [2, 11, 3, 12], "texture": "#base", "tintindex": 0}, + "up": {"uv": [8, 3, 10, 4], "rotation": 270, "texture": "#base", "tintindex": 0} + } + }, + { + "from": [11.5, 0, 2.5], + "to": [12.5, 1, 3.5], + "rotation": {"angle": 0, "axis": "y", "origin": [12, 8, 5]}, + "faces": { + "north": {"uv": [11, 11, 12, 12], "texture": "#base", "tintindex": 0}, + "east": {"uv": [10, 11, 11, 12], "texture": "#base", "tintindex": 0}, + "up": {"uv": [1, 5, 2, 6], "rotation": 270, "texture": "#base", "tintindex": 0} + } + }, + { + "from": [12.5, 0, 3.5], + "to": [13.5, 1, 4.5], + "rotation": {"angle": 0, "axis": "y", "origin": [13, 8, 6]}, + "faces": { + "north": {"uv": [12, 11, 13, 12], "texture": "#base", "tintindex": 0}, + "east": {"uv": [11, 11, 12, 12], "texture": "#base", "tintindex": 0}, + "up": {"uv": [2, 4, 3, 5], "rotation": 270, "texture": "#base", "tintindex": 0} + } + }, + { + "from": [5.5, -0.001, 3.5], + "to": [10.5, 0.999, 4.5], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 4.1]}, + "faces": { + "up": {"uv": [5, 10, 10, 11], "rotation": 180, "texture": "#base", "tintindex": 0} + } + }, + { + "from": [3.5, -0.001, 3.5], + "to": [4.5, 0.999, 4.5], + "rotation": {"angle": 0, "axis": "y", "origin": [6, 8, 4]}, + "faces": { + "up": {"uv": [12, 9, 13, 10], "rotation": 180, "texture": "#base", "tintindex": 0} + } + }, + { + "from": [5.5, 0, 2.5], + "to": [10.5, 1, 3.5], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 3]}, + "faces": { + "up": {"uv": [2, 5, 3, 10], "rotation": 270, "texture": "#base", "tintindex": 0} + } + }, + { + "from": [6.5, 0, 1.5], + "to": [11.5, 1, 2.5], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 2]}, + "faces": { + "north": {"uv": [5, 12, 10, 13], "texture": "#base", "tintindex": 0}, + "east": {"uv": [12, 11, 13, 12], "texture": "#base", "tintindex": 0}, + "up": {"uv": [5, 3, 10, 4], "rotation": 180, "texture": "#base", "tintindex": 0} + } + }, + { + "from": [4.5, 0, 1.5], + "to": [6.5, 1, 2.5], + "rotation": {"angle": 0, "axis": "y", "origin": [7, 8, 2]}, + "faces": { + "north": {"uv": [10, 11, 12, 12], "texture": "#base", "tintindex": 0}, + "west": {"uv": [9, 12, 10, 13], "texture": "#base", "tintindex": 0}, + "up": {"uv": [8, 3, 10, 4], "rotation": 180, "texture": "#base", "tintindex": 0} + } + }, + { + "from": [2.5, 0, 3.5], + "to": [3.5, 1, 4.5], + "rotation": {"angle": 0, "axis": "y", "origin": [5, 8, 4]}, + "faces": { + "north": {"uv": [12, 11, 13, 12], "texture": "#base", "tintindex": 0}, + "west": {"uv": [12, 11, 13, 12], "texture": "#base", "tintindex": 0}, + "up": {"uv": [1, 5, 2, 6], "rotation": 180, "texture": "#base", "tintindex": 0} + } + }, + { + "from": [3.5, 0, 2.5], + "to": [4.5, 1, 3.5], + "rotation": {"angle": 0, "axis": "y", "origin": [6, 8, 3]}, + "faces": { + "north": {"uv": [12, 11, 13, 12], "texture": "#base", "tintindex": 0}, + "west": {"uv": [11, 11, 12, 12], "texture": "#base", "tintindex": 0}, + "up": {"uv": [12, 10, 13, 11], "rotation": 180, "texture": "#base", "tintindex": 0} + } + }, + { + "from": [3.5, -0.001, 5.5], + "to": [4.5, 0.999, 10.5], + "rotation": {"angle": 0, "axis": "y", "origin": [4, 8, 8.1]}, + "faces": { + "up": {"uv": [11, 5, 12, 10], "texture": "#base", "tintindex": 0} + } + }, + { + "from": [2.5, 0, 5.5], + "to": [3.5, 1, 10.5], + "rotation": {"angle": 0, "axis": "y", "origin": [3, 8, 8]}, + "faces": { + "up": {"uv": [12, 5, 13, 10], "rotation": 180, "texture": "#base", "tintindex": 0} + } + }, + { + "from": [1.5, 0, 6.5], + "to": [2.5, 1, 11.5], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 8, 9]}, + "faces": { + "south": {"uv": [13, 10, 14, 11], "texture": "#base", "tintindex": 0}, + "west": {"uv": [5, 12, 10, 13], "texture": "#base", "tintindex": 0}, + "up": {"uv": [5, 3, 10, 4], "rotation": 90, "texture": "#base", "tintindex": 0} + } + }, + { + "from": [1.5, 0, 4.5], + "to": [2.5, 1, 6.5], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 8, 4]}, + "faces": { + "north": {"uv": [13, 10, 14, 11], "texture": "#base", "tintindex": 0}, + "west": {"uv": [10, 11, 12, 12], "texture": "#base", "tintindex": 0}, + "up": {"uv": [8, 3, 10, 4], "rotation": 90, "texture": "#base", "tintindex": 0} + } + } + ], + "gui_light": "front", + "display": { + "thirdperson_righthand": { + "rotation": [38, 0, 0], + "translation": [0, 1.75, 0.75], + "scale": [0.5, 0.5, 0.5] + }, + "thirdperson_lefthand": { + "rotation": [38, 0, 0], + "translation": [0, 1.75, 0.75], + "scale": [0.5, 0.5, 0.5] + }, + "firstperson_righthand": { + "rotation": [87, -19, 41], + "translation": [0, 4.25, 0] + }, + "firstperson_lefthand": { + "rotation": [87, -19, 41], + "translation": [0, 4.25, 0] + }, + "ground": { + "translation": [0, 7.5, 0] + }, + "gui": { + "rotation": [90, 0, 0] + }, + "head": { + "translation": [0, 14.5, 0] + }, + "fixed": { + "rotation": [-90, 0, 0], + "translation": [0, 0, -8] + } + }, + "groups": [ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10, + 11, + 12, + 13, + 14, + 15, + 16, + 17, + 18, + 19, + 20, + 21, + 22, + 23, + 24, + 25, + { + "name": "group", + "origin": [10, 8, 12], + "color": 0, + "children": [26, 27, 28, 29, 30, 31, 32, 33, 34] + }, + { + "name": "group", + "origin": [10, 8, 12], + "color": 0, + "children": [35, 36, 37, 38, 39, 40, 41] + }, + { + "name": "group", + "origin": [10, 8, 12], + "color": 0, + "children": [42, 43, 44, 45, 46, 47, 48] + }, + { + "name": "group", + "origin": [10, 8, 12], + "color": 0, + "children": [49, 50, 51, 52] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/resourcepacks/rounddiscs/pack.mcmeta b/src/main/resources/resourcepacks/rounddiscs/pack.mcmeta index a0c8df3..c149222 100755 --- a/src/main/resources/resourcepacks/rounddiscs/pack.mcmeta +++ b/src/main/resources/resourcepacks/rounddiscs/pack.mcmeta @@ -1,6 +1,6 @@ { "pack": { - "pack_format": 8, + "pack_format": 9, "description": "§2Makes the spinning discs on Jukeboxes round" } }