From 40a6ec31fec647382a69d3093420f5a03e55db8b Mon Sep 17 00:00:00 2001 From: EngineMachiner Date: Mon, 2 Oct 2023 23:33:13 -0500 Subject: [PATCH] =?UTF-8?q?=F0=9F=A7=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../honkytones/mixin/player/ClientPlayerMixin.java | 2 -- src/main/kotlin/com/enginemachiner/honkytones/Item.kt | 5 +---- .../honkytones/blocks/musicplayer/MusicPlayerBlock.kt | 6 +++--- .../enginemachiner/honkytones/blocks/musicplayer/Screen.kt | 1 - .../honkytones/items/console/RecordingScreen.kt | 5 +++-- .../com/enginemachiner/honkytones/items/console/Screen.kt | 1 - .../com/enginemachiner/honkytones/items/floppy/Screen.kt | 3 +-- .../honkytones/items/instruments/Instrument.kt | 1 - .../enginemachiner/honkytones/items/instruments/Screen.kt | 3 +-- .../honkytones/items/storage/MusicalStorage.kt | 1 - .../com/enginemachiner/honkytones/items/storage/Screen.kt | 3 +-- 11 files changed, 10 insertions(+), 21 deletions(-) diff --git a/src/main/java/com/enginemachiner/honkytones/mixin/player/ClientPlayerMixin.java b/src/main/java/com/enginemachiner/honkytones/mixin/player/ClientPlayerMixin.java index b487323..139f650 100644 --- a/src/main/java/com/enginemachiner/honkytones/mixin/player/ClientPlayerMixin.java +++ b/src/main/java/com/enginemachiner/honkytones/mixin/player/ClientPlayerMixin.java @@ -1,8 +1,6 @@ package com.enginemachiner.honkytones.mixin.player; import com.enginemachiner.honkytones.items.instruments.Instrument; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import net.minecraft.client.network.ClientPlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.world.World; diff --git a/src/main/kotlin/com/enginemachiner/honkytones/Item.kt b/src/main/kotlin/com/enginemachiner/honkytones/Item.kt index c472fa6..6c55c7e 100644 --- a/src/main/kotlin/com/enginemachiner/honkytones/Item.kt +++ b/src/main/kotlin/com/enginemachiner/honkytones/Item.kt @@ -9,15 +9,12 @@ import net.minecraft.entity.Entity import net.minecraft.entity.EquipmentSlot import net.minecraft.entity.LivingEntity import net.minecraft.entity.player.PlayerEntity -import net.minecraft.item.AirBlockItem +import net.minecraft.item.* import net.minecraft.item.Item import net.minecraft.item.ItemGroup -import net.minecraft.item.ItemStack import net.minecraft.item.ToolItem -import net.minecraft.item.ToolMaterial import net.minecraft.nbt.NbtCompound import net.minecraft.registry.Registries -import net.minecraft.registry.Registry import net.minecraft.registry.RegistryKey import net.minecraft.registry.RegistryKeys import net.minecraft.text.Text diff --git a/src/main/kotlin/com/enginemachiner/honkytones/blocks/musicplayer/MusicPlayerBlock.kt b/src/main/kotlin/com/enginemachiner/honkytones/blocks/musicplayer/MusicPlayerBlock.kt index 5022936..95ce2c0 100644 --- a/src/main/kotlin/com/enginemachiner/honkytones/blocks/musicplayer/MusicPlayerBlock.kt +++ b/src/main/kotlin/com/enginemachiner/honkytones/blocks/musicplayer/MusicPlayerBlock.kt @@ -1,7 +1,6 @@ package com.enginemachiner.honkytones.blocks.musicplayer import com.enginemachiner.honkytones.* -import com.enginemachiner.honkytones.BlockWithEntity import com.enginemachiner.honkytones.CanBeMuted.Companion.isMuted import com.enginemachiner.honkytones.Init.Companion.directories import com.enginemachiner.honkytones.Init.Companion.registerBlock @@ -31,7 +30,9 @@ import net.fabricmc.fabric.api.`object`.builder.v1.block.FabricBlockSettings import net.fabricmc.fabric.api.`object`.builder.v1.block.entity.FabricBlockEntityTypeBuilder import net.fabricmc.fabric.api.`object`.builder.v1.entity.FabricEntityTypeBuilder import net.fabricmc.fabric.api.screenhandler.v1.ExtendedScreenHandlerFactory -import net.minecraft.block.* +import net.minecraft.block.Block +import net.minecraft.block.BlockRenderType +import net.minecraft.block.BlockState import net.minecraft.block.entity.BlockEntity import net.minecraft.block.entity.BlockEntityTicker import net.minecraft.block.entity.BlockEntityType @@ -76,7 +77,6 @@ import net.minecraft.util.math.BlockPos import net.minecraft.util.math.Direction import net.minecraft.util.math.Vec3d import net.minecraft.world.World -import net.minecraft.world.explosion.Explosion import java.net.URL import javax.sound.midi.MidiSystem import javax.sound.midi.Sequencer diff --git a/src/main/kotlin/com/enginemachiner/honkytones/blocks/musicplayer/Screen.kt b/src/main/kotlin/com/enginemachiner/honkytones/blocks/musicplayer/Screen.kt index 09c5014..1db1f77 100644 --- a/src/main/kotlin/com/enginemachiner/honkytones/blocks/musicplayer/Screen.kt +++ b/src/main/kotlin/com/enginemachiner/honkytones/blocks/musicplayer/Screen.kt @@ -17,7 +17,6 @@ import net.minecraft.client.gui.screen.ingame.HandledScreens import net.minecraft.client.gui.widget.ButtonWidget import net.minecraft.client.gui.widget.SliderWidget import net.minecraft.client.render.GameRenderer -import net.minecraft.client.util.math.MatrixStack import net.minecraft.entity.player.PlayerEntity import net.minecraft.entity.player.PlayerInventory import net.minecraft.inventory.Inventory diff --git a/src/main/kotlin/com/enginemachiner/honkytones/items/console/RecordingScreen.kt b/src/main/kotlin/com/enginemachiner/honkytones/items/console/RecordingScreen.kt index d7adb00..16f9394 100644 --- a/src/main/kotlin/com/enginemachiner/honkytones/items/console/RecordingScreen.kt +++ b/src/main/kotlin/com/enginemachiner/honkytones/items/console/RecordingScreen.kt @@ -10,9 +10,10 @@ import net.minecraft.client.gui.Drawable import net.minecraft.client.gui.screen.Screen import net.minecraft.client.gui.widget.ButtonWidget import net.minecraft.client.gui.widget.TextFieldWidget -import net.minecraft.client.util.math.MatrixStack import net.minecraft.text.Text -import javax.sound.midi.* +import javax.sound.midi.MidiSystem +import javax.sound.midi.Sequence +import javax.sound.midi.Sequencer @Environment(EnvType.CLIENT) class RecordingScreen( private val screen: DigitalConsoleScreen ) : Screen( Text.of("RecordingScreen") ) { diff --git a/src/main/kotlin/com/enginemachiner/honkytones/items/console/Screen.kt b/src/main/kotlin/com/enginemachiner/honkytones/items/console/Screen.kt index e85097d..b5ab902 100644 --- a/src/main/kotlin/com/enginemachiner/honkytones/items/console/Screen.kt +++ b/src/main/kotlin/com/enginemachiner/honkytones/items/console/Screen.kt @@ -22,7 +22,6 @@ import net.minecraft.client.network.ClientPlayNetworkHandler import net.minecraft.client.option.KeyBinding import net.minecraft.client.render.GameRenderer import net.minecraft.client.util.InputUtil -import net.minecraft.client.util.math.MatrixStack import net.minecraft.entity.player.PlayerEntity import net.minecraft.entity.player.PlayerInventory import net.minecraft.inventory.Inventory diff --git a/src/main/kotlin/com/enginemachiner/honkytones/items/floppy/Screen.kt b/src/main/kotlin/com/enginemachiner/honkytones/items/floppy/Screen.kt index 9948f78..f57e918 100644 --- a/src/main/kotlin/com/enginemachiner/honkytones/items/floppy/Screen.kt +++ b/src/main/kotlin/com/enginemachiner/honkytones/items/floppy/Screen.kt @@ -2,8 +2,8 @@ package com.enginemachiner.honkytones.items.floppy import com.enginemachiner.honkytones.* import com.enginemachiner.honkytones.Init.Companion.MOD_NAME -import com.enginemachiner.honkytones.NBT.networkNBT import com.enginemachiner.honkytones.NBT.keepDisplay +import com.enginemachiner.honkytones.NBT.networkNBT import net.fabricmc.api.EnvType import net.fabricmc.api.Environment import net.minecraft.client.gui.DrawContext @@ -12,7 +12,6 @@ import net.minecraft.client.gui.screen.Screen import net.minecraft.client.gui.widget.ButtonWidget import net.minecraft.client.gui.widget.TextFieldWidget import net.minecraft.client.util.Clipboard -import net.minecraft.client.util.math.MatrixStack import net.minecraft.item.ItemStack import net.minecraft.text.Text diff --git a/src/main/kotlin/com/enginemachiner/honkytones/items/instruments/Instrument.kt b/src/main/kotlin/com/enginemachiner/honkytones/items/instruments/Instrument.kt index e383abb..3c2e6a9 100644 --- a/src/main/kotlin/com/enginemachiner/honkytones/items/instruments/Instrument.kt +++ b/src/main/kotlin/com/enginemachiner/honkytones/items/instruments/Instrument.kt @@ -39,7 +39,6 @@ import net.minecraft.entity.LivingEntity import net.minecraft.entity.attribute.EntityAttribute import net.minecraft.entity.attribute.EntityAttributeModifier import net.minecraft.entity.attribute.EntityAttributes -import net.minecraft.entity.damage.DamageSource import net.minecraft.entity.mob.HostileEntity import net.minecraft.entity.mob.MobEntity import net.minecraft.entity.player.PlayerEntity diff --git a/src/main/kotlin/com/enginemachiner/honkytones/items/instruments/Screen.kt b/src/main/kotlin/com/enginemachiner/honkytones/items/instruments/Screen.kt index fa61088..292517b 100644 --- a/src/main/kotlin/com/enginemachiner/honkytones/items/instruments/Screen.kt +++ b/src/main/kotlin/com/enginemachiner/honkytones/items/instruments/Screen.kt @@ -2,8 +2,8 @@ package com.enginemachiner.honkytones.items.instruments import com.enginemachiner.honkytones.* import com.enginemachiner.honkytones.Init.Companion.MOD_NAME -import com.enginemachiner.honkytones.NBT.networkNBT import com.enginemachiner.honkytones.NBT.keepDisplay +import com.enginemachiner.honkytones.NBT.networkNBT import net.fabricmc.api.EnvType import net.fabricmc.api.Environment import net.minecraft.client.gui.DrawContext @@ -13,7 +13,6 @@ import net.minecraft.client.gui.widget.ButtonWidget import net.minecraft.client.gui.widget.SliderWidget import net.minecraft.client.gui.widget.TextFieldWidget import net.minecraft.client.util.Clipboard -import net.minecraft.client.util.math.MatrixStack import net.minecraft.item.ItemStack import net.minecraft.nbt.NbtCompound import net.minecraft.text.Text diff --git a/src/main/kotlin/com/enginemachiner/honkytones/items/storage/MusicalStorage.kt b/src/main/kotlin/com/enginemachiner/honkytones/items/storage/MusicalStorage.kt index 41d51b9..c297356 100644 --- a/src/main/kotlin/com/enginemachiner/honkytones/items/storage/MusicalStorage.kt +++ b/src/main/kotlin/com/enginemachiner/honkytones/items/storage/MusicalStorage.kt @@ -15,7 +15,6 @@ import net.minecraft.block.entity.ChestBlockEntity import net.minecraft.client.MinecraftClient import net.minecraft.client.network.ClientPlayNetworkHandler import net.minecraft.client.render.VertexConsumerProvider -import net.minecraft.client.render.model.json.ModelTransformation import net.minecraft.client.render.model.json.ModelTransformationMode import net.minecraft.client.util.math.MatrixStack import net.minecraft.entity.Entity diff --git a/src/main/kotlin/com/enginemachiner/honkytones/items/storage/Screen.kt b/src/main/kotlin/com/enginemachiner/honkytones/items/storage/Screen.kt index 85a6472..74aa062 100644 --- a/src/main/kotlin/com/enginemachiner/honkytones/items/storage/Screen.kt +++ b/src/main/kotlin/com/enginemachiner/honkytones/items/storage/Screen.kt @@ -1,8 +1,8 @@ package com.enginemachiner.honkytones.items.storage import com.enginemachiner.honkytones.ModID -import com.enginemachiner.honkytones.lookupSlot import com.enginemachiner.honkytones.isModItem +import com.enginemachiner.honkytones.lookupSlot import com.mojang.blaze3d.systems.RenderSystem import net.fabricmc.api.EnvType import net.fabricmc.api.Environment @@ -10,7 +10,6 @@ import net.minecraft.client.gui.DrawContext import net.minecraft.client.gui.screen.ingame.HandledScreen import net.minecraft.client.gui.screen.ingame.HandledScreens import net.minecraft.client.render.GameRenderer -import net.minecraft.client.util.math.MatrixStack import net.minecraft.entity.player.PlayerEntity import net.minecraft.entity.player.PlayerInventory import net.minecraft.inventory.Inventory