From 6f551660c78a6699461b96daf9d8fbf05a5d6572 Mon Sep 17 00:00:00 2001 From: Shadowfacts Date: Sat, 1 Jul 2017 19:27:50 -0400 Subject: [PATCH] Code cleanup --- .../kotlin/net/shadowfacts/extrahoppers/EHCreativeTab.kt | 4 +--- .../kotlin/net/shadowfacts/extrahoppers/ExtraHoppers.kt | 4 ---- src/main/kotlin/net/shadowfacts/extrahoppers/Reference.kt | 2 +- .../kotlin/net/shadowfacts/extrahoppers/block/BlockTE.kt | 4 +--- .../extrahoppers/block/advanced/BlockAdvancedHopper.kt | 4 +--- .../extrahoppers/block/base/BlockHopperBase.kt | 7 ++++--- .../extrahoppers/block/inverted/BlockInvertedHopper.kt | 4 +--- .../shadowfacts/extrahoppers/event/ClientEventHandler.kt | 4 ++++ .../extrahoppers/gui/element/UIFilterButton.kt | 8 ++------ .../extrahoppers/gui/element/UIFluidIndicator.kt | 4 +--- .../shadowfacts/extrahoppers/util/filter/NoOpFilter.kt | 8 ++------ 11 files changed, 18 insertions(+), 35 deletions(-) diff --git a/src/main/kotlin/net/shadowfacts/extrahoppers/EHCreativeTab.kt b/src/main/kotlin/net/shadowfacts/extrahoppers/EHCreativeTab.kt index 372e711..c4f25d1 100644 --- a/src/main/kotlin/net/shadowfacts/extrahoppers/EHCreativeTab.kt +++ b/src/main/kotlin/net/shadowfacts/extrahoppers/EHCreativeTab.kt @@ -8,8 +8,6 @@ import net.minecraft.item.ItemStack */ object EHCreativeTab: CreativeTabs(MOD_ID) { - override fun getTabIconItem(): ItemStack { - return ItemStack(ExtraHoppers.blocks.woodenHopper) - } + override fun getTabIconItem() = ItemStack(ExtraHoppers.blocks.woodenHopper) } \ No newline at end of file diff --git a/src/main/kotlin/net/shadowfacts/extrahoppers/ExtraHoppers.kt b/src/main/kotlin/net/shadowfacts/extrahoppers/ExtraHoppers.kt index 38e6321..36d4012 100644 --- a/src/main/kotlin/net/shadowfacts/extrahoppers/ExtraHoppers.kt +++ b/src/main/kotlin/net/shadowfacts/extrahoppers/ExtraHoppers.kt @@ -3,7 +3,6 @@ package net.shadowfacts.extrahoppers import net.minecraft.block.Block import net.minecraft.item.Item import net.minecraftforge.client.event.ModelRegistryEvent -import net.minecraftforge.common.MinecraftForge import net.minecraftforge.event.RegistryEvent import net.minecraftforge.fml.client.registry.ClientRegistry import net.minecraftforge.fml.common.Mod @@ -20,7 +19,6 @@ import net.shadowfacts.extrahoppers.block.fluid.TileEntityFluidHopper import net.shadowfacts.extrahoppers.block.inverted.TileEntityInvertedHopper import net.shadowfacts.extrahoppers.block.wooden.TileEntityWoodenHopper import net.shadowfacts.extrahoppers.block.wooden_fluid.TileEntityWoodenFluidHopper -import net.shadowfacts.extrahoppers.event.ClientEventHandler import net.shadowfacts.extrahoppers.gui.GUIHandler /** @@ -45,8 +43,6 @@ object ExtraHoppers { fun preInitClient(event: FMLPreInitializationEvent) { ClientRegistry.bindTileEntitySpecialRenderer(TileEntityFluidHopper::class.java, TESRFluidHopper) ClientRegistry.bindTileEntitySpecialRenderer(TileEntityWoodenFluidHopper::class.java, TESRFluidHopper) - - MinecraftForge.EVENT_BUS.register(ClientEventHandler) } @Mod.EventBusSubscriber diff --git a/src/main/kotlin/net/shadowfacts/extrahoppers/Reference.kt b/src/main/kotlin/net/shadowfacts/extrahoppers/Reference.kt index 88cc217..c7e9ac0 100644 --- a/src/main/kotlin/net/shadowfacts/extrahoppers/Reference.kt +++ b/src/main/kotlin/net/shadowfacts/extrahoppers/Reference.kt @@ -5,4 +5,4 @@ package net.shadowfacts.extrahoppers */ const val MOD_ID = "extrahoppers" const val NAME = "Extra Hoppers" -const val VERSION = "@VERSION@" \ No newline at end of file +const val VERSION = "2.0.0-a1" \ No newline at end of file diff --git a/src/main/kotlin/net/shadowfacts/extrahoppers/block/BlockTE.kt b/src/main/kotlin/net/shadowfacts/extrahoppers/block/BlockTE.kt index de97f91..1ff2105 100644 --- a/src/main/kotlin/net/shadowfacts/extrahoppers/block/BlockTE.kt +++ b/src/main/kotlin/net/shadowfacts/extrahoppers/block/BlockTE.kt @@ -21,9 +21,7 @@ abstract class BlockTE(name: String, material: Material abstract override fun createTileEntity(world: World, state: IBlockState): TE - override fun hasTileEntity(state: IBlockState): Boolean { - return true - } + override fun hasTileEntity(state: IBlockState) = true fun getTileEntity(world: IBlockAccess, pos: BlockPos): TE { return world.getTileEntity(pos) as TE diff --git a/src/main/kotlin/net/shadowfacts/extrahoppers/block/advanced/BlockAdvancedHopper.kt b/src/main/kotlin/net/shadowfacts/extrahoppers/block/advanced/BlockAdvancedHopper.kt index aa555f9..21a9794 100644 --- a/src/main/kotlin/net/shadowfacts/extrahoppers/block/advanced/BlockAdvancedHopper.kt +++ b/src/main/kotlin/net/shadowfacts/extrahoppers/block/advanced/BlockAdvancedHopper.kt @@ -24,9 +24,7 @@ class BlockAdvancedHopper(inverted: Boolean): BlockHopperBase(val inverted: Boolean, va } @Deprecated("") - override fun isOpaqueCube(state: IBlockState?): Boolean { - return false - } + override fun isOpaqueCube(state: IBlockState) = false + + @Deprecated("") + override fun isFullCube(state: IBlockState?) = false } \ No newline at end of file diff --git a/src/main/kotlin/net/shadowfacts/extrahoppers/block/inverted/BlockInvertedHopper.kt b/src/main/kotlin/net/shadowfacts/extrahoppers/block/inverted/BlockInvertedHopper.kt index c76ad0b..a91a4ed 100644 --- a/src/main/kotlin/net/shadowfacts/extrahoppers/block/inverted/BlockInvertedHopper.kt +++ b/src/main/kotlin/net/shadowfacts/extrahoppers/block/inverted/BlockInvertedHopper.kt @@ -25,9 +25,7 @@ class BlockInvertedHopper: BlockHopperBase(true, false } @Deprecated("") - override fun hasComparatorInputOverride(state: IBlockState): Boolean { - return true - } + override fun hasComparatorInputOverride(state: IBlockState) = true @Deprecated("") override fun getComparatorInputOverride(state: IBlockState, world: World, pos: BlockPos): Int { diff --git a/src/main/kotlin/net/shadowfacts/extrahoppers/event/ClientEventHandler.kt b/src/main/kotlin/net/shadowfacts/extrahoppers/event/ClientEventHandler.kt index 9e008ba..67f16a9 100644 --- a/src/main/kotlin/net/shadowfacts/extrahoppers/event/ClientEventHandler.kt +++ b/src/main/kotlin/net/shadowfacts/extrahoppers/event/ClientEventHandler.kt @@ -4,15 +4,19 @@ import net.minecraft.client.resources.I18n import net.minecraft.util.text.TextFormatting import net.minecraftforge.event.entity.player.ItemTooltipEvent import net.minecraftforge.fluids.capability.CapabilityFluidHandler.FLUID_HANDLER_ITEM_CAPABILITY +import net.minecraftforge.fml.common.Mod import net.minecraftforge.fml.common.eventhandler.SubscribeEvent import net.shadowfacts.extrahoppers.EHConfig +import net.shadowfacts.extrahoppers.MOD_ID import net.shadowfacts.extrahoppers.gui.GUIHandler /** * @author shadowfacts */ +@Mod.EventBusSubscriber(modid = MOD_ID) object ClientEventHandler { + @JvmStatic @SubscribeEvent fun itemTooltip(event: ItemTooltipEvent) { if (GUIHandler.woodenFluidHopperOpen) { diff --git a/src/main/kotlin/net/shadowfacts/extrahoppers/gui/element/UIFilterButton.kt b/src/main/kotlin/net/shadowfacts/extrahoppers/gui/element/UIFilterButton.kt index f62bc4f..10225dd 100644 --- a/src/main/kotlin/net/shadowfacts/extrahoppers/gui/element/UIFilterButton.kt +++ b/src/main/kotlin/net/shadowfacts/extrahoppers/gui/element/UIFilterButton.kt @@ -12,13 +12,9 @@ import net.shadowfacts.shadowmc.util.MouseButton //TODO: move me to ShadowMC class UIFilterButton(val callback: (UIFilterButton) -> Unit, id: String, vararg classes: String): UIButtonBase("", id, *classes) { - override fun getMinDimensions(): UIDimensions { - return preferredDimensions - } + override fun getMinDimensions() = preferredDimensions - override fun getPreferredDimensions(): UIDimensions { - return UIDimensions(20, 20) - } + override fun getPreferredDimensions() = UIDimensions(20, 20) override fun handlePress(mouseX: Int, mouseY: Int, button: MouseButton?): Boolean { callback(this) diff --git a/src/main/kotlin/net/shadowfacts/extrahoppers/gui/element/UIFluidIndicator.kt b/src/main/kotlin/net/shadowfacts/extrahoppers/gui/element/UIFluidIndicator.kt index 2d43324..0f7774f 100644 --- a/src/main/kotlin/net/shadowfacts/extrahoppers/gui/element/UIFluidIndicator.kt +++ b/src/main/kotlin/net/shadowfacts/extrahoppers/gui/element/UIFluidIndicator.kt @@ -9,8 +9,6 @@ import net.shadowfacts.shadowmc.ui.element.UIFluidIndicator */ class UIFluidIndicator(tank: IFluidTank, id: String, vararg classes: String): UIFluidIndicator(tank, id, *classes) { - override fun getPreferredDimensions(): UIDimensions { - return UIDimensions(20, 73) - } + override fun getPreferredDimensions() = UIDimensions(20, 73) } \ No newline at end of file diff --git a/src/main/kotlin/net/shadowfacts/extrahoppers/util/filter/NoOpFilter.kt b/src/main/kotlin/net/shadowfacts/extrahoppers/util/filter/NoOpFilter.kt index 2b58d61..085baa7 100644 --- a/src/main/kotlin/net/shadowfacts/extrahoppers/util/filter/NoOpFilter.kt +++ b/src/main/kotlin/net/shadowfacts/extrahoppers/util/filter/NoOpFilter.kt @@ -11,13 +11,9 @@ object NoOpFilter: Filter() { override fun setFromStack(i: Int, stack: ItemStack) { } - override fun accepts(stack: Any): Boolean { - return true - } + override fun accepts(stack: Any) = true - override fun writeToNBT(tag: NBTTagCompound): NBTTagCompound { - return tag - } + override fun writeToNBT(tag: NBTTagCompound) = tag override fun readFromNBT(tag: NBTTagCompound) { }