diff --git a/src/main/java/com/teammoeg/steampowered/block/AlternatorBlock.java b/src/main/java/com/teammoeg/steampowered/content/alternator/AlternatorBlock.java similarity index 96% rename from src/main/java/com/teammoeg/steampowered/block/AlternatorBlock.java rename to src/main/java/com/teammoeg/steampowered/content/alternator/AlternatorBlock.java index 070eebe..4ff2971 100644 --- a/src/main/java/com/teammoeg/steampowered/block/AlternatorBlock.java +++ b/src/main/java/com/teammoeg/steampowered/content/alternator/AlternatorBlock.java @@ -1,11 +1,11 @@ -package com.teammoeg.steampowered.block; +package com.teammoeg.steampowered.content.alternator; import com.simibubi.create.content.contraptions.base.DirectionalKineticBlock; import com.simibubi.create.content.contraptions.base.IRotate; import com.simibubi.create.foundation.block.ITE; import com.simibubi.create.foundation.utility.VoxelShaper; +import com.teammoeg.steampowered.block.SPShapes; import com.teammoeg.steampowered.registrate.SPTiles; -import com.teammoeg.steampowered.tileentity.AlternatorTileEntity; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.item.BlockItemUseContext; diff --git a/src/main/java/com/teammoeg/steampowered/tileentity/AlternatorTileEntity.java b/src/main/java/com/teammoeg/steampowered/content/alternator/AlternatorTileEntity.java similarity index 98% rename from src/main/java/com/teammoeg/steampowered/tileentity/AlternatorTileEntity.java rename to src/main/java/com/teammoeg/steampowered/content/alternator/AlternatorTileEntity.java index daba08b..3f14835 100644 --- a/src/main/java/com/teammoeg/steampowered/tileentity/AlternatorTileEntity.java +++ b/src/main/java/com/teammoeg/steampowered/content/alternator/AlternatorTileEntity.java @@ -1,11 +1,10 @@ -package com.teammoeg.steampowered.tileentity; +package com.teammoeg.steampowered.content.alternator; import com.simibubi.create.AllBlocks; import com.simibubi.create.content.contraptions.base.KineticTileEntity; import com.simibubi.create.foundation.utility.Lang; import com.teammoeg.steampowered.SPConfig; import com.teammoeg.steampowered.SteamPowered; -import com.teammoeg.steampowered.block.AlternatorBlock; import com.teammoeg.steampowered.item.Multimeter; import net.minecraft.block.Block; import net.minecraft.block.BlockState; diff --git a/src/main/java/com/teammoeg/steampowered/tileentity/InternalEnergyStorage.java b/src/main/java/com/teammoeg/steampowered/content/alternator/InternalEnergyStorage.java similarity index 98% rename from src/main/java/com/teammoeg/steampowered/tileentity/InternalEnergyStorage.java rename to src/main/java/com/teammoeg/steampowered/content/alternator/InternalEnergyStorage.java index b087cc2..8fc21a7 100644 --- a/src/main/java/com/teammoeg/steampowered/tileentity/InternalEnergyStorage.java +++ b/src/main/java/com/teammoeg/steampowered/content/alternator/InternalEnergyStorage.java @@ -1,4 +1,4 @@ -package com.teammoeg.steampowered.tileentity; +package com.teammoeg.steampowered.content.alternator; import net.minecraft.nbt.CompoundNBT; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/com/teammoeg/steampowered/block/boiler/BoilerBlock.java b/src/main/java/com/teammoeg/steampowered/content/boiler/BoilerBlock.java similarity index 85% rename from src/main/java/com/teammoeg/steampowered/block/boiler/BoilerBlock.java rename to src/main/java/com/teammoeg/steampowered/content/boiler/BoilerBlock.java index 7f9200e..fff2de3 100644 --- a/src/main/java/com/teammoeg/steampowered/block/boiler/BoilerBlock.java +++ b/src/main/java/com/teammoeg/steampowered/content/boiler/BoilerBlock.java @@ -1,4 +1,4 @@ -package com.teammoeg.steampowered.block.boiler; +package com.teammoeg.steampowered.content.boiler; import net.minecraft.block.Block; import net.minecraft.block.BlockState; diff --git a/src/main/java/com/teammoeg/steampowered/tileentity/boiler/BoilerTileEntity.java b/src/main/java/com/teammoeg/steampowered/content/boiler/BoilerTileEntity.java similarity index 97% rename from src/main/java/com/teammoeg/steampowered/tileentity/boiler/BoilerTileEntity.java rename to src/main/java/com/teammoeg/steampowered/content/boiler/BoilerTileEntity.java index 581f6af..19b169f 100644 --- a/src/main/java/com/teammoeg/steampowered/tileentity/boiler/BoilerTileEntity.java +++ b/src/main/java/com/teammoeg/steampowered/content/boiler/BoilerTileEntity.java @@ -1,8 +1,8 @@ -package com.teammoeg.steampowered.tileentity.boiler; +package com.teammoeg.steampowered.content.boiler; import com.simibubi.create.content.contraptions.goggles.IHaveGoggleInformation; import com.teammoeg.steampowered.FluidRegistry; -import com.teammoeg.steampowered.tileentity.burner.IHeatReceiver; +import com.teammoeg.steampowered.content.burner.IHeatReceiver; import net.minecraft.block.BlockState; import net.minecraft.fluid.Fluids; import net.minecraft.nbt.CompoundNBT; diff --git a/src/main/java/com/teammoeg/steampowered/block/boiler/BronzeBoilerBlock.java b/src/main/java/com/teammoeg/steampowered/content/boiler/BronzeBoilerBlock.java similarity index 90% rename from src/main/java/com/teammoeg/steampowered/block/boiler/BronzeBoilerBlock.java rename to src/main/java/com/teammoeg/steampowered/content/boiler/BronzeBoilerBlock.java index a097fbc..8bc64bc 100644 --- a/src/main/java/com/teammoeg/steampowered/block/boiler/BronzeBoilerBlock.java +++ b/src/main/java/com/teammoeg/steampowered/content/boiler/BronzeBoilerBlock.java @@ -1,4 +1,4 @@ -package com.teammoeg.steampowered.block.boiler; +package com.teammoeg.steampowered.content.boiler; import com.teammoeg.steampowered.registrate.SPTiles; import net.minecraft.block.BlockState; diff --git a/src/main/java/com/teammoeg/steampowered/tileentity/boiler/BronzeBoilerTileEntity.java b/src/main/java/com/teammoeg/steampowered/content/boiler/BronzeBoilerTileEntity.java similarity index 83% rename from src/main/java/com/teammoeg/steampowered/tileentity/boiler/BronzeBoilerTileEntity.java rename to src/main/java/com/teammoeg/steampowered/content/boiler/BronzeBoilerTileEntity.java index 34638f2..0cacba2 100644 --- a/src/main/java/com/teammoeg/steampowered/tileentity/boiler/BronzeBoilerTileEntity.java +++ b/src/main/java/com/teammoeg/steampowered/content/boiler/BronzeBoilerTileEntity.java @@ -1,4 +1,4 @@ -package com.teammoeg.steampowered.tileentity.boiler; +package com.teammoeg.steampowered.content.boiler; import net.minecraft.tileentity.TileEntityType; diff --git a/src/main/java/com/teammoeg/steampowered/block/burner/BronzeBurnerBlock.java b/src/main/java/com/teammoeg/steampowered/content/burner/BronzeBurnerBlock.java similarity index 90% rename from src/main/java/com/teammoeg/steampowered/block/burner/BronzeBurnerBlock.java rename to src/main/java/com/teammoeg/steampowered/content/burner/BronzeBurnerBlock.java index 202e1b4..45ca101 100644 --- a/src/main/java/com/teammoeg/steampowered/block/burner/BronzeBurnerBlock.java +++ b/src/main/java/com/teammoeg/steampowered/content/burner/BronzeBurnerBlock.java @@ -1,4 +1,4 @@ -package com.teammoeg.steampowered.block.burner; +package com.teammoeg.steampowered.content.burner; import com.teammoeg.steampowered.registrate.SPTiles; import net.minecraft.block.BlockState; diff --git a/src/main/java/com/teammoeg/steampowered/tileentity/burner/BronzeBurnerTileEntity.java b/src/main/java/com/teammoeg/steampowered/content/burner/BronzeBurnerTileEntity.java similarity index 84% rename from src/main/java/com/teammoeg/steampowered/tileentity/burner/BronzeBurnerTileEntity.java rename to src/main/java/com/teammoeg/steampowered/content/burner/BronzeBurnerTileEntity.java index 6a27346..ee3daad 100644 --- a/src/main/java/com/teammoeg/steampowered/tileentity/burner/BronzeBurnerTileEntity.java +++ b/src/main/java/com/teammoeg/steampowered/content/burner/BronzeBurnerTileEntity.java @@ -1,4 +1,4 @@ -package com.teammoeg.steampowered.tileentity.burner; +package com.teammoeg.steampowered.content.burner; import net.minecraft.tileentity.TileEntityType; diff --git a/src/main/java/com/teammoeg/steampowered/block/burner/BurnerBlock.java b/src/main/java/com/teammoeg/steampowered/content/burner/BurnerBlock.java similarity index 98% rename from src/main/java/com/teammoeg/steampowered/block/burner/BurnerBlock.java rename to src/main/java/com/teammoeg/steampowered/content/burner/BurnerBlock.java index 24fce03..2767bfc 100644 --- a/src/main/java/com/teammoeg/steampowered/block/burner/BurnerBlock.java +++ b/src/main/java/com/teammoeg/steampowered/content/burner/BurnerBlock.java @@ -1,4 +1,4 @@ -package com.teammoeg.steampowered.block.burner; +package com.teammoeg.steampowered.content.burner; import net.minecraft.block.Block; import net.minecraft.block.BlockState; diff --git a/src/main/java/com/teammoeg/steampowered/tileentity/burner/BurnerTileEntity.java b/src/main/java/com/teammoeg/steampowered/content/burner/BurnerTileEntity.java similarity index 96% rename from src/main/java/com/teammoeg/steampowered/tileentity/burner/BurnerTileEntity.java rename to src/main/java/com/teammoeg/steampowered/content/burner/BurnerTileEntity.java index fcdad88..374e553 100644 --- a/src/main/java/com/teammoeg/steampowered/tileentity/burner/BurnerTileEntity.java +++ b/src/main/java/com/teammoeg/steampowered/content/burner/BurnerTileEntity.java @@ -1,8 +1,6 @@ -package com.teammoeg.steampowered.tileentity.burner; +package com.teammoeg.steampowered.content.burner; import com.simibubi.create.content.contraptions.goggles.IHaveGoggleInformation; -import com.teammoeg.steampowered.block.burner.BurnerBlock; -import com.teammoeg.steampowered.block.engine.SteamEngineBlock; import net.minecraft.block.BlockState; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipeType; diff --git a/src/main/java/com/teammoeg/steampowered/tileentity/burner/IHeatReceiver.java b/src/main/java/com/teammoeg/steampowered/content/burner/IHeatReceiver.java similarity index 59% rename from src/main/java/com/teammoeg/steampowered/tileentity/burner/IHeatReceiver.java rename to src/main/java/com/teammoeg/steampowered/content/burner/IHeatReceiver.java index 35383ba..042c817 100644 --- a/src/main/java/com/teammoeg/steampowered/tileentity/burner/IHeatReceiver.java +++ b/src/main/java/com/teammoeg/steampowered/content/burner/IHeatReceiver.java @@ -1,4 +1,4 @@ -package com.teammoeg.steampowered.tileentity.burner; +package com.teammoeg.steampowered.content.burner; public interface IHeatReceiver { public void commitHeat(float value); diff --git a/src/main/java/com/teammoeg/steampowered/block/MetalCogwheelBlock.java b/src/main/java/com/teammoeg/steampowered/content/cogwheel/MetalCogwheelBlock.java similarity index 94% rename from src/main/java/com/teammoeg/steampowered/block/MetalCogwheelBlock.java rename to src/main/java/com/teammoeg/steampowered/content/cogwheel/MetalCogwheelBlock.java index 34185e2..2d930a6 100644 --- a/src/main/java/com/teammoeg/steampowered/block/MetalCogwheelBlock.java +++ b/src/main/java/com/teammoeg/steampowered/content/cogwheel/MetalCogwheelBlock.java @@ -1,4 +1,4 @@ -package com.teammoeg.steampowered.block; +package com.teammoeg.steampowered.content.cogwheel; import com.simibubi.create.content.contraptions.relays.elementary.CogWheelBlock; import com.teammoeg.steampowered.registrate.SPTiles; diff --git a/src/main/java/com/teammoeg/steampowered/tileentity/MetalCogwheelTileEntity.java b/src/main/java/com/teammoeg/steampowered/content/cogwheel/MetalCogwheelTileEntity.java similarity index 86% rename from src/main/java/com/teammoeg/steampowered/tileentity/MetalCogwheelTileEntity.java rename to src/main/java/com/teammoeg/steampowered/content/cogwheel/MetalCogwheelTileEntity.java index 854e2b4..e41b7ae 100644 --- a/src/main/java/com/teammoeg/steampowered/tileentity/MetalCogwheelTileEntity.java +++ b/src/main/java/com/teammoeg/steampowered/content/cogwheel/MetalCogwheelTileEntity.java @@ -1,4 +1,4 @@ -package com.teammoeg.steampowered.tileentity; +package com.teammoeg.steampowered.content.cogwheel; import com.simibubi.create.content.contraptions.relays.elementary.SimpleKineticTileEntity; import net.minecraft.tileentity.TileEntityType; diff --git a/src/main/java/com/teammoeg/steampowered/block/engine/BronzeSteamEngineBlock.java b/src/main/java/com/teammoeg/steampowered/content/engine/BronzeSteamEngineBlock.java similarity index 84% rename from src/main/java/com/teammoeg/steampowered/block/engine/BronzeSteamEngineBlock.java rename to src/main/java/com/teammoeg/steampowered/content/engine/BronzeSteamEngineBlock.java index f681cd4..31c27e2 100644 --- a/src/main/java/com/teammoeg/steampowered/block/engine/BronzeSteamEngineBlock.java +++ b/src/main/java/com/teammoeg/steampowered/content/engine/BronzeSteamEngineBlock.java @@ -1,8 +1,7 @@ -package com.teammoeg.steampowered.block.engine; +package com.teammoeg.steampowered.content.engine; import com.simibubi.create.foundation.block.ITE; import com.teammoeg.steampowered.registrate.SPTiles; -import com.teammoeg.steampowered.tileentity.engine.BronzeSteamEngineTileEntity; import net.minecraft.block.BlockState; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.IBlockReader; diff --git a/src/main/java/com/teammoeg/steampowered/tileentity/engine/BronzeSteamEngineTileEntity.java b/src/main/java/com/teammoeg/steampowered/content/engine/BronzeSteamEngineTileEntity.java similarity index 94% rename from src/main/java/com/teammoeg/steampowered/tileentity/engine/BronzeSteamEngineTileEntity.java rename to src/main/java/com/teammoeg/steampowered/content/engine/BronzeSteamEngineTileEntity.java index d74e0ea..d8b9868 100644 --- a/src/main/java/com/teammoeg/steampowered/tileentity/engine/BronzeSteamEngineTileEntity.java +++ b/src/main/java/com/teammoeg/steampowered/content/engine/BronzeSteamEngineTileEntity.java @@ -1,4 +1,4 @@ -package com.teammoeg.steampowered.tileentity.engine; +package com.teammoeg.steampowered.content.engine; import com.teammoeg.steampowered.SPConfig; import com.teammoeg.steampowered.registrate.SPBlocks; diff --git a/src/main/java/com/teammoeg/steampowered/block/engine/CastIronSteamEngineBlock.java b/src/main/java/com/teammoeg/steampowered/content/engine/CastIronSteamEngineBlock.java similarity index 84% rename from src/main/java/com/teammoeg/steampowered/block/engine/CastIronSteamEngineBlock.java rename to src/main/java/com/teammoeg/steampowered/content/engine/CastIronSteamEngineBlock.java index 6e8002a..2e82641 100644 --- a/src/main/java/com/teammoeg/steampowered/block/engine/CastIronSteamEngineBlock.java +++ b/src/main/java/com/teammoeg/steampowered/content/engine/CastIronSteamEngineBlock.java @@ -1,8 +1,7 @@ -package com.teammoeg.steampowered.block.engine; +package com.teammoeg.steampowered.content.engine; import com.simibubi.create.foundation.block.ITE; import com.teammoeg.steampowered.registrate.SPTiles; -import com.teammoeg.steampowered.tileentity.engine.CastIronSteamEngineTileEntity; import net.minecraft.block.BlockState; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.IBlockReader; diff --git a/src/main/java/com/teammoeg/steampowered/tileentity/engine/CastIronSteamEngineTileEntity.java b/src/main/java/com/teammoeg/steampowered/content/engine/CastIronSteamEngineTileEntity.java similarity index 94% rename from src/main/java/com/teammoeg/steampowered/tileentity/engine/CastIronSteamEngineTileEntity.java rename to src/main/java/com/teammoeg/steampowered/content/engine/CastIronSteamEngineTileEntity.java index a5e8160..2148d21 100644 --- a/src/main/java/com/teammoeg/steampowered/tileentity/engine/CastIronSteamEngineTileEntity.java +++ b/src/main/java/com/teammoeg/steampowered/content/engine/CastIronSteamEngineTileEntity.java @@ -1,4 +1,4 @@ -package com.teammoeg.steampowered.tileentity.engine; +package com.teammoeg.steampowered.content.engine; import com.teammoeg.steampowered.SPConfig; import com.teammoeg.steampowered.registrate.SPBlocks; diff --git a/src/main/java/com/teammoeg/steampowered/block/engine/SteamEngineBlock.java b/src/main/java/com/teammoeg/steampowered/content/engine/SteamEngineBlock.java similarity index 98% rename from src/main/java/com/teammoeg/steampowered/block/engine/SteamEngineBlock.java rename to src/main/java/com/teammoeg/steampowered/content/engine/SteamEngineBlock.java index 33fd723..f7f2b02 100644 --- a/src/main/java/com/teammoeg/steampowered/block/engine/SteamEngineBlock.java +++ b/src/main/java/com/teammoeg/steampowered/content/engine/SteamEngineBlock.java @@ -1,4 +1,4 @@ -package com.teammoeg.steampowered.block.engine; +package com.teammoeg.steampowered.content.engine; import com.jozufozu.flywheel.core.PartialModel; import com.simibubi.create.AllBlockPartials; diff --git a/src/main/java/com/teammoeg/steampowered/tileentity/engine/SteamEngineTileEntity.java b/src/main/java/com/teammoeg/steampowered/content/engine/SteamEngineTileEntity.java similarity index 98% rename from src/main/java/com/teammoeg/steampowered/tileentity/engine/SteamEngineTileEntity.java rename to src/main/java/com/teammoeg/steampowered/content/engine/SteamEngineTileEntity.java index ed4115f..7f88fc5 100644 --- a/src/main/java/com/teammoeg/steampowered/tileentity/engine/SteamEngineTileEntity.java +++ b/src/main/java/com/teammoeg/steampowered/content/engine/SteamEngineTileEntity.java @@ -1,4 +1,4 @@ -package com.teammoeg.steampowered.tileentity.engine; +package com.teammoeg.steampowered.content.engine; import com.simibubi.create.content.contraptions.components.flywheel.FlywheelBlock; import com.simibubi.create.content.contraptions.components.flywheel.FlywheelTileEntity; @@ -6,7 +6,6 @@ import com.simibubi.create.content.contraptions.components.flywheel.engine.Engin import com.simibubi.create.content.contraptions.components.flywheel.engine.EngineTileEntity; import com.simibubi.create.content.contraptions.goggles.IHaveGoggleInformation; import com.teammoeg.steampowered.FluidRegistry; -import com.teammoeg.steampowered.block.engine.SteamEngineBlock; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.fluid.Fluid; diff --git a/src/main/java/com/teammoeg/steampowered/block/engine/SteelSteamEngineBlock.java b/src/main/java/com/teammoeg/steampowered/content/engine/SteelSteamEngineBlock.java similarity index 84% rename from src/main/java/com/teammoeg/steampowered/block/engine/SteelSteamEngineBlock.java rename to src/main/java/com/teammoeg/steampowered/content/engine/SteelSteamEngineBlock.java index 8bdc20b..d323361 100644 --- a/src/main/java/com/teammoeg/steampowered/block/engine/SteelSteamEngineBlock.java +++ b/src/main/java/com/teammoeg/steampowered/content/engine/SteelSteamEngineBlock.java @@ -1,8 +1,7 @@ -package com.teammoeg.steampowered.block.engine; +package com.teammoeg.steampowered.content.engine; import com.simibubi.create.foundation.block.ITE; import com.teammoeg.steampowered.registrate.SPTiles; -import com.teammoeg.steampowered.tileentity.engine.SteelSteamEngineTileEntity; import net.minecraft.block.BlockState; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.IBlockReader; diff --git a/src/main/java/com/teammoeg/steampowered/tileentity/engine/SteelSteamEngineTileEntity.java b/src/main/java/com/teammoeg/steampowered/content/engine/SteelSteamEngineTileEntity.java similarity index 94% rename from src/main/java/com/teammoeg/steampowered/tileentity/engine/SteelSteamEngineTileEntity.java rename to src/main/java/com/teammoeg/steampowered/content/engine/SteelSteamEngineTileEntity.java index 786b1dc..f179bd6 100644 --- a/src/main/java/com/teammoeg/steampowered/tileentity/engine/SteelSteamEngineTileEntity.java +++ b/src/main/java/com/teammoeg/steampowered/content/engine/SteelSteamEngineTileEntity.java @@ -1,4 +1,4 @@ -package com.teammoeg.steampowered.tileentity.engine; +package com.teammoeg.steampowered.content.engine; import com.teammoeg.steampowered.SPConfig; import com.teammoeg.steampowered.registrate.SPBlocks; diff --git a/src/main/java/com/teammoeg/steampowered/block/flywheel/BronzeSteamFlywheelBlock.java b/src/main/java/com/teammoeg/steampowered/content/flywheel/BronzeSteamFlywheelBlock.java similarity index 91% rename from src/main/java/com/teammoeg/steampowered/block/flywheel/BronzeSteamFlywheelBlock.java rename to src/main/java/com/teammoeg/steampowered/content/flywheel/BronzeSteamFlywheelBlock.java index 5af91ce..1f45bd7 100644 --- a/src/main/java/com/teammoeg/steampowered/block/flywheel/BronzeSteamFlywheelBlock.java +++ b/src/main/java/com/teammoeg/steampowered/content/flywheel/BronzeSteamFlywheelBlock.java @@ -1,4 +1,4 @@ -package com.teammoeg.steampowered.block.flywheel; +package com.teammoeg.steampowered.content.flywheel; import com.simibubi.create.content.contraptions.components.flywheel.FlywheelBlock; import com.teammoeg.steampowered.registrate.SPTiles; diff --git a/src/main/java/com/teammoeg/steampowered/block/flywheel/CastIronSteamFlywheelBlock.java b/src/main/java/com/teammoeg/steampowered/content/flywheel/CastIronSteamFlywheelBlock.java similarity index 91% rename from src/main/java/com/teammoeg/steampowered/block/flywheel/CastIronSteamFlywheelBlock.java rename to src/main/java/com/teammoeg/steampowered/content/flywheel/CastIronSteamFlywheelBlock.java index 3ff045c..3e26083 100644 --- a/src/main/java/com/teammoeg/steampowered/block/flywheel/CastIronSteamFlywheelBlock.java +++ b/src/main/java/com/teammoeg/steampowered/content/flywheel/CastIronSteamFlywheelBlock.java @@ -1,4 +1,4 @@ -package com.teammoeg.steampowered.block.flywheel; +package com.teammoeg.steampowered.content.flywheel; import com.simibubi.create.content.contraptions.components.flywheel.FlywheelBlock; import com.teammoeg.steampowered.registrate.SPTiles; diff --git a/src/main/java/com/teammoeg/steampowered/block/flywheel/SteelSteamFlywheelBlock.java b/src/main/java/com/teammoeg/steampowered/content/flywheel/SteelSteamFlywheelBlock.java similarity index 91% rename from src/main/java/com/teammoeg/steampowered/block/flywheel/SteelSteamFlywheelBlock.java rename to src/main/java/com/teammoeg/steampowered/content/flywheel/SteelSteamFlywheelBlock.java index eb86706..fe2b8c3 100644 --- a/src/main/java/com/teammoeg/steampowered/block/flywheel/SteelSteamFlywheelBlock.java +++ b/src/main/java/com/teammoeg/steampowered/content/flywheel/SteelSteamFlywheelBlock.java @@ -1,4 +1,4 @@ -package com.teammoeg.steampowered.block.flywheel; +package com.teammoeg.steampowered.content.flywheel; import com.simibubi.create.content.contraptions.components.flywheel.FlywheelBlock; import com.teammoeg.steampowered.registrate.SPTiles; diff --git a/src/main/java/com/teammoeg/steampowered/ponder/SPScenes.java b/src/main/java/com/teammoeg/steampowered/ponder/SPScenes.java index fbe5ed6..1fe561b 100644 --- a/src/main/java/com/teammoeg/steampowered/ponder/SPScenes.java +++ b/src/main/java/com/teammoeg/steampowered/ponder/SPScenes.java @@ -4,7 +4,7 @@ import com.simibubi.create.foundation.ponder.SceneBuilder; import com.simibubi.create.foundation.ponder.SceneBuildingUtil; import com.simibubi.create.foundation.ponder.Selection; import com.simibubi.create.foundation.ponder.content.PonderPalette; -import com.teammoeg.steampowered.block.engine.SteamEngineBlock; +import com.teammoeg.steampowered.content.engine.SteamEngineBlock; import com.teammoeg.steampowered.registrate.SPBlocks; import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/com/teammoeg/steampowered/registrate/SPBlocks.java b/src/main/java/com/teammoeg/steampowered/registrate/SPBlocks.java index 4133efe..8987a07 100644 --- a/src/main/java/com/teammoeg/steampowered/registrate/SPBlocks.java +++ b/src/main/java/com/teammoeg/steampowered/registrate/SPBlocks.java @@ -13,16 +13,16 @@ import com.simibubi.create.foundation.data.SharedProperties; import com.simibubi.create.repack.registrate.util.entry.BlockEntry; import com.teammoeg.steampowered.SPConfig; import com.teammoeg.steampowered.SteamPowered; -import com.teammoeg.steampowered.block.AlternatorBlock; -import com.teammoeg.steampowered.block.MetalCogwheelBlock; -import com.teammoeg.steampowered.block.boiler.BronzeBoilerBlock; -import com.teammoeg.steampowered.block.burner.BronzeBurnerBlock; -import com.teammoeg.steampowered.block.engine.BronzeSteamEngineBlock; -import com.teammoeg.steampowered.block.engine.CastIronSteamEngineBlock; -import com.teammoeg.steampowered.block.engine.SteelSteamEngineBlock; -import com.teammoeg.steampowered.block.flywheel.BronzeSteamFlywheelBlock; -import com.teammoeg.steampowered.block.flywheel.CastIronSteamFlywheelBlock; -import com.teammoeg.steampowered.block.flywheel.SteelSteamFlywheelBlock; +import com.teammoeg.steampowered.content.alternator.AlternatorBlock; +import com.teammoeg.steampowered.content.cogwheel.MetalCogwheelBlock; +import com.teammoeg.steampowered.content.boiler.BronzeBoilerBlock; +import com.teammoeg.steampowered.content.burner.BronzeBurnerBlock; +import com.teammoeg.steampowered.content.engine.BronzeSteamEngineBlock; +import com.teammoeg.steampowered.content.engine.CastIronSteamEngineBlock; +import com.teammoeg.steampowered.content.engine.SteelSteamEngineBlock; +import com.teammoeg.steampowered.content.flywheel.BronzeSteamFlywheelBlock; +import com.teammoeg.steampowered.content.flywheel.CastIronSteamFlywheelBlock; +import com.teammoeg.steampowered.content.flywheel.SteelSteamFlywheelBlock; import net.minecraft.block.AbstractBlock; import net.minecraft.block.Block; import net.minecraft.block.Blocks; diff --git a/src/main/java/com/teammoeg/steampowered/registrate/SPTiles.java b/src/main/java/com/teammoeg/steampowered/registrate/SPTiles.java index 42027df..83af570 100644 --- a/src/main/java/com/teammoeg/steampowered/registrate/SPTiles.java +++ b/src/main/java/com/teammoeg/steampowered/registrate/SPTiles.java @@ -14,13 +14,13 @@ import com.teammoeg.steampowered.client.render.AlternatorRenderer; import com.teammoeg.steampowered.client.render.BronzeFlywheelRenderer; import com.teammoeg.steampowered.client.render.CastIronFlywheelRenderer; import com.teammoeg.steampowered.client.render.SteelFlywheelRenderer; -import com.teammoeg.steampowered.tileentity.AlternatorTileEntity; -import com.teammoeg.steampowered.tileentity.MetalCogwheelTileEntity; -import com.teammoeg.steampowered.tileentity.boiler.BronzeBoilerTileEntity; -import com.teammoeg.steampowered.tileentity.burner.BronzeBurnerTileEntity; -import com.teammoeg.steampowered.tileentity.engine.BronzeSteamEngineTileEntity; -import com.teammoeg.steampowered.tileentity.engine.CastIronSteamEngineTileEntity; -import com.teammoeg.steampowered.tileentity.engine.SteelSteamEngineTileEntity; +import com.teammoeg.steampowered.content.alternator.AlternatorTileEntity; +import com.teammoeg.steampowered.content.cogwheel.MetalCogwheelTileEntity; +import com.teammoeg.steampowered.content.boiler.BronzeBoilerTileEntity; +import com.teammoeg.steampowered.content.burner.BronzeBurnerTileEntity; +import com.teammoeg.steampowered.content.engine.BronzeSteamEngineTileEntity; +import com.teammoeg.steampowered.content.engine.CastIronSteamEngineTileEntity; +import com.teammoeg.steampowered.content.engine.SteelSteamEngineTileEntity; public class SPTiles { private static final CreateRegistrate REGISTRATE = SteamPowered.registrate.get()