diff --git a/src/main/java/com/simibubi/create/AllBlocks.java b/src/main/java/com/simibubi/create/AllBlocks.java index 2612f5f28..61cef8a9a 100644 --- a/src/main/java/com/simibubi/create/AllBlocks.java +++ b/src/main/java/com/simibubi/create/AllBlocks.java @@ -8,42 +8,42 @@ import com.simibubi.create.foundation.block.RenderUtilityBlock; import com.simibubi.create.foundation.block.RenderUtilityDirectionalBlock; import com.simibubi.create.foundation.utility.Lang; import com.simibubi.create.modules.IModule; -import com.simibubi.create.modules.contraptions.generators.MotorBlock; -import com.simibubi.create.modules.contraptions.generators.WaterWheelBlock; -import com.simibubi.create.modules.contraptions.receivers.BasinBlock; -import com.simibubi.create.modules.contraptions.receivers.CrushingWheelBlock; -import com.simibubi.create.modules.contraptions.receivers.CrushingWheelControllerBlock; -import com.simibubi.create.modules.contraptions.receivers.DrillBlock; -import com.simibubi.create.modules.contraptions.receivers.DrillBlock.DrillHeadBlock; -import com.simibubi.create.modules.contraptions.receivers.HarvesterBlock; -import com.simibubi.create.modules.contraptions.receivers.HarvesterBlock.HarvesterBladeBlock; -import com.simibubi.create.modules.contraptions.receivers.MechanicalMixerBlock; -import com.simibubi.create.modules.contraptions.receivers.MechanicalMixerBlock.MechanicalMixerBlockItem; -import com.simibubi.create.modules.contraptions.receivers.MechanicalPressBlock; -import com.simibubi.create.modules.contraptions.receivers.SawBlock; -import com.simibubi.create.modules.contraptions.receivers.TurntableBlock; -import com.simibubi.create.modules.contraptions.receivers.constructs.LinearChassisBlock; -import com.simibubi.create.modules.contraptions.receivers.constructs.RadialChassisBlock; -import com.simibubi.create.modules.contraptions.receivers.constructs.bearing.MechanicalBearingBlock; -import com.simibubi.create.modules.contraptions.receivers.constructs.mounted.CartAssemblerBlock; -import com.simibubi.create.modules.contraptions.receivers.constructs.mounted.CartAssemblerBlock.MinecartAnchorBlock; -import com.simibubi.create.modules.contraptions.receivers.constructs.piston.MechanicalPistonBlock; -import com.simibubi.create.modules.contraptions.receivers.constructs.piston.MechanicalPistonHeadBlock; -import com.simibubi.create.modules.contraptions.receivers.constructs.piston.PistonPoleBlock; -import com.simibubi.create.modules.contraptions.receivers.crafter.MechanicalCrafterBlock; -import com.simibubi.create.modules.contraptions.receivers.fan.EncasedFanBlock; +import com.simibubi.create.modules.contraptions.components.actors.DrillBlock; +import com.simibubi.create.modules.contraptions.components.actors.HarvesterBlock; +import com.simibubi.create.modules.contraptions.components.actors.DrillBlock.DrillHeadBlock; +import com.simibubi.create.modules.contraptions.components.actors.HarvesterBlock.HarvesterBladeBlock; +import com.simibubi.create.modules.contraptions.components.constructs.LinearChassisBlock; +import com.simibubi.create.modules.contraptions.components.constructs.RadialChassisBlock; +import com.simibubi.create.modules.contraptions.components.constructs.bearing.MechanicalBearingBlock; +import com.simibubi.create.modules.contraptions.components.constructs.mounted.CartAssemblerBlock; +import com.simibubi.create.modules.contraptions.components.constructs.mounted.CartAssemblerBlock.MinecartAnchorBlock; +import com.simibubi.create.modules.contraptions.components.constructs.piston.MechanicalPistonBlock; +import com.simibubi.create.modules.contraptions.components.constructs.piston.MechanicalPistonHeadBlock; +import com.simibubi.create.modules.contraptions.components.constructs.piston.PistonPoleBlock; +import com.simibubi.create.modules.contraptions.components.crafter.MechanicalCrafterBlock; +import com.simibubi.create.modules.contraptions.components.crusher.CrushingWheelBlock; +import com.simibubi.create.modules.contraptions.components.crusher.CrushingWheelControllerBlock; +import com.simibubi.create.modules.contraptions.components.fan.EncasedFanBlock; +import com.simibubi.create.modules.contraptions.components.mixer.MechanicalMixerBlock; +import com.simibubi.create.modules.contraptions.components.mixer.MechanicalMixerBlock.MechanicalMixerBlockItem; +import com.simibubi.create.modules.contraptions.components.motor.MotorBlock; +import com.simibubi.create.modules.contraptions.components.press.MechanicalPressBlock; +import com.simibubi.create.modules.contraptions.components.saw.SawBlock; +import com.simibubi.create.modules.contraptions.components.turntable.TurntableBlock; +import com.simibubi.create.modules.contraptions.components.waterwheel.WaterWheelBlock; +import com.simibubi.create.modules.contraptions.processing.BasinBlock; import com.simibubi.create.modules.contraptions.redstone.ContactBlock; -import com.simibubi.create.modules.contraptions.relays.ClutchBlock; -import com.simibubi.create.modules.contraptions.relays.CogWheelBlock; -import com.simibubi.create.modules.contraptions.relays.EncasedBeltBlock; -import com.simibubi.create.modules.contraptions.relays.EncasedShaftBlock; -import com.simibubi.create.modules.contraptions.relays.GearboxBlock; -import com.simibubi.create.modules.contraptions.relays.GearshiftBlock; -import com.simibubi.create.modules.contraptions.relays.ShaftBlock; -import com.simibubi.create.modules.contraptions.relays.ShaftHalfBlock; import com.simibubi.create.modules.contraptions.relays.belt.BeltBlock; import com.simibubi.create.modules.contraptions.relays.belt.BeltTunnelBlock; +import com.simibubi.create.modules.contraptions.relays.elementary.CogWheelBlock; +import com.simibubi.create.modules.contraptions.relays.elementary.ShaftBlock; +import com.simibubi.create.modules.contraptions.relays.elementary.ShaftHalfBlock; +import com.simibubi.create.modules.contraptions.relays.encased.ClutchBlock; +import com.simibubi.create.modules.contraptions.relays.encased.EncasedBeltBlock; +import com.simibubi.create.modules.contraptions.relays.encased.EncasedShaftBlock; +import com.simibubi.create.modules.contraptions.relays.encased.GearshiftBlock; import com.simibubi.create.modules.contraptions.relays.gauge.GaugeBlock; +import com.simibubi.create.modules.contraptions.relays.gearbox.GearboxBlock; import com.simibubi.create.modules.curiosities.partialWindows.WindowInABlockBlock; import com.simibubi.create.modules.curiosities.symmetry.block.CrossPlaneSymmetryBlock; import com.simibubi.create.modules.curiosities.symmetry.block.PlaneSymmetryBlock; diff --git a/src/main/java/com/simibubi/create/AllEntities.java b/src/main/java/com/simibubi/create/AllEntities.java index d4095dc29..e9545c2b7 100644 --- a/src/main/java/com/simibubi/create/AllEntities.java +++ b/src/main/java/com/simibubi/create/AllEntities.java @@ -2,8 +2,8 @@ package com.simibubi.create; import java.util.function.Function; -import com.simibubi.create.modules.contraptions.receivers.constructs.mounted.ContraptionEntity; -import com.simibubi.create.modules.contraptions.receivers.constructs.mounted.ContraptionEntityRenderer; +import com.simibubi.create.modules.contraptions.components.constructs.mounted.ContraptionEntity; +import com.simibubi.create.modules.contraptions.components.constructs.mounted.ContraptionEntityRenderer; import com.simibubi.create.modules.logistics.transport.CardboardBoxEntity; import com.simibubi.create.modules.logistics.transport.CardboardBoxEntityRenderer; diff --git a/src/main/java/com/simibubi/create/AllItems.java b/src/main/java/com/simibubi/create/AllItems.java index 54a11fb56..7c4db20fe 100644 --- a/src/main/java/com/simibubi/create/AllItems.java +++ b/src/main/java/com/simibubi/create/AllItems.java @@ -6,8 +6,8 @@ import com.simibubi.create.modules.IModule; import com.simibubi.create.modules.contraptions.GogglesItem; import com.simibubi.create.modules.contraptions.WrenchItem; import com.simibubi.create.modules.contraptions.WrenchItemRenderer; -import com.simibubi.create.modules.contraptions.relays.VerticalGearboxItem; import com.simibubi.create.modules.contraptions.relays.belt.BeltConnectorItem; +import com.simibubi.create.modules.contraptions.relays.gearbox.VerticalGearboxItem; import com.simibubi.create.modules.curiosities.ChromaticCompoundCubeItem; import com.simibubi.create.modules.curiosities.deforester.DeforesterItem; import com.simibubi.create.modules.curiosities.deforester.DeforesterItemRenderer; @@ -94,8 +94,6 @@ public enum AllItems { CRUSHED_IRON(ingredient()), CRUSHED_GOLD(ingredient()), - TIME_SCARF(ingredient()), - MOTION_SCARF(ingredient()), __LOGISTICS__(), CARDBOARD_BOX_1616(new CardboardBoxItem(standardItemProperties())), diff --git a/src/main/java/com/simibubi/create/AllPackets.java b/src/main/java/com/simibubi/create/AllPackets.java index 57f3b8c6d..64a86967d 100644 --- a/src/main/java/com/simibubi/create/AllPackets.java +++ b/src/main/java/com/simibubi/create/AllPackets.java @@ -6,9 +6,9 @@ import java.util.function.Supplier; import com.simibubi.create.foundation.packet.NbtPacket; import com.simibubi.create.foundation.packet.SimplePacketBase; -import com.simibubi.create.modules.contraptions.generators.ConfigureMotorPacket; -import com.simibubi.create.modules.contraptions.receivers.ConfigureMixerPacket; -import com.simibubi.create.modules.contraptions.receivers.constructs.ConfigureChassisPacket; +import com.simibubi.create.modules.contraptions.components.constructs.ConfigureChassisPacket; +import com.simibubi.create.modules.contraptions.components.mixer.ConfigureMixerPacket; +import com.simibubi.create.modules.contraptions.components.motor.ConfigureMotorPacket; import com.simibubi.create.modules.curiosities.placementHandgun.BuilderGunBeamPacket; import com.simibubi.create.modules.curiosities.symmetry.SymmetryEffectPacket; import com.simibubi.create.modules.logistics.block.diodes.ConfigureFlexpeaterPacket; diff --git a/src/main/java/com/simibubi/create/AllRecipes.java b/src/main/java/com/simibubi/create/AllRecipes.java index 1bd509a6d..c02039519 100644 --- a/src/main/java/com/simibubi/create/AllRecipes.java +++ b/src/main/java/com/simibubi/create/AllRecipes.java @@ -3,12 +3,12 @@ package com.simibubi.create; import java.util.function.Supplier; import com.simibubi.create.foundation.utility.Lang; -import com.simibubi.create.modules.contraptions.base.ProcessingRecipeSerializer; -import com.simibubi.create.modules.contraptions.receivers.CrushingRecipe; -import com.simibubi.create.modules.contraptions.receivers.CuttingRecipe; -import com.simibubi.create.modules.contraptions.receivers.MixingRecipe; -import com.simibubi.create.modules.contraptions.receivers.PressingRecipe; -import com.simibubi.create.modules.contraptions.receivers.fan.SplashingRecipe; +import com.simibubi.create.modules.contraptions.components.crusher.CrushingRecipe; +import com.simibubi.create.modules.contraptions.components.fan.SplashingRecipe; +import com.simibubi.create.modules.contraptions.components.mixer.MixingRecipe; +import com.simibubi.create.modules.contraptions.components.press.PressingRecipe; +import com.simibubi.create.modules.contraptions.components.saw.CuttingRecipe; +import com.simibubi.create.modules.contraptions.processing.ProcessingRecipeSerializer; import com.simibubi.create.modules.curiosities.placementHandgun.BuilderGunUpgradeRecipe; import net.minecraft.inventory.IInventory; diff --git a/src/main/java/com/simibubi/create/AllTileEntities.java b/src/main/java/com/simibubi/create/AllTileEntities.java index 20659d167..431b801b1 100644 --- a/src/main/java/com/simibubi/create/AllTileEntities.java +++ b/src/main/java/com/simibubi/create/AllTileEntities.java @@ -4,49 +4,49 @@ import java.util.function.Supplier; import com.simibubi.create.foundation.utility.Lang; import com.simibubi.create.modules.contraptions.base.KineticTileEntityRenderer; -import com.simibubi.create.modules.contraptions.generators.MotorTileEntity; -import com.simibubi.create.modules.contraptions.generators.MotorTileEntityRenderer; -import com.simibubi.create.modules.contraptions.generators.WaterWheelTileEntity; -import com.simibubi.create.modules.contraptions.receivers.BasinTileEntity; -import com.simibubi.create.modules.contraptions.receivers.BasinTileEntityRenderer; -import com.simibubi.create.modules.contraptions.receivers.CrushingWheelControllerTileEntity; -import com.simibubi.create.modules.contraptions.receivers.CrushingWheelTileEntity; -import com.simibubi.create.modules.contraptions.receivers.DrillTileEntity; -import com.simibubi.create.modules.contraptions.receivers.DrillTileEntityRenderer; -import com.simibubi.create.modules.contraptions.receivers.HarvesterTileEntity; -import com.simibubi.create.modules.contraptions.receivers.HarvesterTileEntityRenderer; -import com.simibubi.create.modules.contraptions.receivers.MechanicalMixerTileEntity; -import com.simibubi.create.modules.contraptions.receivers.MechanicalMixerTileEntityRenderer; -import com.simibubi.create.modules.contraptions.receivers.MechanicalPressTileEntity; -import com.simibubi.create.modules.contraptions.receivers.MechanicalPressTileEntityRenderer; -import com.simibubi.create.modules.contraptions.receivers.SawTileEntity; -import com.simibubi.create.modules.contraptions.receivers.SawTileEntityRenderer; -import com.simibubi.create.modules.contraptions.receivers.TurntableTileEntity; -import com.simibubi.create.modules.contraptions.receivers.constructs.ChassisTileEntity; -import com.simibubi.create.modules.contraptions.receivers.constructs.bearing.MechanicalBearingTileEntity; -import com.simibubi.create.modules.contraptions.receivers.constructs.bearing.MechanicalBearingTileEntityRenderer; -import com.simibubi.create.modules.contraptions.receivers.constructs.piston.MechanicalPistonTileEntity; -import com.simibubi.create.modules.contraptions.receivers.constructs.piston.MechanicalPistonTileEntityRenderer; -import com.simibubi.create.modules.contraptions.receivers.crafter.MechanicalCrafterTileEntity; -import com.simibubi.create.modules.contraptions.receivers.crafter.MechanicalCrafterTileEntityRenderer; -import com.simibubi.create.modules.contraptions.receivers.fan.EncasedFanTileEntity; -import com.simibubi.create.modules.contraptions.receivers.fan.EncasedFanTileEntityRenderer; -import com.simibubi.create.modules.contraptions.relays.ClutchTileEntity; -import com.simibubi.create.modules.contraptions.relays.EncasedShaftTileEntity; -import com.simibubi.create.modules.contraptions.relays.EncasedShaftTileEntityRenderer; -import com.simibubi.create.modules.contraptions.relays.GearboxTileEntity; -import com.simibubi.create.modules.contraptions.relays.GearboxTileEntityRenderer; -import com.simibubi.create.modules.contraptions.relays.GearshiftTileEntity; -import com.simibubi.create.modules.contraptions.relays.ShaftTileEntity; -import com.simibubi.create.modules.contraptions.relays.SplitShaftTileEntityRenderer; +import com.simibubi.create.modules.contraptions.components.actors.DrillTileEntity; +import com.simibubi.create.modules.contraptions.components.actors.DrillTileEntityRenderer; +import com.simibubi.create.modules.contraptions.components.actors.HarvesterTileEntity; +import com.simibubi.create.modules.contraptions.components.actors.HarvesterTileEntityRenderer; +import com.simibubi.create.modules.contraptions.components.constructs.ChassisTileEntity; +import com.simibubi.create.modules.contraptions.components.constructs.bearing.MechanicalBearingTileEntity; +import com.simibubi.create.modules.contraptions.components.constructs.bearing.MechanicalBearingTileEntityRenderer; +import com.simibubi.create.modules.contraptions.components.constructs.piston.MechanicalPistonTileEntity; +import com.simibubi.create.modules.contraptions.components.constructs.piston.MechanicalPistonTileEntityRenderer; +import com.simibubi.create.modules.contraptions.components.crafter.MechanicalCrafterTileEntity; +import com.simibubi.create.modules.contraptions.components.crafter.MechanicalCrafterTileEntityRenderer; +import com.simibubi.create.modules.contraptions.components.crusher.CrushingWheelControllerTileEntity; +import com.simibubi.create.modules.contraptions.components.crusher.CrushingWheelTileEntity; +import com.simibubi.create.modules.contraptions.components.fan.EncasedFanTileEntity; +import com.simibubi.create.modules.contraptions.components.fan.EncasedFanTileEntityRenderer; +import com.simibubi.create.modules.contraptions.components.mixer.MechanicalMixerTileEntity; +import com.simibubi.create.modules.contraptions.components.mixer.MechanicalMixerTileEntityRenderer; +import com.simibubi.create.modules.contraptions.components.motor.MotorTileEntity; +import com.simibubi.create.modules.contraptions.components.motor.MotorTileEntityRenderer; +import com.simibubi.create.modules.contraptions.components.press.MechanicalPressTileEntity; +import com.simibubi.create.modules.contraptions.components.press.MechanicalPressTileEntityRenderer; +import com.simibubi.create.modules.contraptions.components.saw.SawTileEntity; +import com.simibubi.create.modules.contraptions.components.saw.SawTileEntityRenderer; +import com.simibubi.create.modules.contraptions.components.turntable.TurntableTileEntity; +import com.simibubi.create.modules.contraptions.components.waterwheel.WaterWheelTileEntity; +import com.simibubi.create.modules.contraptions.processing.BasinTileEntity; +import com.simibubi.create.modules.contraptions.processing.BasinTileEntityRenderer; import com.simibubi.create.modules.contraptions.relays.belt.BeltTileEntity; import com.simibubi.create.modules.contraptions.relays.belt.BeltTileEntityRenderer; import com.simibubi.create.modules.contraptions.relays.belt.BeltTunnelTileEntity; import com.simibubi.create.modules.contraptions.relays.belt.BeltTunnelTileEntityRenderer; +import com.simibubi.create.modules.contraptions.relays.elementary.ShaftTileEntity; +import com.simibubi.create.modules.contraptions.relays.encased.ClutchTileEntity; +import com.simibubi.create.modules.contraptions.relays.encased.EncasedShaftTileEntity; +import com.simibubi.create.modules.contraptions.relays.encased.EncasedShaftTileEntityRenderer; +import com.simibubi.create.modules.contraptions.relays.encased.SplitShaftTileEntityRenderer; import com.simibubi.create.modules.contraptions.relays.gauge.GaugeBlock; import com.simibubi.create.modules.contraptions.relays.gauge.GaugeTileEntityRenderer; import com.simibubi.create.modules.contraptions.relays.gauge.SpeedGaugeTileEntity; import com.simibubi.create.modules.contraptions.relays.gauge.StressGaugeTileEntity; +import com.simibubi.create.modules.contraptions.relays.gearbox.GearboxTileEntity; +import com.simibubi.create.modules.contraptions.relays.gearbox.GearboxTileEntityRenderer; +import com.simibubi.create.modules.contraptions.relays.gearbox.GearshiftTileEntity; import com.simibubi.create.modules.curiosities.partialWindows.WindowInABlockTileEntity; import com.simibubi.create.modules.logistics.block.LinkedTileEntityRenderer; import com.simibubi.create.modules.logistics.block.RedstoneBridgeTileEntity; diff --git a/src/main/java/com/simibubi/create/ClientEvents.java b/src/main/java/com/simibubi/create/ClientEvents.java index cd347c60d..5b8dd866a 100644 --- a/src/main/java/com/simibubi/create/ClientEvents.java +++ b/src/main/java/com/simibubi/create/ClientEvents.java @@ -9,7 +9,7 @@ import com.simibubi.create.foundation.item.TooltipHelper; import com.simibubi.create.foundation.utility.AnimationTickHolder; import com.simibubi.create.modules.contraptions.KineticDebugger; import com.simibubi.create.modules.contraptions.base.KineticTileEntityRenderer; -import com.simibubi.create.modules.contraptions.receivers.TurntableHandler; +import com.simibubi.create.modules.contraptions.components.turntable.TurntableHandler; import com.simibubi.create.modules.contraptions.relays.belt.BeltConnectorItemHandler; import net.minecraft.client.Minecraft; diff --git a/src/main/java/com/simibubi/create/Create.java b/src/main/java/com/simibubi/create/Create.java index ed7501d63..afe5223bf 100644 --- a/src/main/java/com/simibubi/create/Create.java +++ b/src/main/java/com/simibubi/create/Create.java @@ -6,7 +6,7 @@ import org.apache.logging.log4j.Logger; import com.simibubi.create.foundation.world.OreGeneration; import com.simibubi.create.modules.ModuleLoadedCondition; import com.simibubi.create.modules.contraptions.TorquePropagator; -import com.simibubi.create.modules.contraptions.receivers.constructs.piston.MovingConstructHandler; +import com.simibubi.create.modules.contraptions.components.constructs.piston.MovingConstructHandler; import com.simibubi.create.modules.logistics.FrequencyHandler; import com.simibubi.create.modules.logistics.management.LogisticalNetworkHandler; import com.simibubi.create.modules.logistics.transport.villager.LogisticianHandler; diff --git a/src/main/java/com/simibubi/create/CreateClient.java b/src/main/java/com/simibubi/create/CreateClient.java index 5b7c9545c..145a76c81 100644 --- a/src/main/java/com/simibubi/create/CreateClient.java +++ b/src/main/java/com/simibubi/create/CreateClient.java @@ -13,7 +13,7 @@ import com.simibubi.create.foundation.block.SpriteShifter.SpriteShiftEntry; import com.simibubi.create.foundation.utility.SuperByteBufferCache; import com.simibubi.create.modules.contraptions.WrenchModel; import com.simibubi.create.modules.contraptions.base.KineticTileEntityRenderer; -import com.simibubi.create.modules.contraptions.receivers.constructs.ContraptionRenderer; +import com.simibubi.create.modules.contraptions.components.constructs.ContraptionRenderer; import com.simibubi.create.modules.curiosities.deforester.DeforesterModel; import com.simibubi.create.modules.curiosities.partialWindows.WindowInABlockModel; import com.simibubi.create.modules.curiosities.placementHandgun.BuilderGunModel; diff --git a/src/main/java/com/simibubi/create/ResourceReloadHandler.java b/src/main/java/com/simibubi/create/ResourceReloadHandler.java index be9478bab..d863bfd73 100644 --- a/src/main/java/com/simibubi/create/ResourceReloadHandler.java +++ b/src/main/java/com/simibubi/create/ResourceReloadHandler.java @@ -1,7 +1,7 @@ package com.simibubi.create; import com.simibubi.create.foundation.block.SpriteShifter; -import com.simibubi.create.modules.contraptions.receivers.constructs.bearing.MechanicalBearingTileEntityRenderer; +import com.simibubi.create.modules.contraptions.components.constructs.bearing.MechanicalBearingTileEntityRenderer; import net.minecraft.client.resources.ReloadListener; import net.minecraft.profiler.IProfiler; diff --git a/src/main/java/com/simibubi/create/compat/jei/CrushingCategory.java b/src/main/java/com/simibubi/create/compat/jei/CrushingCategory.java index 27d8eb0b3..feded2198 100644 --- a/src/main/java/com/simibubi/create/compat/jei/CrushingCategory.java +++ b/src/main/java/com/simibubi/create/compat/jei/CrushingCategory.java @@ -8,8 +8,8 @@ import com.simibubi.create.AllItems; import com.simibubi.create.Create; import com.simibubi.create.ScreenResources; import com.simibubi.create.foundation.utility.Lang; -import com.simibubi.create.modules.contraptions.base.StochasticOutput; -import com.simibubi.create.modules.contraptions.receivers.CrushingRecipe; +import com.simibubi.create.modules.contraptions.components.crusher.CrushingRecipe; +import com.simibubi.create.modules.contraptions.processing.StochasticOutput; import mezz.jei.api.constants.VanillaTypes; import mezz.jei.api.gui.IRecipeLayout; diff --git a/src/main/java/com/simibubi/create/compat/jei/PressingCategory.java b/src/main/java/com/simibubi/create/compat/jei/PressingCategory.java index d4cc98ead..c7490b8d7 100644 --- a/src/main/java/com/simibubi/create/compat/jei/PressingCategory.java +++ b/src/main/java/com/simibubi/create/compat/jei/PressingCategory.java @@ -8,8 +8,8 @@ import com.simibubi.create.AllItems; import com.simibubi.create.Create; import com.simibubi.create.ScreenResources; import com.simibubi.create.foundation.utility.Lang; -import com.simibubi.create.modules.contraptions.base.StochasticOutput; -import com.simibubi.create.modules.contraptions.receivers.PressingRecipe; +import com.simibubi.create.modules.contraptions.components.press.PressingRecipe; +import com.simibubi.create.modules.contraptions.processing.StochasticOutput; import mezz.jei.api.constants.VanillaTypes; import mezz.jei.api.gui.IRecipeLayout; diff --git a/src/main/java/com/simibubi/create/compat/jei/SplashingCategory.java b/src/main/java/com/simibubi/create/compat/jei/SplashingCategory.java index 87b93a918..746e95984 100644 --- a/src/main/java/com/simibubi/create/compat/jei/SplashingCategory.java +++ b/src/main/java/com/simibubi/create/compat/jei/SplashingCategory.java @@ -9,8 +9,8 @@ import com.simibubi.create.Create; import com.simibubi.create.ScreenResources; import com.simibubi.create.foundation.gui.ScreenElementRenderer; import com.simibubi.create.foundation.utility.Lang; -import com.simibubi.create.modules.contraptions.base.StochasticOutput; -import com.simibubi.create.modules.contraptions.receivers.fan.SplashingRecipe; +import com.simibubi.create.modules.contraptions.components.fan.SplashingRecipe; +import com.simibubi.create.modules.contraptions.processing.StochasticOutput; import mezz.jei.api.constants.VanillaTypes; import mezz.jei.api.gui.IRecipeLayout; diff --git a/src/main/java/com/simibubi/create/foundation/utility/AllShapes.java b/src/main/java/com/simibubi/create/foundation/utility/AllShapes.java index cbccfe65e..410dc4472 100644 --- a/src/main/java/com/simibubi/create/foundation/utility/AllShapes.java +++ b/src/main/java/com/simibubi/create/foundation/utility/AllShapes.java @@ -28,6 +28,7 @@ public class AllShapes { ; + @SuppressWarnings("deprecation") private static final VoxelShape LOGISTICAL_CASING_MIDDLE_SHAPE = VoxelShapes.or( makeCuboidShape(1,0,1,15,16,15), diff --git a/src/main/java/com/simibubi/create/modules/contraptions/RotationPropagator.java b/src/main/java/com/simibubi/create/modules/contraptions/RotationPropagator.java index 1606125c7..453f3881a 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/RotationPropagator.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/RotationPropagator.java @@ -13,10 +13,10 @@ import com.simibubi.create.AllBlocks; import com.simibubi.create.CreateConfig; import com.simibubi.create.modules.contraptions.base.IRotate; import com.simibubi.create.modules.contraptions.base.KineticTileEntity; -import com.simibubi.create.modules.contraptions.relays.EncasedBeltBlock; -import com.simibubi.create.modules.contraptions.relays.GearboxTileEntity; -import com.simibubi.create.modules.contraptions.relays.SplitShaftTileEntity; import com.simibubi.create.modules.contraptions.relays.belt.BeltTileEntity; +import com.simibubi.create.modules.contraptions.relays.encased.EncasedBeltBlock; +import com.simibubi.create.modules.contraptions.relays.encased.SplitShaftTileEntity; +import com.simibubi.create.modules.contraptions.relays.gearbox.GearboxTileEntity; import net.minecraft.block.BlockState; import net.minecraft.util.Direction; @@ -69,9 +69,7 @@ public class RotationPropagator { // Attached Encased Belts if (AllBlocks.ENCASED_BELT.typeOf(stateFrom) && AllBlocks.ENCASED_BELT.typeOf(stateTo)) { - boolean connected = stateFrom.get(EncasedBeltBlock.CONNECTED) && stateTo.get(EncasedBeltBlock.CONNECTED) - && stateFrom.get(EncasedBeltBlock.CONNECTED_FACE) == direction - && stateTo.get(EncasedBeltBlock.CONNECTED_FACE) == direction.getOpposite(); + boolean connected = EncasedBeltBlock.areBlocksConnected(stateFrom, stateTo, direction); return connected ? 1 : 0; } diff --git a/src/main/java/com/simibubi/create/modules/contraptions/base/KineticTileEntity.java b/src/main/java/com/simibubi/create/modules/contraptions/base/KineticTileEntity.java index 7cb2c50f7..702f17d8c 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/base/KineticTileEntity.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/base/KineticTileEntity.java @@ -41,6 +41,7 @@ public abstract class KineticTileEntity extends SyncedTileEntity implements ITic public float speed; protected Optional source; public boolean reActivateSource; + public int speedChangeCounter; // Torque related public float maxStress; @@ -95,6 +96,7 @@ public abstract class KineticTileEntity extends SyncedTileEntity implements ITic } public void onSpeedChanged() { + speedChangeCounter += 5; } @Override @@ -262,6 +264,11 @@ public abstract class KineticTileEntity extends SyncedTileEntity implements ITic if (world.isRemote) return; + if (speedChangeCounter > 25) + world.destroyBlock(pos, true); + if (speedChangeCounter > 0) + speedChangeCounter--; + if (particleSpawnCountdown > 0) if (--particleSpawnCountdown == 0) spawnRotationIndicators(); diff --git a/src/main/java/com/simibubi/create/modules/contraptions/receivers/DrillBlock.java b/src/main/java/com/simibubi/create/modules/contraptions/components/actors/DrillBlock.java similarity index 96% rename from src/main/java/com/simibubi/create/modules/contraptions/receivers/DrillBlock.java rename to src/main/java/com/simibubi/create/modules/contraptions/components/actors/DrillBlock.java index ac837c481..e060fbe75 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/receivers/DrillBlock.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/actors/DrillBlock.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.contraptions.receivers; +package com.simibubi.create.modules.contraptions.components.actors; import java.util.List; @@ -7,7 +7,7 @@ import com.simibubi.create.foundation.block.IWithTileEntity; import com.simibubi.create.foundation.utility.SuperByteBuffer; import com.simibubi.create.foundation.utility.AllShapes; import com.simibubi.create.modules.contraptions.base.DirectionalKineticBlock; -import com.simibubi.create.modules.contraptions.receivers.constructs.IHaveMovementBehavior; +import com.simibubi.create.modules.contraptions.components.constructs.IHaveMovementBehavior; import net.minecraft.block.Block; import net.minecraft.block.BlockState; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/receivers/DrillTileEntity.java b/src/main/java/com/simibubi/create/modules/contraptions/components/actors/DrillTileEntity.java similarity index 97% rename from src/main/java/com/simibubi/create/modules/contraptions/receivers/DrillTileEntity.java rename to src/main/java/com/simibubi/create/modules/contraptions/components/actors/DrillTileEntity.java index 0190db31a..c827ba418 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/receivers/DrillTileEntity.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/actors/DrillTileEntity.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.contraptions.receivers; +package com.simibubi.create.modules.contraptions.components.actors; import java.util.concurrent.atomic.AtomicInteger; @@ -39,6 +39,7 @@ public class DrillTileEntity extends KineticTileEntity { @Override public void onSpeedChanged() { + super.onSpeedChanged(); if (destroyProgress == -1) destroyNextTick(); } diff --git a/src/main/java/com/simibubi/create/modules/contraptions/receivers/DrillTileEntityRenderer.java b/src/main/java/com/simibubi/create/modules/contraptions/components/actors/DrillTileEntityRenderer.java similarity index 89% rename from src/main/java/com/simibubi/create/modules/contraptions/receivers/DrillTileEntityRenderer.java rename to src/main/java/com/simibubi/create/modules/contraptions/components/actors/DrillTileEntityRenderer.java index bd10f7a1d..a6354024d 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/receivers/DrillTileEntityRenderer.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/actors/DrillTileEntityRenderer.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.contraptions.receivers; +package com.simibubi.create.modules.contraptions.components.actors; import static net.minecraft.state.properties.BlockStateProperties.FACING; @@ -9,7 +9,7 @@ import com.simibubi.create.foundation.utility.SuperByteBuffer; import com.simibubi.create.modules.contraptions.base.IRotate; import com.simibubi.create.modules.contraptions.base.KineticTileEntity; import com.simibubi.create.modules.contraptions.base.KineticTileEntityRenderer; -import com.simibubi.create.modules.contraptions.receivers.constructs.IHaveMovementBehavior.MovementContext; +import com.simibubi.create.modules.contraptions.components.constructs.IHaveMovementBehavior.MovementContext; import net.minecraft.block.BlockState; import net.minecraft.util.Direction.Axis; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/receivers/HarvesterBlock.java b/src/main/java/com/simibubi/create/modules/contraptions/components/actors/HarvesterBlock.java similarity index 97% rename from src/main/java/com/simibubi/create/modules/contraptions/receivers/HarvesterBlock.java rename to src/main/java/com/simibubi/create/modules/contraptions/components/actors/HarvesterBlock.java index dd0008892..1b0337f24 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/receivers/HarvesterBlock.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/actors/HarvesterBlock.java @@ -1,12 +1,12 @@ -package com.simibubi.create.modules.contraptions.receivers; +package com.simibubi.create.modules.contraptions.components.actors; import java.util.List; import com.simibubi.create.AllBlocks; import com.simibubi.create.foundation.block.IRenderUtilityBlock; import com.simibubi.create.foundation.utility.SuperByteBuffer; +import com.simibubi.create.modules.contraptions.components.constructs.IHaveMovementBehavior; import com.simibubi.create.foundation.utility.AllShapes; -import com.simibubi.create.modules.contraptions.receivers.constructs.IHaveMovementBehavior; import net.minecraft.block.Block; import net.minecraft.block.BlockState; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/receivers/HarvesterTileEntity.java b/src/main/java/com/simibubi/create/modules/contraptions/components/actors/HarvesterTileEntity.java similarity index 82% rename from src/main/java/com/simibubi/create/modules/contraptions/receivers/HarvesterTileEntity.java rename to src/main/java/com/simibubi/create/modules/contraptions/components/actors/HarvesterTileEntity.java index 20ce961ee..ef9b3dda5 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/receivers/HarvesterTileEntity.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/actors/HarvesterTileEntity.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.contraptions.receivers; +package com.simibubi.create.modules.contraptions.components.actors; import com.simibubi.create.AllTileEntities; import com.simibubi.create.foundation.block.SyncedTileEntity; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/receivers/HarvesterTileEntityRenderer.java b/src/main/java/com/simibubi/create/modules/contraptions/components/actors/HarvesterTileEntityRenderer.java similarity index 93% rename from src/main/java/com/simibubi/create/modules/contraptions/receivers/HarvesterTileEntityRenderer.java rename to src/main/java/com/simibubi/create/modules/contraptions/components/actors/HarvesterTileEntityRenderer.java index cca73f0ff..1e3846ca2 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/receivers/HarvesterTileEntityRenderer.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/actors/HarvesterTileEntityRenderer.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.contraptions.receivers; +package com.simibubi.create.modules.contraptions.components.actors; import static com.simibubi.create.modules.contraptions.base.KineticTileEntityRenderer.KINETIC_TILE; import static net.minecraft.state.properties.BlockStateProperties.HORIZONTAL_FACING; @@ -7,7 +7,7 @@ import com.simibubi.create.AllBlocks; import com.simibubi.create.CreateClient; import com.simibubi.create.foundation.utility.AnimationTickHolder; import com.simibubi.create.foundation.utility.SuperByteBuffer; -import com.simibubi.create.modules.contraptions.receivers.constructs.IHaveMovementBehavior.MovementContext; +import com.simibubi.create.modules.contraptions.components.constructs.IHaveMovementBehavior.MovementContext; import net.minecraft.block.BlockState; import net.minecraft.client.renderer.BufferBuilder; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/receivers/constructs/AbstractChassisBlock.java b/src/main/java/com/simibubi/create/modules/contraptions/components/constructs/AbstractChassisBlock.java similarity index 98% rename from src/main/java/com/simibubi/create/modules/contraptions/receivers/constructs/AbstractChassisBlock.java rename to src/main/java/com/simibubi/create/modules/contraptions/components/constructs/AbstractChassisBlock.java index 1f5159003..4ff4e54a6 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/receivers/constructs/AbstractChassisBlock.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/constructs/AbstractChassisBlock.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.contraptions.receivers.constructs; +package com.simibubi.create.modules.contraptions.components.constructs; import java.util.List; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/receivers/constructs/ChassisTileEntity.java b/src/main/java/com/simibubi/create/modules/contraptions/components/constructs/ChassisTileEntity.java similarity index 95% rename from src/main/java/com/simibubi/create/modules/contraptions/receivers/constructs/ChassisTileEntity.java rename to src/main/java/com/simibubi/create/modules/contraptions/components/constructs/ChassisTileEntity.java index dfa3d0707..fd138aea3 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/receivers/constructs/ChassisTileEntity.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/constructs/ChassisTileEntity.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.contraptions.receivers.constructs; +package com.simibubi.create.modules.contraptions.components.constructs; import static com.simibubi.create.CreateConfig.parameters; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/receivers/constructs/ConfigureChassisPacket.java b/src/main/java/com/simibubi/create/modules/contraptions/components/constructs/ConfigureChassisPacket.java similarity index 91% rename from src/main/java/com/simibubi/create/modules/contraptions/receivers/constructs/ConfigureChassisPacket.java rename to src/main/java/com/simibubi/create/modules/contraptions/components/constructs/ConfigureChassisPacket.java index c9425f831..1f2f33688 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/receivers/constructs/ConfigureChassisPacket.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/constructs/ConfigureChassisPacket.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.contraptions.receivers.constructs; +package com.simibubi.create.modules.contraptions.components.constructs; import com.simibubi.create.foundation.packet.TileEntityConfigurationPacket; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/receivers/constructs/Contraption.java b/src/main/java/com/simibubi/create/modules/contraptions/components/constructs/Contraption.java similarity index 98% rename from src/main/java/com/simibubi/create/modules/contraptions/receivers/constructs/Contraption.java rename to src/main/java/com/simibubi/create/modules/contraptions/components/constructs/Contraption.java index 50a2019c5..58967cc12 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/receivers/constructs/Contraption.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/constructs/Contraption.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.contraptions.receivers.constructs; +package com.simibubi.create.modules.contraptions.components.constructs; import static com.simibubi.create.CreateConfig.parameters; import static net.minecraft.state.properties.BlockStateProperties.AXIS; @@ -18,8 +18,8 @@ import org.apache.commons.lang3.tuple.MutablePair; import com.simibubi.create.AllBlocks; import com.simibubi.create.CreateConfig; -import com.simibubi.create.modules.contraptions.receivers.SawBlock; -import com.simibubi.create.modules.contraptions.receivers.constructs.IHaveMovementBehavior.MovementContext; +import com.simibubi.create.modules.contraptions.components.constructs.IHaveMovementBehavior.MovementContext; +import com.simibubi.create.modules.contraptions.components.saw.SawBlock; import net.minecraft.block.BlockState; import net.minecraft.block.FallingBlock; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/receivers/constructs/ContraptionRenderer.java b/src/main/java/com/simibubi/create/modules/contraptions/components/constructs/ContraptionRenderer.java similarity index 94% rename from src/main/java/com/simibubi/create/modules/contraptions/receivers/constructs/ContraptionRenderer.java rename to src/main/java/com/simibubi/create/modules/contraptions/components/constructs/ContraptionRenderer.java index be82b9979..369f9c6fd 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/receivers/constructs/ContraptionRenderer.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/constructs/ContraptionRenderer.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.contraptions.receivers.constructs; +package com.simibubi.create.modules.contraptions.components.constructs; import java.util.Random; import java.util.function.Consumer; @@ -10,7 +10,7 @@ import com.simibubi.create.CreateClient; import com.simibubi.create.foundation.utility.PlacementSimulationWorld; import com.simibubi.create.foundation.utility.SuperByteBuffer; import com.simibubi.create.foundation.utility.SuperByteBufferCache.Compartment; -import com.simibubi.create.modules.contraptions.receivers.constructs.IHaveMovementBehavior.MovementContext; +import com.simibubi.create.modules.contraptions.components.constructs.IHaveMovementBehavior.MovementContext; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.BlockModelRenderer; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/receivers/constructs/IHaveMovementBehavior.java b/src/main/java/com/simibubi/create/modules/contraptions/components/constructs/IHaveMovementBehavior.java similarity index 93% rename from src/main/java/com/simibubi/create/modules/contraptions/receivers/constructs/IHaveMovementBehavior.java rename to src/main/java/com/simibubi/create/modules/contraptions/components/constructs/IHaveMovementBehavior.java index 50362a879..9a7f1cd21 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/receivers/constructs/IHaveMovementBehavior.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/constructs/IHaveMovementBehavior.java @@ -1,8 +1,8 @@ -package com.simibubi.create.modules.contraptions.receivers.constructs; +package com.simibubi.create.modules.contraptions.components.constructs; import com.simibubi.create.foundation.utility.SuperByteBuffer; import com.simibubi.create.foundation.utility.VecHelper; -import com.simibubi.create.modules.contraptions.receivers.constructs.piston.MechanicalPistonTileEntity; +import com.simibubi.create.modules.contraptions.components.constructs.piston.MechanicalPistonTileEntity; import net.minecraft.block.BlockState; import net.minecraft.nbt.CompoundNBT; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/receivers/constructs/LinearChassisBlock.java b/src/main/java/com/simibubi/create/modules/contraptions/components/constructs/LinearChassisBlock.java similarity index 97% rename from src/main/java/com/simibubi/create/modules/contraptions/receivers/constructs/LinearChassisBlock.java rename to src/main/java/com/simibubi/create/modules/contraptions/components/constructs/LinearChassisBlock.java index 5eecafc86..a50e56ca5 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/receivers/constructs/LinearChassisBlock.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/constructs/LinearChassisBlock.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.contraptions.receivers.constructs; +package com.simibubi.create.modules.contraptions.components.constructs; import com.google.common.collect.ImmutableList; import com.simibubi.create.AllBlocks; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/receivers/constructs/RadialChassisBlock.java b/src/main/java/com/simibubi/create/modules/contraptions/components/constructs/RadialChassisBlock.java similarity index 96% rename from src/main/java/com/simibubi/create/modules/contraptions/receivers/constructs/RadialChassisBlock.java rename to src/main/java/com/simibubi/create/modules/contraptions/components/constructs/RadialChassisBlock.java index 38f54cd56..59d54a571 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/receivers/constructs/RadialChassisBlock.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/constructs/RadialChassisBlock.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.contraptions.receivers.constructs; +package com.simibubi.create.modules.contraptions.components.constructs; import com.simibubi.create.foundation.utility.Lang; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/receivers/constructs/bearing/MechanicalBearingBlock.java b/src/main/java/com/simibubi/create/modules/contraptions/components/constructs/bearing/MechanicalBearingBlock.java similarity index 94% rename from src/main/java/com/simibubi/create/modules/contraptions/receivers/constructs/bearing/MechanicalBearingBlock.java rename to src/main/java/com/simibubi/create/modules/contraptions/components/constructs/bearing/MechanicalBearingBlock.java index 62ae7d5d0..0358ee7d0 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/receivers/constructs/bearing/MechanicalBearingBlock.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/constructs/bearing/MechanicalBearingBlock.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.contraptions.receivers.constructs.bearing; +package com.simibubi.create.modules.contraptions.components.constructs.bearing; import com.simibubi.create.foundation.block.IWithTileEntity; import com.simibubi.create.modules.contraptions.base.DirectionalKineticBlock; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/receivers/constructs/bearing/MechanicalBearingTileEntity.java b/src/main/java/com/simibubi/create/modules/contraptions/components/constructs/bearing/MechanicalBearingTileEntity.java similarity index 96% rename from src/main/java/com/simibubi/create/modules/contraptions/receivers/constructs/bearing/MechanicalBearingTileEntity.java rename to src/main/java/com/simibubi/create/modules/contraptions/components/constructs/bearing/MechanicalBearingTileEntity.java index d1c6f969c..f14d367af 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/receivers/constructs/bearing/MechanicalBearingTileEntity.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/constructs/bearing/MechanicalBearingTileEntity.java @@ -1,8 +1,8 @@ -package com.simibubi.create.modules.contraptions.receivers.constructs.bearing; +package com.simibubi.create.modules.contraptions.components.constructs.bearing; import com.simibubi.create.AllTileEntities; import com.simibubi.create.modules.contraptions.base.GeneratingKineticTileEntity; -import com.simibubi.create.modules.contraptions.receivers.constructs.ChassisTileEntity; +import com.simibubi.create.modules.contraptions.components.constructs.ChassisTileEntity; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/receivers/constructs/bearing/MechanicalBearingTileEntityRenderer.java b/src/main/java/com/simibubi/create/modules/contraptions/components/constructs/bearing/MechanicalBearingTileEntityRenderer.java similarity index 98% rename from src/main/java/com/simibubi/create/modules/contraptions/receivers/constructs/bearing/MechanicalBearingTileEntityRenderer.java rename to src/main/java/com/simibubi/create/modules/contraptions/components/constructs/bearing/MechanicalBearingTileEntityRenderer.java index 96e4f5dcf..62804c025 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/receivers/constructs/bearing/MechanicalBearingTileEntityRenderer.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/constructs/bearing/MechanicalBearingTileEntityRenderer.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.contraptions.receivers.constructs.bearing; +package com.simibubi.create.modules.contraptions.components.constructs.bearing; import java.util.Random; import java.util.concurrent.TimeUnit; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/receivers/constructs/bearing/RotationConstruct.java b/src/main/java/com/simibubi/create/modules/contraptions/components/constructs/bearing/RotationConstruct.java similarity index 96% rename from src/main/java/com/simibubi/create/modules/contraptions/receivers/constructs/bearing/RotationConstruct.java rename to src/main/java/com/simibubi/create/modules/contraptions/components/constructs/bearing/RotationConstruct.java index 6df9082d2..af46277f2 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/receivers/constructs/bearing/RotationConstruct.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/constructs/bearing/RotationConstruct.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.contraptions.receivers.constructs.bearing; +package com.simibubi.create.modules.contraptions.components.constructs.bearing; import java.util.ArrayList; import java.util.HashMap; @@ -11,8 +11,8 @@ import java.util.Set; import com.simibubi.create.AllBlockTags; import com.simibubi.create.AllBlocks; import com.simibubi.create.CreateConfig; -import com.simibubi.create.modules.contraptions.receivers.constructs.ChassisTileEntity; -import com.simibubi.create.modules.contraptions.receivers.constructs.RadialChassisBlock; +import com.simibubi.create.modules.contraptions.components.constructs.ChassisTileEntity; +import com.simibubi.create.modules.contraptions.components.constructs.RadialChassisBlock; import net.minecraft.block.BlockState; import net.minecraft.block.PistonBlock; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/receivers/constructs/bearing/RotationConstructVertexBuffer.java b/src/main/java/com/simibubi/create/modules/contraptions/components/constructs/bearing/RotationConstructVertexBuffer.java similarity index 94% rename from src/main/java/com/simibubi/create/modules/contraptions/receivers/constructs/bearing/RotationConstructVertexBuffer.java rename to src/main/java/com/simibubi/create/modules/contraptions/components/constructs/bearing/RotationConstructVertexBuffer.java index f2b459bd6..43cb48ea0 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/receivers/constructs/bearing/RotationConstructVertexBuffer.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/constructs/bearing/RotationConstructVertexBuffer.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.contraptions.receivers.constructs.bearing; +package com.simibubi.create.modules.contraptions.components.constructs.bearing; import java.nio.ByteBuffer; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/receivers/constructs/mounted/CartAssemblerBlock.java b/src/main/java/com/simibubi/create/modules/contraptions/components/constructs/mounted/CartAssemblerBlock.java similarity index 98% rename from src/main/java/com/simibubi/create/modules/contraptions/receivers/constructs/mounted/CartAssemblerBlock.java rename to src/main/java/com/simibubi/create/modules/contraptions/components/constructs/mounted/CartAssemblerBlock.java index 19d63280f..5c2de9ea3 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/receivers/constructs/mounted/CartAssemblerBlock.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/constructs/mounted/CartAssemblerBlock.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.contraptions.receivers.constructs.mounted; +package com.simibubi.create.modules.contraptions.components.constructs.mounted; import com.simibubi.create.AllBlocks; import com.simibubi.create.foundation.block.RenderUtilityBlock; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/receivers/constructs/mounted/ContraptionEntity.java b/src/main/java/com/simibubi/create/modules/contraptions/components/constructs/mounted/ContraptionEntity.java similarity index 95% rename from src/main/java/com/simibubi/create/modules/contraptions/receivers/constructs/mounted/ContraptionEntity.java rename to src/main/java/com/simibubi/create/modules/contraptions/components/constructs/mounted/ContraptionEntity.java index 8e0f635ad..6e60c3629 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/receivers/constructs/mounted/ContraptionEntity.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/constructs/mounted/ContraptionEntity.java @@ -1,9 +1,9 @@ -package com.simibubi.create.modules.contraptions.receivers.constructs.mounted; +package com.simibubi.create.modules.contraptions.components.constructs.mounted; import com.simibubi.create.AllEntities; import com.simibubi.create.foundation.utility.VecHelper; -import com.simibubi.create.modules.contraptions.receivers.constructs.IHaveMovementBehavior; -import com.simibubi.create.modules.contraptions.receivers.constructs.IHaveMovementBehavior.MovementContext; +import com.simibubi.create.modules.contraptions.components.constructs.IHaveMovementBehavior; +import com.simibubi.create.modules.contraptions.components.constructs.IHaveMovementBehavior.MovementContext; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityType; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/receivers/constructs/mounted/ContraptionEntityRenderer.java b/src/main/java/com/simibubi/create/modules/contraptions/components/constructs/mounted/ContraptionEntityRenderer.java similarity index 95% rename from src/main/java/com/simibubi/create/modules/contraptions/receivers/constructs/mounted/ContraptionEntityRenderer.java rename to src/main/java/com/simibubi/create/modules/contraptions/components/constructs/mounted/ContraptionEntityRenderer.java index 454e51eb2..1d0cb0b7c 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/receivers/constructs/mounted/ContraptionEntityRenderer.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/constructs/mounted/ContraptionEntityRenderer.java @@ -1,9 +1,9 @@ -package com.simibubi.create.modules.contraptions.receivers.constructs.mounted; +package com.simibubi.create.modules.contraptions.components.constructs.mounted; import com.mojang.blaze3d.platform.GlStateManager; import com.simibubi.create.foundation.utility.TessellatorHelper; import com.simibubi.create.foundation.utility.VecHelper; -import com.simibubi.create.modules.contraptions.receivers.constructs.ContraptionRenderer; +import com.simibubi.create.modules.contraptions.components.constructs.ContraptionRenderer; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.EntityRenderer; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/receivers/constructs/mounted/MountedContraption.java b/src/main/java/com/simibubi/create/modules/contraptions/components/constructs/mounted/MountedContraption.java similarity index 85% rename from src/main/java/com/simibubi/create/modules/contraptions/receivers/constructs/mounted/MountedContraption.java rename to src/main/java/com/simibubi/create/modules/contraptions/components/constructs/mounted/MountedContraption.java index dcbee14aa..c2e2eda6e 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/receivers/constructs/mounted/MountedContraption.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/constructs/mounted/MountedContraption.java @@ -1,15 +1,15 @@ -package com.simibubi.create.modules.contraptions.receivers.constructs.mounted; +package com.simibubi.create.modules.contraptions.components.constructs.mounted; -import static com.simibubi.create.modules.contraptions.receivers.constructs.mounted.CartAssemblerBlock.RAIL_SHAPE; +import static com.simibubi.create.modules.contraptions.components.constructs.mounted.CartAssemblerBlock.RAIL_SHAPE; import java.util.List; import org.apache.commons.lang3.tuple.MutablePair; import com.simibubi.create.AllBlocks; -import com.simibubi.create.modules.contraptions.receivers.constructs.Contraption; -import com.simibubi.create.modules.contraptions.receivers.constructs.IHaveMovementBehavior.MovementContext; -import com.simibubi.create.modules.contraptions.receivers.constructs.IHaveMovementBehavior.MoverType; +import com.simibubi.create.modules.contraptions.components.constructs.Contraption; +import com.simibubi.create.modules.contraptions.components.constructs.IHaveMovementBehavior.MovementContext; +import com.simibubi.create.modules.contraptions.components.constructs.IHaveMovementBehavior.MoverType; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/receivers/constructs/piston/MechanicalPistonBlock.java b/src/main/java/com/simibubi/create/modules/contraptions/components/constructs/piston/MechanicalPistonBlock.java similarity index 98% rename from src/main/java/com/simibubi/create/modules/contraptions/receivers/constructs/piston/MechanicalPistonBlock.java rename to src/main/java/com/simibubi/create/modules/contraptions/components/constructs/piston/MechanicalPistonBlock.java index d65b563a3..b55f76930 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/receivers/constructs/piston/MechanicalPistonBlock.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/constructs/piston/MechanicalPistonBlock.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.contraptions.receivers.constructs.piston; +package com.simibubi.create.modules.contraptions.components.constructs.piston; import com.simibubi.create.AllBlocks; import com.simibubi.create.CreateConfig; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/receivers/constructs/piston/MechanicalPistonHeadBlock.java b/src/main/java/com/simibubi/create/modules/contraptions/components/constructs/piston/MechanicalPistonHeadBlock.java similarity index 92% rename from src/main/java/com/simibubi/create/modules/contraptions/receivers/constructs/piston/MechanicalPistonHeadBlock.java rename to src/main/java/com/simibubi/create/modules/contraptions/components/constructs/piston/MechanicalPistonHeadBlock.java index bc07eaa50..9f00bd5db 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/receivers/constructs/piston/MechanicalPistonHeadBlock.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/constructs/piston/MechanicalPistonHeadBlock.java @@ -1,11 +1,11 @@ -package com.simibubi.create.modules.contraptions.receivers.constructs.piston; +package com.simibubi.create.modules.contraptions.components.constructs.piston; import com.simibubi.create.AllBlocks; import com.simibubi.create.CreateConfig; import com.simibubi.create.foundation.block.IWithoutBlockItem; import com.simibubi.create.foundation.block.ProperDirectionalBlock; import com.simibubi.create.foundation.utility.AllShapes; -import com.simibubi.create.modules.contraptions.receivers.constructs.piston.MechanicalPistonBlock.PistonState; +import com.simibubi.create.modules.contraptions.components.constructs.piston.MechanicalPistonBlock.PistonState; import net.minecraft.block.Block; import net.minecraft.block.BlockState; @@ -21,7 +21,6 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.util.math.shapes.ISelectionContext; import net.minecraft.util.math.shapes.VoxelShape; -import net.minecraft.util.math.shapes.VoxelShapes; import net.minecraft.world.IBlockReader; import net.minecraft.world.World; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/receivers/constructs/piston/MechanicalPistonTileEntity.java b/src/main/java/com/simibubi/create/modules/contraptions/components/constructs/piston/MechanicalPistonTileEntity.java similarity index 94% rename from src/main/java/com/simibubi/create/modules/contraptions/receivers/constructs/piston/MechanicalPistonTileEntity.java rename to src/main/java/com/simibubi/create/modules/contraptions/components/constructs/piston/MechanicalPistonTileEntity.java index 16af39596..6fa2f5f29 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/receivers/constructs/piston/MechanicalPistonTileEntity.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/constructs/piston/MechanicalPistonTileEntity.java @@ -1,7 +1,7 @@ -package com.simibubi.create.modules.contraptions.receivers.constructs.piston; +package com.simibubi.create.modules.contraptions.components.constructs.piston; import static com.simibubi.create.CreateConfig.parameters; -import static com.simibubi.create.modules.contraptions.receivers.constructs.piston.MechanicalPistonBlock.STATE; +import static com.simibubi.create.modules.contraptions.components.constructs.piston.MechanicalPistonBlock.STATE; import java.util.Arrays; import java.util.Iterator; @@ -12,10 +12,10 @@ import com.simibubi.create.AllBlocks; import com.simibubi.create.AllTileEntities; import com.simibubi.create.Create; import com.simibubi.create.modules.contraptions.base.KineticTileEntity; -import com.simibubi.create.modules.contraptions.receivers.constructs.IHaveMovementBehavior; -import com.simibubi.create.modules.contraptions.receivers.constructs.IHaveMovementBehavior.MovementContext; -import com.simibubi.create.modules.contraptions.receivers.constructs.IHaveMovementBehavior.MoverType; -import com.simibubi.create.modules.contraptions.receivers.constructs.piston.MechanicalPistonBlock.PistonState; +import com.simibubi.create.modules.contraptions.components.constructs.IHaveMovementBehavior; +import com.simibubi.create.modules.contraptions.components.constructs.IHaveMovementBehavior.MovementContext; +import com.simibubi.create.modules.contraptions.components.constructs.IHaveMovementBehavior.MoverType; +import com.simibubi.create.modules.contraptions.components.constructs.piston.MechanicalPistonBlock.PistonState; import net.minecraft.block.Blocks; import net.minecraft.nbt.CompoundNBT; @@ -190,6 +190,8 @@ public class MechanicalPistonTileEntity extends KineticTileEntity { @Override public void tick() { super.tick(); + if (isRemoved()) + return; if (!world.isRemote && assembleNextTick) { assembleNextTick = false; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/receivers/constructs/piston/MechanicalPistonTileEntityRenderer.java b/src/main/java/com/simibubi/create/modules/contraptions/components/constructs/piston/MechanicalPistonTileEntityRenderer.java similarity index 89% rename from src/main/java/com/simibubi/create/modules/contraptions/receivers/constructs/piston/MechanicalPistonTileEntityRenderer.java rename to src/main/java/com/simibubi/create/modules/contraptions/components/constructs/piston/MechanicalPistonTileEntityRenderer.java index 31c31eefb..7ea7d2700 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/receivers/constructs/piston/MechanicalPistonTileEntityRenderer.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/constructs/piston/MechanicalPistonTileEntityRenderer.java @@ -1,10 +1,10 @@ -package com.simibubi.create.modules.contraptions.receivers.constructs.piston; +package com.simibubi.create.modules.contraptions.components.constructs.piston; import com.simibubi.create.AllBlocks; import com.simibubi.create.modules.contraptions.base.IRotate; import com.simibubi.create.modules.contraptions.base.KineticTileEntity; import com.simibubi.create.modules.contraptions.base.KineticTileEntityRenderer; -import com.simibubi.create.modules.contraptions.receivers.constructs.ContraptionRenderer; +import com.simibubi.create.modules.contraptions.components.constructs.ContraptionRenderer; import net.minecraft.block.BlockState; import net.minecraft.client.renderer.BufferBuilder; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/receivers/constructs/piston/MovingConstructHandler.java b/src/main/java/com/simibubi/create/modules/contraptions/components/constructs/piston/MovingConstructHandler.java similarity index 97% rename from src/main/java/com/simibubi/create/modules/contraptions/receivers/constructs/piston/MovingConstructHandler.java rename to src/main/java/com/simibubi/create/modules/contraptions/components/constructs/piston/MovingConstructHandler.java index f45d13375..19b55e135 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/receivers/constructs/piston/MovingConstructHandler.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/constructs/piston/MovingConstructHandler.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.contraptions.receivers.constructs.piston; +package com.simibubi.create.modules.contraptions.components.constructs.piston; import java.util.ArrayList; import java.util.HashMap; @@ -8,7 +8,7 @@ import java.util.Map; import java.util.stream.Stream; import com.simibubi.create.Create; -import com.simibubi.create.modules.contraptions.receivers.constructs.Contraption; +import com.simibubi.create.modules.contraptions.components.constructs.Contraption; import net.minecraft.block.material.PushReaction; import net.minecraft.entity.Entity; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/receivers/constructs/piston/PistonContraption.java b/src/main/java/com/simibubi/create/modules/contraptions/components/constructs/piston/PistonContraption.java similarity index 95% rename from src/main/java/com/simibubi/create/modules/contraptions/receivers/constructs/piston/PistonContraption.java rename to src/main/java/com/simibubi/create/modules/contraptions/components/constructs/piston/PistonContraption.java index c5a0c3ed2..8a1d31b14 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/receivers/constructs/piston/PistonContraption.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/constructs/piston/PistonContraption.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.contraptions.receivers.constructs.piston; +package com.simibubi.create.modules.contraptions.components.constructs.piston; import static com.simibubi.create.AllBlocks.MECHANICAL_PISTON_HEAD; import static com.simibubi.create.AllBlocks.PISTON_POLE; @@ -10,8 +10,8 @@ import java.util.ArrayList; import java.util.List; import com.simibubi.create.AllBlocks; -import com.simibubi.create.modules.contraptions.receivers.constructs.Contraption; -import com.simibubi.create.modules.contraptions.receivers.constructs.piston.MechanicalPistonBlock.PistonState; +import com.simibubi.create.modules.contraptions.components.constructs.Contraption; +import com.simibubi.create.modules.contraptions.components.constructs.piston.MechanicalPistonBlock.PistonState; import net.minecraft.block.BlockState; import net.minecraft.nbt.CompoundNBT; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/receivers/constructs/piston/PistonPoleBlock.java b/src/main/java/com/simibubi/create/modules/contraptions/components/constructs/piston/PistonPoleBlock.java similarity index 94% rename from src/main/java/com/simibubi/create/modules/contraptions/receivers/constructs/piston/PistonPoleBlock.java rename to src/main/java/com/simibubi/create/modules/contraptions/components/constructs/piston/PistonPoleBlock.java index 7c266e950..3d484fab2 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/receivers/constructs/piston/PistonPoleBlock.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/constructs/piston/PistonPoleBlock.java @@ -1,10 +1,10 @@ -package com.simibubi.create.modules.contraptions.receivers.constructs.piston; +package com.simibubi.create.modules.contraptions.components.constructs.piston; import com.simibubi.create.AllBlocks; import com.simibubi.create.CreateConfig; import com.simibubi.create.foundation.block.ProperDirectionalBlock; import com.simibubi.create.foundation.utility.AllShapes; -import com.simibubi.create.modules.contraptions.receivers.constructs.piston.MechanicalPistonBlock.PistonState; +import com.simibubi.create.modules.contraptions.components.constructs.piston.MechanicalPistonBlock.PistonState; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/receivers/crafter/MechanicalCrafterBlock.java b/src/main/java/com/simibubi/create/modules/contraptions/components/crafter/MechanicalCrafterBlock.java similarity index 96% rename from src/main/java/com/simibubi/create/modules/contraptions/receivers/crafter/MechanicalCrafterBlock.java rename to src/main/java/com/simibubi/create/modules/contraptions/components/crafter/MechanicalCrafterBlock.java index b6fc7c964..75ae257c0 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/receivers/crafter/MechanicalCrafterBlock.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/crafter/MechanicalCrafterBlock.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.contraptions.receivers.crafter; +package com.simibubi.create.modules.contraptions.components.crafter; import com.simibubi.create.foundation.block.IWithTileEntity; import com.simibubi.create.modules.contraptions.base.DirectionalKineticBlock; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/receivers/crafter/MechanicalCrafterTileEntity.java b/src/main/java/com/simibubi/create/modules/contraptions/components/crafter/MechanicalCrafterTileEntity.java similarity index 83% rename from src/main/java/com/simibubi/create/modules/contraptions/receivers/crafter/MechanicalCrafterTileEntity.java rename to src/main/java/com/simibubi/create/modules/contraptions/components/crafter/MechanicalCrafterTileEntity.java index 98f5c2a62..00c63b2bd 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/receivers/crafter/MechanicalCrafterTileEntity.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/crafter/MechanicalCrafterTileEntity.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.contraptions.receivers.crafter; +package com.simibubi.create.modules.contraptions.components.crafter; import com.simibubi.create.AllTileEntities; import com.simibubi.create.modules.contraptions.base.KineticTileEntity; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/receivers/crafter/MechanicalCrafterTileEntityRenderer.java b/src/main/java/com/simibubi/create/modules/contraptions/components/crafter/MechanicalCrafterTileEntityRenderer.java similarity index 95% rename from src/main/java/com/simibubi/create/modules/contraptions/receivers/crafter/MechanicalCrafterTileEntityRenderer.java rename to src/main/java/com/simibubi/create/modules/contraptions/components/crafter/MechanicalCrafterTileEntityRenderer.java index d1a41da88..29d9c0b58 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/receivers/crafter/MechanicalCrafterTileEntityRenderer.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/crafter/MechanicalCrafterTileEntityRenderer.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.contraptions.receivers.crafter; +package com.simibubi.create.modules.contraptions.components.crafter; import com.simibubi.create.AllBlocks; import com.simibubi.create.foundation.utility.TessellatorHelper; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/receivers/CrushingRecipe.java b/src/main/java/com/simibubi/create/modules/contraptions/components/crusher/CrushingRecipe.java similarity index 69% rename from src/main/java/com/simibubi/create/modules/contraptions/receivers/CrushingRecipe.java rename to src/main/java/com/simibubi/create/modules/contraptions/components/crusher/CrushingRecipe.java index 4eced9e84..694f68192 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/receivers/CrushingRecipe.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/crusher/CrushingRecipe.java @@ -1,10 +1,11 @@ -package com.simibubi.create.modules.contraptions.receivers; +package com.simibubi.create.modules.contraptions.components.crusher; import java.util.List; import com.simibubi.create.AllRecipes; -import com.simibubi.create.modules.contraptions.base.ProcessingRecipe; -import com.simibubi.create.modules.contraptions.base.StochasticOutput; +import com.simibubi.create.modules.contraptions.processing.ProcessingInventory; +import com.simibubi.create.modules.contraptions.processing.ProcessingRecipe; +import com.simibubi.create.modules.contraptions.processing.StochasticOutput; import net.minecraft.item.crafting.Ingredient; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/receivers/CrushingWheelBlock.java b/src/main/java/com/simibubi/create/modules/contraptions/components/crusher/CrushingWheelBlock.java similarity index 97% rename from src/main/java/com/simibubi/create/modules/contraptions/receivers/CrushingWheelBlock.java rename to src/main/java/com/simibubi/create/modules/contraptions/components/crusher/CrushingWheelBlock.java index a56016c23..7a9b8d78d 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/receivers/CrushingWheelBlock.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/crusher/CrushingWheelBlock.java @@ -1,6 +1,6 @@ -package com.simibubi.create.modules.contraptions.receivers; +package com.simibubi.create.modules.contraptions.components.crusher; -import static com.simibubi.create.modules.contraptions.receivers.CrushingWheelControllerBlock.VALID; +import static com.simibubi.create.modules.contraptions.components.crusher.CrushingWheelControllerBlock.VALID; import com.simibubi.create.AllBlocks; import com.simibubi.create.foundation.utility.AllShapes; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/receivers/CrushingWheelControllerBlock.java b/src/main/java/com/simibubi/create/modules/contraptions/components/crusher/CrushingWheelControllerBlock.java similarity index 98% rename from src/main/java/com/simibubi/create/modules/contraptions/receivers/CrushingWheelControllerBlock.java rename to src/main/java/com/simibubi/create/modules/contraptions/components/crusher/CrushingWheelControllerBlock.java index c3962aaa7..41e67e414 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/receivers/CrushingWheelControllerBlock.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/crusher/CrushingWheelControllerBlock.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.contraptions.receivers; +package com.simibubi.create.modules.contraptions.components.crusher; import java.util.Random; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/receivers/CrushingWheelControllerTileEntity.java b/src/main/java/com/simibubi/create/modules/contraptions/components/crusher/CrushingWheelControllerTileEntity.java similarity index 97% rename from src/main/java/com/simibubi/create/modules/contraptions/receivers/CrushingWheelControllerTileEntity.java rename to src/main/java/com/simibubi/create/modules/contraptions/components/crusher/CrushingWheelControllerTileEntity.java index 39803d515..981b9a4c5 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/receivers/CrushingWheelControllerTileEntity.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/crusher/CrushingWheelControllerTileEntity.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.contraptions.receivers; +package com.simibubi.create.modules.contraptions.components.crusher; import java.util.List; import java.util.Optional; @@ -9,6 +9,7 @@ import com.simibubi.create.AllRecipes; import com.simibubi.create.AllTileEntities; import com.simibubi.create.CreateConfig; import com.simibubi.create.foundation.block.SyncedTileEntity; +import com.simibubi.create.modules.contraptions.processing.ProcessingInventory; import net.minecraft.entity.Entity; import net.minecraft.entity.item.ItemEntity; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/receivers/CrushingWheelTileEntity.java b/src/main/java/com/simibubi/create/modules/contraptions/components/crusher/CrushingWheelTileEntity.java similarity index 90% rename from src/main/java/com/simibubi/create/modules/contraptions/receivers/CrushingWheelTileEntity.java rename to src/main/java/com/simibubi/create/modules/contraptions/components/crusher/CrushingWheelTileEntity.java index 4f6da7e60..7419e45e3 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/receivers/CrushingWheelTileEntity.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/crusher/CrushingWheelTileEntity.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.contraptions.receivers; +package com.simibubi.create.modules.contraptions.components.crusher; import com.simibubi.create.AllTileEntities; import com.simibubi.create.modules.contraptions.base.KineticTileEntity; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/receivers/fan/AirCurrent.java b/src/main/java/com/simibubi/create/modules/contraptions/components/fan/AirCurrent.java similarity index 99% rename from src/main/java/com/simibubi/create/modules/contraptions/receivers/fan/AirCurrent.java rename to src/main/java/com/simibubi/create/modules/contraptions/components/fan/AirCurrent.java index fbcf818e8..917704cb4 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/receivers/fan/AirCurrent.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/fan/AirCurrent.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.contraptions.receivers.fan; +package com.simibubi.create.modules.contraptions.components.fan; import java.util.ArrayList; import java.util.Iterator; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/receivers/fan/EncasedFanBlock.java b/src/main/java/com/simibubi/create/modules/contraptions/components/fan/EncasedFanBlock.java similarity index 97% rename from src/main/java/com/simibubi/create/modules/contraptions/receivers/fan/EncasedFanBlock.java rename to src/main/java/com/simibubi/create/modules/contraptions/components/fan/EncasedFanBlock.java index 5253d6315..7d70bace2 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/receivers/fan/EncasedFanBlock.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/fan/EncasedFanBlock.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.contraptions.receivers.fan; +package com.simibubi.create.modules.contraptions.components.fan; import com.simibubi.create.foundation.block.IWithTileEntity; import com.simibubi.create.modules.contraptions.base.DirectionalKineticBlock; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/receivers/fan/EncasedFanTileEntity.java b/src/main/java/com/simibubi/create/modules/contraptions/components/fan/EncasedFanTileEntity.java similarity index 98% rename from src/main/java/com/simibubi/create/modules/contraptions/receivers/fan/EncasedFanTileEntity.java rename to src/main/java/com/simibubi/create/modules/contraptions/components/fan/EncasedFanTileEntity.java index d4f3a709f..10bc63a47 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/receivers/fan/EncasedFanTileEntity.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/fan/EncasedFanTileEntity.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.contraptions.receivers.fan; +package com.simibubi.create.modules.contraptions.components.fan; import static com.simibubi.create.CreateConfig.parameters; @@ -85,6 +85,7 @@ public class EncasedFanTileEntity extends GeneratingKineticTileEntity { @Override public void onSpeedChanged() { + super.onSpeedChanged(); updateAirFlow = true; } diff --git a/src/main/java/com/simibubi/create/modules/contraptions/receivers/fan/EncasedFanTileEntityRenderer.java b/src/main/java/com/simibubi/create/modules/contraptions/components/fan/EncasedFanTileEntityRenderer.java similarity index 91% rename from src/main/java/com/simibubi/create/modules/contraptions/receivers/fan/EncasedFanTileEntityRenderer.java rename to src/main/java/com/simibubi/create/modules/contraptions/components/fan/EncasedFanTileEntityRenderer.java index 61f50778f..34921e7a5 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/receivers/fan/EncasedFanTileEntityRenderer.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/fan/EncasedFanTileEntityRenderer.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.contraptions.receivers.fan; +package com.simibubi.create.modules.contraptions.components.fan; import static net.minecraft.state.properties.BlockStateProperties.FACING; @@ -23,9 +23,9 @@ public class EncasedFanTileEntityRenderer extends KineticTileEntityRenderer { float time = AnimationTickHolder.getRenderTick(); float speed = te.getSpeed() * 20; if (speed > 0) - speed = MathHelper.clamp(speed, 80, 128 * 20); + speed = MathHelper.clamp(speed, 80, 64 * 20); if (speed < 0) - speed = MathHelper.clamp(speed, -128 * 20, -80); + speed = MathHelper.clamp(speed, -64 * 20, -80); float angle = (time * speed) % 360; angle = angle / 180f * (float) Math.PI; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/receivers/fan/SplashingRecipe.java b/src/main/java/com/simibubi/create/modules/contraptions/components/fan/SplashingRecipe.java similarity index 79% rename from src/main/java/com/simibubi/create/modules/contraptions/receivers/fan/SplashingRecipe.java rename to src/main/java/com/simibubi/create/modules/contraptions/components/fan/SplashingRecipe.java index 31b95b797..6b3f853a9 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/receivers/fan/SplashingRecipe.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/fan/SplashingRecipe.java @@ -1,10 +1,10 @@ -package com.simibubi.create.modules.contraptions.receivers.fan; +package com.simibubi.create.modules.contraptions.components.fan; import java.util.List; import com.simibubi.create.AllRecipes; -import com.simibubi.create.modules.contraptions.base.ProcessingRecipe; -import com.simibubi.create.modules.contraptions.base.StochasticOutput; +import com.simibubi.create.modules.contraptions.processing.ProcessingRecipe; +import com.simibubi.create.modules.contraptions.processing.StochasticOutput; import com.simibubi.create.modules.logistics.InWorldProcessing; import com.simibubi.create.modules.logistics.InWorldProcessing.SplashingInv; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/receivers/ConfigureMixerPacket.java b/src/main/java/com/simibubi/create/modules/contraptions/components/mixer/ConfigureMixerPacket.java similarity index 92% rename from src/main/java/com/simibubi/create/modules/contraptions/receivers/ConfigureMixerPacket.java rename to src/main/java/com/simibubi/create/modules/contraptions/components/mixer/ConfigureMixerPacket.java index 65e017442..b23bd1651 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/receivers/ConfigureMixerPacket.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/mixer/ConfigureMixerPacket.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.contraptions.receivers; +package com.simibubi.create.modules.contraptions.components.mixer; import com.simibubi.create.foundation.packet.TileEntityConfigurationPacket; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/receivers/MechanicalMixerBlock.java b/src/main/java/com/simibubi/create/modules/contraptions/components/mixer/MechanicalMixerBlock.java similarity index 98% rename from src/main/java/com/simibubi/create/modules/contraptions/receivers/MechanicalMixerBlock.java rename to src/main/java/com/simibubi/create/modules/contraptions/components/mixer/MechanicalMixerBlock.java index e8ccfde1a..a0084c422 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/receivers/MechanicalMixerBlock.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/mixer/MechanicalMixerBlock.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.contraptions.receivers; +package com.simibubi.create.modules.contraptions.components.mixer; import com.simibubi.create.AllBlocks; import com.simibubi.create.foundation.block.IBlockWithScrollableValue; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/receivers/MechanicalMixerTileEntity.java b/src/main/java/com/simibubi/create/modules/contraptions/components/mixer/MechanicalMixerTileEntity.java similarity index 97% rename from src/main/java/com/simibubi/create/modules/contraptions/receivers/MechanicalMixerTileEntity.java rename to src/main/java/com/simibubi/create/modules/contraptions/components/mixer/MechanicalMixerTileEntity.java index a0ecf96df..76abf4619 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/receivers/MechanicalMixerTileEntity.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/mixer/MechanicalMixerTileEntity.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.contraptions.receivers; +package com.simibubi.create.modules.contraptions.components.mixer; import java.util.ArrayList; import java.util.LinkedList; @@ -9,7 +9,8 @@ import com.simibubi.create.AllPackets; import com.simibubi.create.AllTileEntities; import com.simibubi.create.foundation.utility.VecHelper; import com.simibubi.create.modules.contraptions.base.KineticTileEntity; -import com.simibubi.create.modules.contraptions.receivers.BasinTileEntity.BasinInventory; +import com.simibubi.create.modules.contraptions.processing.BasinTileEntity; +import com.simibubi.create.modules.contraptions.processing.BasinTileEntity.BasinInventory; import net.minecraft.inventory.IInventory; import net.minecraft.item.BucketItem; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/receivers/MechanicalMixerTileEntityRenderer.java b/src/main/java/com/simibubi/create/modules/contraptions/components/mixer/MechanicalMixerTileEntityRenderer.java similarity index 96% rename from src/main/java/com/simibubi/create/modules/contraptions/receivers/MechanicalMixerTileEntityRenderer.java rename to src/main/java/com/simibubi/create/modules/contraptions/components/mixer/MechanicalMixerTileEntityRenderer.java index d847e33a1..ed2b3b362 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/receivers/MechanicalMixerTileEntityRenderer.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/mixer/MechanicalMixerTileEntityRenderer.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.contraptions.receivers; +package com.simibubi.create.modules.contraptions.components.mixer; import com.simibubi.create.AllBlocks; import com.simibubi.create.CreateClient; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/receivers/MixingRecipe.java b/src/main/java/com/simibubi/create/modules/contraptions/components/mixer/MixingRecipe.java similarity index 83% rename from src/main/java/com/simibubi/create/modules/contraptions/receivers/MixingRecipe.java rename to src/main/java/com/simibubi/create/modules/contraptions/components/mixer/MixingRecipe.java index 0d5809b11..e55450a16 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/receivers/MixingRecipe.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/mixer/MixingRecipe.java @@ -1,13 +1,13 @@ -package com.simibubi.create.modules.contraptions.receivers; +package com.simibubi.create.modules.contraptions.components.mixer; import java.util.ArrayList; import java.util.LinkedList; import java.util.List; import com.simibubi.create.AllRecipes; -import com.simibubi.create.modules.contraptions.base.ProcessingRecipe; -import com.simibubi.create.modules.contraptions.base.StochasticOutput; -import com.simibubi.create.modules.contraptions.receivers.BasinTileEntity.BasinInputInventory; +import com.simibubi.create.modules.contraptions.processing.BasinTileEntity.BasinInputInventory; +import com.simibubi.create.modules.contraptions.processing.ProcessingRecipe; +import com.simibubi.create.modules.contraptions.processing.StochasticOutput; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.Ingredient; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/generators/ConfigureMotorPacket.java b/src/main/java/com/simibubi/create/modules/contraptions/components/motor/ConfigureMotorPacket.java similarity index 91% rename from src/main/java/com/simibubi/create/modules/contraptions/generators/ConfigureMotorPacket.java rename to src/main/java/com/simibubi/create/modules/contraptions/components/motor/ConfigureMotorPacket.java index b5cc8ba04..7c3186b8a 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/generators/ConfigureMotorPacket.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/motor/ConfigureMotorPacket.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.contraptions.generators; +package com.simibubi.create.modules.contraptions.components.motor; import com.simibubi.create.foundation.packet.TileEntityConfigurationPacket; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/generators/MotorBlock.java b/src/main/java/com/simibubi/create/modules/contraptions/components/motor/MotorBlock.java similarity index 97% rename from src/main/java/com/simibubi/create/modules/contraptions/generators/MotorBlock.java rename to src/main/java/com/simibubi/create/modules/contraptions/components/motor/MotorBlock.java index de43e9ee1..1e4af704c 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/generators/MotorBlock.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/motor/MotorBlock.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.contraptions.generators; +package com.simibubi.create.modules.contraptions.components.motor; import com.simibubi.create.foundation.block.IBlockWithScrollableValue; import com.simibubi.create.foundation.block.IWithTileEntity; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/generators/MotorTileEntity.java b/src/main/java/com/simibubi/create/modules/contraptions/components/motor/MotorTileEntity.java similarity index 96% rename from src/main/java/com/simibubi/create/modules/contraptions/generators/MotorTileEntity.java rename to src/main/java/com/simibubi/create/modules/contraptions/components/motor/MotorTileEntity.java index 4b54548cf..4e8f4cb44 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/generators/MotorTileEntity.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/motor/MotorTileEntity.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.contraptions.generators; +package com.simibubi.create.modules.contraptions.components.motor; import java.util.UUID; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/generators/MotorTileEntityRenderer.java b/src/main/java/com/simibubi/create/modules/contraptions/components/motor/MotorTileEntityRenderer.java similarity index 90% rename from src/main/java/com/simibubi/create/modules/contraptions/generators/MotorTileEntityRenderer.java rename to src/main/java/com/simibubi/create/modules/contraptions/components/motor/MotorTileEntityRenderer.java index e6586df99..a933edc01 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/generators/MotorTileEntityRenderer.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/motor/MotorTileEntityRenderer.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.contraptions.generators; +package com.simibubi.create.modules.contraptions.components.motor; import com.simibubi.create.AllBlocks; import com.simibubi.create.modules.contraptions.base.KineticTileEntity; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/receivers/MechanicalPressBlock.java b/src/main/java/com/simibubi/create/modules/contraptions/components/press/MechanicalPressBlock.java similarity index 98% rename from src/main/java/com/simibubi/create/modules/contraptions/receivers/MechanicalPressBlock.java rename to src/main/java/com/simibubi/create/modules/contraptions/components/press/MechanicalPressBlock.java index 325b04b3d..29dae94ee 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/receivers/MechanicalPressBlock.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/press/MechanicalPressBlock.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.contraptions.receivers; +package com.simibubi.create.modules.contraptions.components.press; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/receivers/MechanicalPressTileEntity.java b/src/main/java/com/simibubi/create/modules/contraptions/components/press/MechanicalPressTileEntity.java similarity index 98% rename from src/main/java/com/simibubi/create/modules/contraptions/receivers/MechanicalPressTileEntity.java rename to src/main/java/com/simibubi/create/modules/contraptions/components/press/MechanicalPressTileEntity.java index 348878c48..0f51edba6 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/receivers/MechanicalPressTileEntity.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/press/MechanicalPressTileEntity.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.contraptions.receivers; +package com.simibubi.create.modules.contraptions.components.press; import java.util.Optional; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/receivers/MechanicalPressTileEntityRenderer.java b/src/main/java/com/simibubi/create/modules/contraptions/components/press/MechanicalPressTileEntityRenderer.java similarity index 96% rename from src/main/java/com/simibubi/create/modules/contraptions/receivers/MechanicalPressTileEntityRenderer.java rename to src/main/java/com/simibubi/create/modules/contraptions/components/press/MechanicalPressTileEntityRenderer.java index f3dd180d8..ecd5a0c3b 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/receivers/MechanicalPressTileEntityRenderer.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/press/MechanicalPressTileEntityRenderer.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.contraptions.receivers; +package com.simibubi.create.modules.contraptions.components.press; import static net.minecraft.state.properties.BlockStateProperties.HORIZONTAL_FACING; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/receivers/PressingRecipe.java b/src/main/java/com/simibubi/create/modules/contraptions/components/press/PressingRecipe.java similarity index 68% rename from src/main/java/com/simibubi/create/modules/contraptions/receivers/PressingRecipe.java rename to src/main/java/com/simibubi/create/modules/contraptions/components/press/PressingRecipe.java index 0b973f18a..4d82afe7d 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/receivers/PressingRecipe.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/press/PressingRecipe.java @@ -1,11 +1,11 @@ -package com.simibubi.create.modules.contraptions.receivers; +package com.simibubi.create.modules.contraptions.components.press; import java.util.List; import com.simibubi.create.AllRecipes; -import com.simibubi.create.modules.contraptions.base.ProcessingRecipe; -import com.simibubi.create.modules.contraptions.base.StochasticOutput; -import com.simibubi.create.modules.contraptions.receivers.MechanicalPressTileEntity.PressingInv; +import com.simibubi.create.modules.contraptions.components.press.MechanicalPressTileEntity.PressingInv; +import com.simibubi.create.modules.contraptions.processing.ProcessingRecipe; +import com.simibubi.create.modules.contraptions.processing.StochasticOutput; import net.minecraft.item.crafting.Ingredient; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/receivers/CuttingRecipe.java b/src/main/java/com/simibubi/create/modules/contraptions/components/saw/CuttingRecipe.java similarity index 69% rename from src/main/java/com/simibubi/create/modules/contraptions/receivers/CuttingRecipe.java rename to src/main/java/com/simibubi/create/modules/contraptions/components/saw/CuttingRecipe.java index 00bf4885c..9501268be 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/receivers/CuttingRecipe.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/saw/CuttingRecipe.java @@ -1,10 +1,11 @@ -package com.simibubi.create.modules.contraptions.receivers; +package com.simibubi.create.modules.contraptions.components.saw; import java.util.List; import com.simibubi.create.AllRecipes; -import com.simibubi.create.modules.contraptions.base.ProcessingRecipe; -import com.simibubi.create.modules.contraptions.base.StochasticOutput; +import com.simibubi.create.modules.contraptions.processing.ProcessingInventory; +import com.simibubi.create.modules.contraptions.processing.ProcessingRecipe; +import com.simibubi.create.modules.contraptions.processing.StochasticOutput; import net.minecraft.item.crafting.Ingredient; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/receivers/SawBlock.java b/src/main/java/com/simibubi/create/modules/contraptions/components/saw/SawBlock.java similarity index 97% rename from src/main/java/com/simibubi/create/modules/contraptions/receivers/SawBlock.java rename to src/main/java/com/simibubi/create/modules/contraptions/components/saw/SawBlock.java index a7534c611..fa55ab0a6 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/receivers/SawBlock.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/saw/SawBlock.java @@ -1,9 +1,9 @@ -package com.simibubi.create.modules.contraptions.receivers; +package com.simibubi.create.modules.contraptions.components.saw; import com.simibubi.create.foundation.block.IWithTileEntity; import com.simibubi.create.foundation.utility.AllShapes; import com.simibubi.create.modules.contraptions.base.DirectionalAxisKineticBlock; -import com.simibubi.create.modules.contraptions.receivers.constructs.IHaveMovementBehavior; +import com.simibubi.create.modules.contraptions.components.constructs.IHaveMovementBehavior; import com.simibubi.create.modules.logistics.block.IBlockWithFilter; import net.minecraft.block.Block; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/receivers/SawTileEntity.java b/src/main/java/com/simibubi/create/modules/contraptions/components/saw/SawTileEntity.java similarity index 97% rename from src/main/java/com/simibubi/create/modules/contraptions/receivers/SawTileEntity.java rename to src/main/java/com/simibubi/create/modules/contraptions/components/saw/SawTileEntity.java index b20757e8f..33159657b 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/receivers/SawTileEntity.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/saw/SawTileEntity.java @@ -1,6 +1,6 @@ -package com.simibubi.create.modules.contraptions.receivers; +package com.simibubi.create.modules.contraptions.components.saw; -import static com.simibubi.create.modules.contraptions.receivers.SawBlock.RUNNING; +import static com.simibubi.create.modules.contraptions.components.saw.SawBlock.RUNNING; import java.util.LinkedList; import java.util.List; @@ -13,6 +13,7 @@ import com.simibubi.create.foundation.utility.VecHelper; import com.simibubi.create.foundation.utility.recipe.RecipeConditions; import com.simibubi.create.foundation.utility.recipe.RecipeFinder; import com.simibubi.create.modules.contraptions.base.KineticTileEntity; +import com.simibubi.create.modules.contraptions.processing.ProcessingInventory; import com.simibubi.create.modules.contraptions.relays.belt.BeltTileEntity; import com.simibubi.create.modules.logistics.block.IHaveFilter; @@ -62,6 +63,7 @@ public class SawTileEntity extends KineticTileEntity implements IHaveFilter { @Override public void onSpeedChanged() { + super.onSpeedChanged(); boolean shouldRun = Math.abs(getSpeed()) > 1 / 64f; boolean running = getBlockState().get(RUNNING); if (shouldRun != running) diff --git a/src/main/java/com/simibubi/create/modules/contraptions/receivers/SawTileEntityRenderer.java b/src/main/java/com/simibubi/create/modules/contraptions/components/saw/SawTileEntityRenderer.java similarity index 98% rename from src/main/java/com/simibubi/create/modules/contraptions/receivers/SawTileEntityRenderer.java rename to src/main/java/com/simibubi/create/modules/contraptions/components/saw/SawTileEntityRenderer.java index b8063f67a..b82f97fa1 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/receivers/SawTileEntityRenderer.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/saw/SawTileEntityRenderer.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.contraptions.receivers; +package com.simibubi.create.modules.contraptions.components.saw; import static net.minecraft.state.properties.BlockStateProperties.AXIS; import static net.minecraft.state.properties.BlockStateProperties.FACING; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/receivers/TurntableBlock.java b/src/main/java/com/simibubi/create/modules/contraptions/components/turntable/TurntableBlock.java similarity index 94% rename from src/main/java/com/simibubi/create/modules/contraptions/receivers/TurntableBlock.java rename to src/main/java/com/simibubi/create/modules/contraptions/components/turntable/TurntableBlock.java index 190b7d107..c2308f351 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/receivers/TurntableBlock.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/turntable/TurntableBlock.java @@ -1,11 +1,10 @@ -package com.simibubi.create.modules.contraptions.receivers; +package com.simibubi.create.modules.contraptions.components.turntable; import com.simibubi.create.foundation.utility.AllShapes; import com.simibubi.create.foundation.utility.VecHelper; import com.simibubi.create.modules.contraptions.base.KineticBlock; import com.simibubi.create.modules.contraptions.base.KineticTileEntity; -import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.entity.Entity; @@ -18,7 +17,6 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Vec3d; import net.minecraft.util.math.shapes.ISelectionContext; import net.minecraft.util.math.shapes.VoxelShape; -import net.minecraft.util.math.shapes.VoxelShapes; import net.minecraft.world.IBlockReader; import net.minecraft.world.World; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/receivers/TurntableHandler.java b/src/main/java/com/simibubi/create/modules/contraptions/components/turntable/TurntableHandler.java similarity index 91% rename from src/main/java/com/simibubi/create/modules/contraptions/receivers/TurntableHandler.java rename to src/main/java/com/simibubi/create/modules/contraptions/components/turntable/TurntableHandler.java index 7d69b8241..175d11bd8 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/receivers/TurntableHandler.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/turntable/TurntableHandler.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.contraptions.receivers; +package com.simibubi.create.modules.contraptions.components.turntable; import com.simibubi.create.AllBlocks; import com.simibubi.create.modules.contraptions.base.KineticTileEntity; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/receivers/TurntableTileEntity.java b/src/main/java/com/simibubi/create/modules/contraptions/components/turntable/TurntableTileEntity.java similarity index 78% rename from src/main/java/com/simibubi/create/modules/contraptions/receivers/TurntableTileEntity.java rename to src/main/java/com/simibubi/create/modules/contraptions/components/turntable/TurntableTileEntity.java index f81931397..3b83db044 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/receivers/TurntableTileEntity.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/turntable/TurntableTileEntity.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.contraptions.receivers; +package com.simibubi.create.modules.contraptions.components.turntable; import com.simibubi.create.AllTileEntities; import com.simibubi.create.modules.contraptions.base.KineticTileEntity; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/generators/WaterWheelBlock.java b/src/main/java/com/simibubi/create/modules/contraptions/components/waterwheel/WaterWheelBlock.java similarity index 98% rename from src/main/java/com/simibubi/create/modules/contraptions/generators/WaterWheelBlock.java rename to src/main/java/com/simibubi/create/modules/contraptions/components/waterwheel/WaterWheelBlock.java index 51bdb9c90..b27ec550d 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/generators/WaterWheelBlock.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/waterwheel/WaterWheelBlock.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.contraptions.generators; +package com.simibubi.create.modules.contraptions.components.waterwheel; import com.simibubi.create.AllBlocks; import com.simibubi.create.modules.contraptions.base.HorizontalKineticBlock; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/generators/WaterWheelTileEntity.java b/src/main/java/com/simibubi/create/modules/contraptions/components/waterwheel/WaterWheelTileEntity.java similarity index 95% rename from src/main/java/com/simibubi/create/modules/contraptions/generators/WaterWheelTileEntity.java rename to src/main/java/com/simibubi/create/modules/contraptions/components/waterwheel/WaterWheelTileEntity.java index dfa3743dd..d8f0000ab 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/generators/WaterWheelTileEntity.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/waterwheel/WaterWheelTileEntity.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.contraptions.generators; +package com.simibubi.create.modules.contraptions.components.waterwheel; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/particle/AirFlowParticle.java b/src/main/java/com/simibubi/create/modules/contraptions/particle/AirFlowParticle.java index d12fe1e9e..e24311cc6 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/particle/AirFlowParticle.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/particle/AirFlowParticle.java @@ -2,7 +2,7 @@ package com.simibubi.create.modules.contraptions.particle; import com.simibubi.create.foundation.utility.ColorHelper; import com.simibubi.create.foundation.utility.VecHelper; -import com.simibubi.create.modules.contraptions.receivers.fan.EncasedFanTileEntity; +import com.simibubi.create.modules.contraptions.components.fan.EncasedFanTileEntity; import com.simibubi.create.modules.logistics.InWorldProcessing; import net.minecraft.block.Blocks; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/receivers/BasinBlock.java b/src/main/java/com/simibubi/create/modules/contraptions/processing/BasinBlock.java similarity index 98% rename from src/main/java/com/simibubi/create/modules/contraptions/receivers/BasinBlock.java rename to src/main/java/com/simibubi/create/modules/contraptions/processing/BasinBlock.java index d7cad991e..01c75400a 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/receivers/BasinBlock.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/processing/BasinBlock.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.contraptions.receivers; +package com.simibubi.create.modules.contraptions.processing; import com.simibubi.create.AllBlocks; import com.simibubi.create.foundation.block.IWithTileEntity; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/receivers/BasinTileEntity.java b/src/main/java/com/simibubi/create/modules/contraptions/processing/BasinTileEntity.java similarity index 96% rename from src/main/java/com/simibubi/create/modules/contraptions/receivers/BasinTileEntity.java rename to src/main/java/com/simibubi/create/modules/contraptions/processing/BasinTileEntity.java index e1513a9f5..3c49a1ae9 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/receivers/BasinTileEntity.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/processing/BasinTileEntity.java @@ -1,7 +1,8 @@ -package com.simibubi.create.modules.contraptions.receivers; +package com.simibubi.create.modules.contraptions.processing; import com.simibubi.create.AllTileEntities; import com.simibubi.create.foundation.block.SyncedTileEntity; +import com.simibubi.create.modules.contraptions.components.mixer.MechanicalMixerTileEntity; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/receivers/BasinTileEntityRenderer.java b/src/main/java/com/simibubi/create/modules/contraptions/processing/BasinTileEntityRenderer.java similarity index 96% rename from src/main/java/com/simibubi/create/modules/contraptions/receivers/BasinTileEntityRenderer.java rename to src/main/java/com/simibubi/create/modules/contraptions/processing/BasinTileEntityRenderer.java index 82734a9b6..11556f1d9 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/receivers/BasinTileEntityRenderer.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/processing/BasinTileEntityRenderer.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.contraptions.receivers; +package com.simibubi.create.modules.contraptions.processing; import java.util.Random; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/receivers/ProcessingInventory.java b/src/main/java/com/simibubi/create/modules/contraptions/processing/ProcessingInventory.java similarity index 93% rename from src/main/java/com/simibubi/create/modules/contraptions/receivers/ProcessingInventory.java rename to src/main/java/com/simibubi/create/modules/contraptions/processing/ProcessingInventory.java index 63bb24193..8bcdbba8d 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/receivers/ProcessingInventory.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/processing/ProcessingInventory.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.contraptions.receivers; +package com.simibubi.create.modules.contraptions.processing; import net.minecraft.inventory.ItemStackHelper; import net.minecraft.item.ItemStack; @@ -9,9 +9,9 @@ import net.minecraftforge.items.ItemStackHandler; import net.minecraftforge.items.wrapper.RecipeWrapper; public class ProcessingInventory extends RecipeWrapper implements IItemHandler { - protected int remainingTime; - protected int recipeDuration; - protected boolean appliedRecipe; + public int remainingTime; + public int recipeDuration; + public boolean appliedRecipe; public ProcessingInventory() { super(new ItemStackHandler(10)); diff --git a/src/main/java/com/simibubi/create/modules/contraptions/base/ProcessingRecipe.java b/src/main/java/com/simibubi/create/modules/contraptions/processing/ProcessingRecipe.java similarity index 97% rename from src/main/java/com/simibubi/create/modules/contraptions/base/ProcessingRecipe.java rename to src/main/java/com/simibubi/create/modules/contraptions/processing/ProcessingRecipe.java index 0d552fa13..ef469f4ab 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/base/ProcessingRecipe.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/processing/ProcessingRecipe.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.contraptions.base; +package com.simibubi.create.modules.contraptions.processing; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/base/ProcessingRecipeSerializer.java b/src/main/java/com/simibubi/create/modules/contraptions/processing/ProcessingRecipeSerializer.java similarity index 97% rename from src/main/java/com/simibubi/create/modules/contraptions/base/ProcessingRecipeSerializer.java rename to src/main/java/com/simibubi/create/modules/contraptions/processing/ProcessingRecipeSerializer.java index 349fcc6da..6ba2bd8db 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/base/ProcessingRecipeSerializer.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/processing/ProcessingRecipeSerializer.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.contraptions.base; +package com.simibubi.create.modules.contraptions.processing; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/base/StochasticOutput.java b/src/main/java/com/simibubi/create/modules/contraptions/processing/StochasticOutput.java similarity index 93% rename from src/main/java/com/simibubi/create/modules/contraptions/base/StochasticOutput.java rename to src/main/java/com/simibubi/create/modules/contraptions/processing/StochasticOutput.java index 5eec2bc7c..425c7a769 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/base/StochasticOutput.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/processing/StochasticOutput.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.contraptions.base; +package com.simibubi.create.modules.contraptions.processing; import java.util.Random; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/redstone/ContactBlock.java b/src/main/java/com/simibubi/create/modules/contraptions/redstone/ContactBlock.java index 93f076fcd..cc3ca1aaf 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/redstone/ContactBlock.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/redstone/ContactBlock.java @@ -4,7 +4,7 @@ import java.util.Random; import com.simibubi.create.AllBlocks; import com.simibubi.create.foundation.block.ProperDirectionalBlock; -import com.simibubi.create.modules.contraptions.receivers.constructs.IHaveMovementBehavior; +import com.simibubi.create.modules.contraptions.components.constructs.IHaveMovementBehavior; import net.minecraft.block.Block; import net.minecraft.block.BlockState; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/relays/ClutchBlock.java b/src/main/java/com/simibubi/create/modules/contraptions/relays/ClutchBlock.java deleted file mode 100644 index 2205548f7..000000000 --- a/src/main/java/com/simibubi/create/modules/contraptions/relays/ClutchBlock.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.simibubi.create.modules.contraptions.relays; - -import net.minecraft.block.BlockState; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.IBlockReader; - -public class ClutchBlock extends GearshiftBlock { - - @Override - public TileEntity createTileEntity(BlockState state, IBlockReader world) { - return new ClutchTileEntity(); - } - -} diff --git a/src/main/java/com/simibubi/create/modules/contraptions/relays/EncasedBeltBlock.java b/src/main/java/com/simibubi/create/modules/contraptions/relays/EncasedBeltBlock.java deleted file mode 100644 index fea9e9363..000000000 --- a/src/main/java/com/simibubi/create/modules/contraptions/relays/EncasedBeltBlock.java +++ /dev/null @@ -1,106 +0,0 @@ -package com.simibubi.create.modules.contraptions.relays; - -import com.google.common.base.Predicates; -import com.simibubi.create.modules.contraptions.base.RotatedPillarKineticBlock; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.block.Blocks; -import net.minecraft.item.BlockItemUseContext; -import net.minecraft.state.BooleanProperty; -import net.minecraft.state.DirectionProperty; -import net.minecraft.state.StateContainer.Builder; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Direction; -import net.minecraft.util.Direction.Axis; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockReader; -import net.minecraft.world.IWorld; -import net.minecraft.world.World; - -public class EncasedBeltBlock extends RotatedPillarKineticBlock { - - public static final BooleanProperty CONNECTED = BooleanProperty.create("attached"); - public static final DirectionProperty CONNECTED_FACE = DirectionProperty.create("attach_face", - Predicates.alwaysTrue()); - - public EncasedBeltBlock() { - super(Properties.from(Blocks.ANDESITE)); - setDefaultState(getDefaultState().with(CONNECTED, false)); - } - - @Override - protected void fillStateContainer(Builder builder) { - super.fillStateContainer(builder); - builder.add(CONNECTED, CONNECTED_FACE); - } - - @Override - public boolean isSolid(BlockState state) { - return false; - } - - @Override - public BlockState getStateForPlacement(BlockItemUseContext context) { - BlockState state = getDefaultState().with(AXIS, context.getNearestLookingDirection().getAxis()); - - for (Direction face : Direction.values()) { - BlockState neighbour = context.getWorld().getBlockState(context.getPos().offset(face)); - if (neighbour.getBlock() != this || neighbour.get(CONNECTED)) - continue; - if (neighbour.get(AXIS) == face.getAxis()) - continue; - if (state.get(AXIS) == face.getAxis()) - continue; - - return state.with(CONNECTED, true).with(CONNECTED_FACE, face); - } - return state; - } - - @Override - public BlockState updatePostPlacement(BlockState stateIn, Direction face, BlockState neighbour, IWorld worldIn, - BlockPos currentPos, BlockPos facingPos) { - if (neighbour.getBlock() != this || !neighbour.get(CONNECTED)) - return stateIn; - if (neighbour.get(CONNECTED_FACE) != face.getOpposite()) - return stateIn; - if (neighbour.get(AXIS) == face.getAxis()) - return stateIn; - - return stateIn.with(CONNECTED, true).with(CONNECTED_FACE, face); - } - - @SuppressWarnings("deprecation") - @Override - public void onReplaced(BlockState state, World worldIn, BlockPos pos, BlockState newState, boolean isMoving) { - super.onReplaced(state, worldIn, pos, newState, isMoving); - if (!state.get(CONNECTED)) - return; - BlockPos attached = pos.offset(state.get(CONNECTED_FACE)); - BlockState attachedState = worldIn.getBlockState(attached); - if (attachedState.getBlock() == this) - worldIn.setBlockState(attached, attachedState.with(CONNECTED, false), 3); - } - - @Override - public boolean hasShaftTowards(World world, BlockPos pos, BlockState state, Direction face) { - return face.getAxis() == state.get(AXIS); - } - - @Override - public Axis getRotationAxis(BlockState state) { - return state.get(AXIS); - } - - @Override - public TileEntity createTileEntity(BlockState state, IBlockReader world) { - return new EncasedShaftTileEntity(); - } - - @Override - protected boolean hasStaticPart() { - return true; - } - -} diff --git a/src/main/java/com/simibubi/create/modules/contraptions/relays/belt/BeltConnectorItem.java b/src/main/java/com/simibubi/create/modules/contraptions/relays/belt/BeltConnectorItem.java index 80fc29885..201a6ae43 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/relays/belt/BeltConnectorItem.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/relays/belt/BeltConnectorItem.java @@ -6,9 +6,9 @@ import java.util.List; import com.simibubi.create.AllBlocks; import com.simibubi.create.CreateConfig; import com.simibubi.create.modules.contraptions.base.KineticTileEntity; -import com.simibubi.create.modules.contraptions.relays.ShaftBlock; import com.simibubi.create.modules.contraptions.relays.belt.BeltBlock.Part; import com.simibubi.create.modules.contraptions.relays.belt.BeltBlock.Slope; +import com.simibubi.create.modules.contraptions.relays.elementary.ShaftBlock; import net.minecraft.block.BlockState; import net.minecraft.item.BlockItem; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/relays/CogWheelBlock.java b/src/main/java/com/simibubi/create/modules/contraptions/relays/elementary/CogWheelBlock.java similarity index 94% rename from src/main/java/com/simibubi/create/modules/contraptions/relays/CogWheelBlock.java rename to src/main/java/com/simibubi/create/modules/contraptions/relays/elementary/CogWheelBlock.java index d5dab9245..8e887f94c 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/relays/CogWheelBlock.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/relays/elementary/CogWheelBlock.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.contraptions.relays; +package com.simibubi.create.modules.contraptions.relays.elementary; import com.simibubi.create.AllBlocks; import com.simibubi.create.foundation.utility.AllShapes; @@ -9,11 +9,9 @@ import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.item.BlockItemUseContext; import net.minecraft.util.Direction; -import net.minecraft.util.Direction.Axis; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.shapes.ISelectionContext; import net.minecraft.util.math.shapes.VoxelShape; -import net.minecraft.util.math.shapes.VoxelShapes; import net.minecraft.world.IBlockReader; import net.minecraft.world.IWorldReader; import net.minecraft.world.World; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/relays/ShaftBlock.java b/src/main/java/com/simibubi/create/modules/contraptions/relays/elementary/ShaftBlock.java similarity index 95% rename from src/main/java/com/simibubi/create/modules/contraptions/relays/ShaftBlock.java rename to src/main/java/com/simibubi/create/modules/contraptions/relays/elementary/ShaftBlock.java index b7c9e805f..a2e4af1d0 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/relays/ShaftBlock.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/relays/elementary/ShaftBlock.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.contraptions.relays; +package com.simibubi.create.modules.contraptions.relays.elementary; import com.simibubi.create.foundation.utility.AllShapes; import com.simibubi.create.modules.contraptions.base.RotatedPillarKineticBlock; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/relays/ShaftHalfBlock.java b/src/main/java/com/simibubi/create/modules/contraptions/relays/elementary/ShaftHalfBlock.java similarity index 82% rename from src/main/java/com/simibubi/create/modules/contraptions/relays/ShaftHalfBlock.java rename to src/main/java/com/simibubi/create/modules/contraptions/relays/elementary/ShaftHalfBlock.java index c6ddda9ca..8c459ecf5 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/relays/ShaftHalfBlock.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/relays/elementary/ShaftHalfBlock.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.contraptions.relays; +package com.simibubi.create.modules.contraptions.relays.elementary; import com.simibubi.create.foundation.block.IWithoutBlockItem; import com.simibubi.create.foundation.block.ProperDirectionalBlock; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/relays/ShaftTileEntity.java b/src/main/java/com/simibubi/create/modules/contraptions/relays/elementary/ShaftTileEntity.java similarity index 85% rename from src/main/java/com/simibubi/create/modules/contraptions/relays/ShaftTileEntity.java rename to src/main/java/com/simibubi/create/modules/contraptions/relays/elementary/ShaftTileEntity.java index 421a4c78e..a71dc9c31 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/relays/ShaftTileEntity.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/relays/elementary/ShaftTileEntity.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.contraptions.relays; +package com.simibubi.create.modules.contraptions.relays.elementary; import com.simibubi.create.AllTileEntities; import com.simibubi.create.modules.contraptions.base.KineticTileEntity; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/relays/encased/ClutchBlock.java b/src/main/java/com/simibubi/create/modules/contraptions/relays/encased/ClutchBlock.java new file mode 100644 index 000000000..824e5f7dc --- /dev/null +++ b/src/main/java/com/simibubi/create/modules/contraptions/relays/encased/ClutchBlock.java @@ -0,0 +1,39 @@ +package com.simibubi.create.modules.contraptions.relays.encased; + +import com.simibubi.create.modules.contraptions.RotationPropagator; +import com.simibubi.create.modules.contraptions.base.KineticTileEntity; + +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.IBlockReader; +import net.minecraft.world.World; + +public class ClutchBlock extends GearshiftBlock { + + @Override + public TileEntity createTileEntity(BlockState state, IBlockReader world) { + return new ClutchTileEntity(); + } + + @Override + public void neighborChanged(BlockState state, World worldIn, BlockPos pos, Block blockIn, BlockPos fromPos, + boolean isMoving) { + if (worldIn.isRemote) + return; + + boolean previouslyPowered = state.get(POWERED); + if (previouslyPowered != worldIn.isBlockPowered(pos)) { + worldIn.setBlockState(pos, state.cycle(POWERED), 2 | 16); + TileEntity te = worldIn.getTileEntity(pos); + if (te == null || !(te instanceof KineticTileEntity)) + return; + if (previouslyPowered) + RotationPropagator.handleAdded(worldIn, pos, (KineticTileEntity) te); + else + RotationPropagator.handleRemoved(worldIn, pos, (KineticTileEntity) te); + } + } + +} diff --git a/src/main/java/com/simibubi/create/modules/contraptions/relays/ClutchTileEntity.java b/src/main/java/com/simibubi/create/modules/contraptions/relays/encased/ClutchTileEntity.java similarity index 88% rename from src/main/java/com/simibubi/create/modules/contraptions/relays/ClutchTileEntity.java rename to src/main/java/com/simibubi/create/modules/contraptions/relays/encased/ClutchTileEntity.java index 822313747..1fab59e11 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/relays/ClutchTileEntity.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/relays/encased/ClutchTileEntity.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.contraptions.relays; +package com.simibubi.create.modules.contraptions.relays.encased; import com.simibubi.create.AllTileEntities; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/relays/encased/EncasedBeltBlock.java b/src/main/java/com/simibubi/create/modules/contraptions/relays/encased/EncasedBeltBlock.java new file mode 100644 index 000000000..383b027c0 --- /dev/null +++ b/src/main/java/com/simibubi/create/modules/contraptions/relays/encased/EncasedBeltBlock.java @@ -0,0 +1,161 @@ +package com.simibubi.create.modules.contraptions.relays.encased; + +import com.simibubi.create.modules.contraptions.base.DirectionalAxisKineticBlock; +import com.simibubi.create.modules.contraptions.base.RotatedPillarKineticBlock; + +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.block.Blocks; +import net.minecraft.item.BlockItemUseContext; +import net.minecraft.state.BooleanProperty; +import net.minecraft.state.EnumProperty; +import net.minecraft.state.IProperty; +import net.minecraft.state.StateContainer.Builder; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.Direction; +import net.minecraft.util.Direction.Axis; +import net.minecraft.util.Direction.AxisDirection; +import net.minecraft.util.IStringSerializable; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.IBlockReader; +import net.minecraft.world.IWorld; +import net.minecraft.world.World; + +public class EncasedBeltBlock extends RotatedPillarKineticBlock { + + public static final IProperty PART = EnumProperty.create("part", Part.class); + public static final BooleanProperty CONNECTED_ALONG_FIRST_COORDINATE = DirectionalAxisKineticBlock.AXIS_ALONG_FIRST_COORDINATE; + + public EncasedBeltBlock() { + super(Properties.from(Blocks.ANDESITE)); + setDefaultState(getDefaultState().with(PART, Part.NONE)); + } + + @Override + protected void fillStateContainer(Builder builder) { + super.fillStateContainer(builder.add(PART, CONNECTED_ALONG_FIRST_COORDINATE)); + } + + @Override + public BlockState getStateForPlacement(BlockItemUseContext context) { + Axis placedAxis = context.getNearestLookingDirection().getAxis(); + Axis axis = context.isPlacerSneaking() ? placedAxis : getPreferredAxis(context); + if (axis == null) + axis = placedAxis; + + BlockState state = getDefaultState().with(AXIS, axis); + for (Direction facing : Direction.values()) { + if (facing.getAxis() == axis) + continue; + BlockPos pos = context.getPos(); + BlockPos offset = pos.offset(facing); + state = updatePostPlacement(state, facing, context.getWorld().getBlockState(offset), context.getWorld(), + pos, offset); + } + return state; + } + + @Override + public BlockState updatePostPlacement(BlockState stateIn, Direction face, BlockState neighbour, IWorld worldIn, + BlockPos currentPos, BlockPos facingPos) { + Part part = stateIn.get(PART); + Axis axis = stateIn.get(AXIS); + boolean connectionAlongFirst = stateIn.get(CONNECTED_ALONG_FIRST_COORDINATE); + Axis connectionAxis = connectionAlongFirst ? (axis == Axis.X ? Axis.Y : Axis.X) + : (axis == Axis.Z ? Axis.Y : Axis.Z); + + Axis faceAxis = face.getAxis(); + boolean facingAlongFirst = axis == Axis.X ? faceAxis.isVertical() : faceAxis == Axis.X; + boolean positive = face.getAxisDirection() == AxisDirection.POSITIVE; + + if (axis == faceAxis) + return stateIn; + + if (neighbour.getBlock() != this) { + if (facingAlongFirst != connectionAlongFirst || part == Part.NONE) + return stateIn; + if (part == Part.MIDDLE) + return stateIn.with(PART, positive ? Part.END : Part.START); + if ((part == Part.START) == positive) + return stateIn.with(PART, Part.NONE); + return stateIn; + } + + Part otherPart = neighbour.get(PART); + Axis otherAxis = neighbour.get(AXIS); + boolean otherConnection = neighbour.get(CONNECTED_ALONG_FIRST_COORDINATE); + Axis otherConnectionAxis = otherConnection ? (otherAxis == Axis.X ? Axis.Y : Axis.X) + : (otherAxis == Axis.Z ? Axis.Y : Axis.Z); + + if (neighbour.get(AXIS) == faceAxis) + return stateIn; + if (otherPart != Part.NONE && otherConnectionAxis != faceAxis) + return stateIn; + + if (part == Part.NONE) { + part = positive ? Part.START : Part.END; + connectionAlongFirst = axis == Axis.X ? faceAxis.isVertical() : faceAxis == Axis.X; + } else if (connectionAxis != faceAxis) { + return stateIn; + } + + if ((part == Part.START) != positive) + part = Part.MIDDLE; + + return stateIn.with(PART, part).with(CONNECTED_ALONG_FIRST_COORDINATE, connectionAlongFirst); + } + + @Override + public boolean hasShaftTowards(World world, BlockPos pos, BlockState state, Direction face) { + return face.getAxis() == state.get(AXIS); + } + + @Override + public Axis getRotationAxis(BlockState state) { + return state.get(AXIS); + } + + public static boolean areBlocksConnected(BlockState state, BlockState other, Direction facing) { + Part part = state.get(PART); + Axis axis = state.get(AXIS); + boolean connectionAlongFirst = state.get(CONNECTED_ALONG_FIRST_COORDINATE); + Axis connectionAxis = connectionAlongFirst ? (axis == Axis.X ? Axis.Y : Axis.X) + : (axis == Axis.Z ? Axis.Y : Axis.Z); + + Axis otherAxis = other.get(AXIS); + boolean otherConnection = other.get(CONNECTED_ALONG_FIRST_COORDINATE); + Axis otherConnectionAxis = otherConnection ? (otherAxis == Axis.X ? Axis.Y : Axis.X) + : (otherAxis == Axis.Z ? Axis.Y : Axis.Z); + + if (otherConnectionAxis != connectionAxis) + return false; + if (facing.getAxis() != connectionAxis) + return false; + if (facing.getAxisDirection() == AxisDirection.POSITIVE && (part == Part.MIDDLE || part == Part.START)) + return true; + if (facing.getAxisDirection() == AxisDirection.NEGATIVE && (part == Part.MIDDLE || part == Part.END)) + return true; + + return false; + } + + @Override + public TileEntity createTileEntity(BlockState state, IBlockReader world) { + return new EncasedShaftTileEntity(); + } + + @Override + protected boolean hasStaticPart() { + return true; + } + + public enum Part implements IStringSerializable { + START, MIDDLE, END, NONE; + + @Override + public String getName() { + return name().toLowerCase(); + } + } + +} diff --git a/src/main/java/com/simibubi/create/modules/contraptions/relays/EncasedShaftBlock.java b/src/main/java/com/simibubi/create/modules/contraptions/relays/encased/EncasedShaftBlock.java similarity index 95% rename from src/main/java/com/simibubi/create/modules/contraptions/relays/EncasedShaftBlock.java rename to src/main/java/com/simibubi/create/modules/contraptions/relays/encased/EncasedShaftBlock.java index 48a0976a4..1cf10ccfc 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/relays/EncasedShaftBlock.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/relays/encased/EncasedShaftBlock.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.contraptions.relays; +package com.simibubi.create.modules.contraptions.relays.encased; import com.simibubi.create.modules.contraptions.base.RotatedPillarKineticBlock; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/relays/EncasedShaftTileEntity.java b/src/main/java/com/simibubi/create/modules/contraptions/relays/encased/EncasedShaftTileEntity.java similarity index 80% rename from src/main/java/com/simibubi/create/modules/contraptions/relays/EncasedShaftTileEntity.java rename to src/main/java/com/simibubi/create/modules/contraptions/relays/encased/EncasedShaftTileEntity.java index f56cbf8b3..5bc8f0579 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/relays/EncasedShaftTileEntity.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/relays/encased/EncasedShaftTileEntity.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.contraptions.relays; +package com.simibubi.create.modules.contraptions.relays.encased; import com.simibubi.create.AllTileEntities; import com.simibubi.create.modules.contraptions.base.KineticTileEntity; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/relays/EncasedShaftTileEntityRenderer.java b/src/main/java/com/simibubi/create/modules/contraptions/relays/encased/EncasedShaftTileEntityRenderer.java similarity index 90% rename from src/main/java/com/simibubi/create/modules/contraptions/relays/EncasedShaftTileEntityRenderer.java rename to src/main/java/com/simibubi/create/modules/contraptions/relays/encased/EncasedShaftTileEntityRenderer.java index f6462e2a7..3a3221008 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/relays/EncasedShaftTileEntityRenderer.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/relays/encased/EncasedShaftTileEntityRenderer.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.contraptions.relays; +package com.simibubi.create.modules.contraptions.relays.encased; import com.simibubi.create.AllBlocks; import com.simibubi.create.modules.contraptions.base.KineticTileEntity; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/relays/GearshiftBlock.java b/src/main/java/com/simibubi/create/modules/contraptions/relays/encased/GearshiftBlock.java similarity index 92% rename from src/main/java/com/simibubi/create/modules/contraptions/relays/GearshiftBlock.java rename to src/main/java/com/simibubi/create/modules/contraptions/relays/encased/GearshiftBlock.java index 7ddb1e766..e520d4410 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/relays/GearshiftBlock.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/relays/encased/GearshiftBlock.java @@ -1,7 +1,8 @@ -package com.simibubi.create.modules.contraptions.relays; +package com.simibubi.create.modules.contraptions.relays.encased; import com.simibubi.create.modules.contraptions.RotationPropagator; import com.simibubi.create.modules.contraptions.base.KineticTileEntity; +import com.simibubi.create.modules.contraptions.relays.gearbox.GearshiftTileEntity; import net.minecraft.block.Block; import net.minecraft.block.BlockState; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/relays/SplitShaftTileEntity.java b/src/main/java/com/simibubi/create/modules/contraptions/relays/encased/SplitShaftTileEntity.java similarity index 85% rename from src/main/java/com/simibubi/create/modules/contraptions/relays/SplitShaftTileEntity.java rename to src/main/java/com/simibubi/create/modules/contraptions/relays/encased/SplitShaftTileEntity.java index 7778117df..e3fd8e2b3 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/relays/SplitShaftTileEntity.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/relays/encased/SplitShaftTileEntity.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.contraptions.relays; +package com.simibubi.create.modules.contraptions.relays.encased; import com.simibubi.create.modules.contraptions.base.KineticTileEntity; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/relays/SplitShaftTileEntityRenderer.java b/src/main/java/com/simibubi/create/modules/contraptions/relays/encased/SplitShaftTileEntityRenderer.java similarity index 96% rename from src/main/java/com/simibubi/create/modules/contraptions/relays/SplitShaftTileEntityRenderer.java rename to src/main/java/com/simibubi/create/modules/contraptions/relays/encased/SplitShaftTileEntityRenderer.java index f6e72b2e8..d910243fd 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/relays/SplitShaftTileEntityRenderer.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/relays/encased/SplitShaftTileEntityRenderer.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.contraptions.relays; +package com.simibubi.create.modules.contraptions.relays.encased; import com.simibubi.create.AllBlocks; import com.simibubi.create.CreateClient; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/relays/gauge/SpeedGaugeTileEntity.java b/src/main/java/com/simibubi/create/modules/contraptions/relays/gauge/SpeedGaugeTileEntity.java index 090e337bc..96e2241ca 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/relays/gauge/SpeedGaugeTileEntity.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/relays/gauge/SpeedGaugeTileEntity.java @@ -15,6 +15,7 @@ public class SpeedGaugeTileEntity extends GaugeTileEntity { @Override public void onSpeedChanged() { + super.onSpeedChanged(); float speed = Math.abs(getSpeed()); float medium = CreateConfig.parameters.mediumSpeed.get().floatValue(); float fast = CreateConfig.parameters.fastSpeed.get().floatValue(); diff --git a/src/main/java/com/simibubi/create/modules/contraptions/relays/GearboxBlock.java b/src/main/java/com/simibubi/create/modules/contraptions/relays/gearbox/GearboxBlock.java similarity index 97% rename from src/main/java/com/simibubi/create/modules/contraptions/relays/GearboxBlock.java rename to src/main/java/com/simibubi/create/modules/contraptions/relays/gearbox/GearboxBlock.java index 9ffa7a231..4ec151abb 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/relays/GearboxBlock.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/relays/gearbox/GearboxBlock.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.contraptions.relays; +package com.simibubi.create.modules.contraptions.relays.gearbox; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/relays/GearboxTileEntity.java b/src/main/java/com/simibubi/create/modules/contraptions/relays/gearbox/GearboxTileEntity.java similarity index 79% rename from src/main/java/com/simibubi/create/modules/contraptions/relays/GearboxTileEntity.java rename to src/main/java/com/simibubi/create/modules/contraptions/relays/gearbox/GearboxTileEntity.java index 344cd07f7..37a7f5823 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/relays/GearboxTileEntity.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/relays/gearbox/GearboxTileEntity.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.contraptions.relays; +package com.simibubi.create.modules.contraptions.relays.gearbox; import com.simibubi.create.AllTileEntities; import com.simibubi.create.modules.contraptions.base.KineticTileEntity; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/relays/GearboxTileEntityRenderer.java b/src/main/java/com/simibubi/create/modules/contraptions/relays/gearbox/GearboxTileEntityRenderer.java similarity index 97% rename from src/main/java/com/simibubi/create/modules/contraptions/relays/GearboxTileEntityRenderer.java rename to src/main/java/com/simibubi/create/modules/contraptions/relays/gearbox/GearboxTileEntityRenderer.java index 2e82458e3..9fff4e5d1 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/relays/GearboxTileEntityRenderer.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/relays/gearbox/GearboxTileEntityRenderer.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.contraptions.relays; +package com.simibubi.create.modules.contraptions.relays.gearbox; import com.simibubi.create.AllBlocks; import com.simibubi.create.CreateClient; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/relays/GearshiftTileEntity.java b/src/main/java/com/simibubi/create/modules/contraptions/relays/gearbox/GearshiftTileEntity.java similarity index 76% rename from src/main/java/com/simibubi/create/modules/contraptions/relays/GearshiftTileEntity.java rename to src/main/java/com/simibubi/create/modules/contraptions/relays/gearbox/GearshiftTileEntity.java index dde5668ae..e6c8876a4 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/relays/GearshiftTileEntity.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/relays/gearbox/GearshiftTileEntity.java @@ -1,6 +1,7 @@ -package com.simibubi.create.modules.contraptions.relays; +package com.simibubi.create.modules.contraptions.relays.gearbox; import com.simibubi.create.AllTileEntities; +import com.simibubi.create.modules.contraptions.relays.encased.SplitShaftTileEntity; import net.minecraft.state.properties.BlockStateProperties; import net.minecraft.util.Direction; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/relays/VerticalGearboxItem.java b/src/main/java/com/simibubi/create/modules/contraptions/relays/gearbox/VerticalGearboxItem.java similarity index 96% rename from src/main/java/com/simibubi/create/modules/contraptions/relays/VerticalGearboxItem.java rename to src/main/java/com/simibubi/create/modules/contraptions/relays/gearbox/VerticalGearboxItem.java index 9fad762dc..5b3040d5d 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/relays/VerticalGearboxItem.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/relays/gearbox/VerticalGearboxItem.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.contraptions.relays; +package com.simibubi.create.modules.contraptions.relays.gearbox; import com.simibubi.create.AllBlocks; import com.simibubi.create.modules.contraptions.base.IRotate; diff --git a/src/main/java/com/simibubi/create/modules/logistics/InWorldProcessing.java b/src/main/java/com/simibubi/create/modules/logistics/InWorldProcessing.java index 98500f8a6..044482ea4 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/InWorldProcessing.java +++ b/src/main/java/com/simibubi/create/modules/logistics/InWorldProcessing.java @@ -9,8 +9,8 @@ import com.simibubi.create.AllRecipes; import com.simibubi.create.CreateConfig; import com.simibubi.create.foundation.item.ItemHelper; import com.simibubi.create.foundation.utility.ColorHelper; -import com.simibubi.create.modules.contraptions.base.ProcessingRecipe; -import com.simibubi.create.modules.contraptions.receivers.fan.SplashingRecipe; +import com.simibubi.create.modules.contraptions.components.fan.SplashingRecipe; +import com.simibubi.create.modules.contraptions.processing.ProcessingRecipe; import com.simibubi.create.modules.contraptions.relays.belt.BeltTileEntity; import com.simibubi.create.modules.contraptions.relays.belt.TransportedItemStack; diff --git a/src/main/java/com/simibubi/create/modules/logistics/block/RedstoneBridgeBlock.java b/src/main/java/com/simibubi/create/modules/logistics/block/RedstoneBridgeBlock.java index 63621665a..62a0bd9bf 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/block/RedstoneBridgeBlock.java +++ b/src/main/java/com/simibubi/create/modules/logistics/block/RedstoneBridgeBlock.java @@ -3,10 +3,10 @@ package com.simibubi.create.modules.logistics.block; import java.util.ArrayList; import java.util.List; -import com.simibubi.create.foundation.utility.AllShapes; import org.apache.commons.lang3.tuple.Pair; import com.simibubi.create.foundation.block.ProperDirectionalBlock; +import com.simibubi.create.foundation.utility.AllShapes; import com.simibubi.create.foundation.utility.VecHelper; import net.minecraft.block.Block; @@ -27,7 +27,6 @@ import net.minecraft.util.math.BlockRayTraceResult; import net.minecraft.util.math.Vec3d; import net.minecraft.util.math.shapes.ISelectionContext; import net.minecraft.util.math.shapes.VoxelShape; -import net.minecraft.util.math.shapes.VoxelShapes; import net.minecraft.world.IBlockReader; import net.minecraft.world.IWorldReader; import net.minecraft.world.World; diff --git a/src/main/java/com/simibubi/create/modules/logistics/block/belts/BeltFunnelBlock.java b/src/main/java/com/simibubi/create/modules/logistics/block/belts/BeltFunnelBlock.java index b08f2fc43..e23ce5c3e 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/block/belts/BeltFunnelBlock.java +++ b/src/main/java/com/simibubi/create/modules/logistics/block/belts/BeltFunnelBlock.java @@ -33,7 +33,6 @@ import net.minecraft.util.math.BlockRayTraceResult; import net.minecraft.util.math.Vec3d; import net.minecraft.util.math.shapes.ISelectionContext; import net.minecraft.util.math.shapes.VoxelShape; -import net.minecraft.util.math.shapes.VoxelShapes; import net.minecraft.world.IBlockReader; import net.minecraft.world.IWorld; import net.minecraft.world.IWorldReader; diff --git a/src/main/java/com/simibubi/create/modules/logistics/block/belts/ExtractorBlock.java b/src/main/java/com/simibubi/create/modules/logistics/block/belts/ExtractorBlock.java index 797a94759..a5883f9eb 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/block/belts/ExtractorBlock.java +++ b/src/main/java/com/simibubi/create/modules/logistics/block/belts/ExtractorBlock.java @@ -28,7 +28,6 @@ import net.minecraft.util.math.BlockRayTraceResult; import net.minecraft.util.math.Vec3d; import net.minecraft.util.math.shapes.ISelectionContext; import net.minecraft.util.math.shapes.VoxelShape; -import net.minecraft.util.math.shapes.VoxelShapes; import net.minecraft.world.IBlockReader; import net.minecraft.world.IWorldReader; import net.minecraft.world.World; diff --git a/src/main/java/com/simibubi/create/modules/logistics/management/index/LogisticalIndexBlock.java b/src/main/java/com/simibubi/create/modules/logistics/management/index/LogisticalIndexBlock.java index 1e57ce11c..07551a48e 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/management/index/LogisticalIndexBlock.java +++ b/src/main/java/com/simibubi/create/modules/logistics/management/index/LogisticalIndexBlock.java @@ -3,8 +3,8 @@ package com.simibubi.create.modules.logistics.management.index; import com.simibubi.create.AllItems; import com.simibubi.create.foundation.block.IBlockWithColorHandler; import com.simibubi.create.foundation.block.IWithTileEntity; - import com.simibubi.create.foundation.utility.AllShapes; + import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; @@ -24,7 +24,6 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockRayTraceResult; import net.minecraft.util.math.shapes.ISelectionContext; import net.minecraft.util.math.shapes.VoxelShape; -import net.minecraft.util.math.shapes.VoxelShapes; import net.minecraft.world.IBlockReader; import net.minecraft.world.IWorldReader; import net.minecraft.world.World; diff --git a/src/main/java/com/simibubi/create/modules/logistics/transport/CardboardBoxEntity.java b/src/main/java/com/simibubi/create/modules/logistics/transport/CardboardBoxEntity.java index f109ae2f3..db7b34e80 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/transport/CardboardBoxEntity.java +++ b/src/main/java/com/simibubi/create/modules/logistics/transport/CardboardBoxEntity.java @@ -7,7 +7,7 @@ import javax.annotation.Nullable; import com.simibubi.create.AllEntities; import com.simibubi.create.AllItems; import com.simibubi.create.foundation.utility.VecHelper; -import com.simibubi.create.modules.contraptions.receivers.DrillTileEntity; +import com.simibubi.create.modules.contraptions.components.actors.DrillTileEntity; import com.simibubi.create.modules.logistics.item.CardboardBoxItem; import net.minecraft.block.BlockState; diff --git a/src/main/java/com/simibubi/create/modules/logistics/transport/villager/LogisticiansTableBlock.java b/src/main/java/com/simibubi/create/modules/logistics/transport/villager/LogisticiansTableBlock.java index 2d7e6e297..7fec78d2a 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/transport/villager/LogisticiansTableBlock.java +++ b/src/main/java/com/simibubi/create/modules/logistics/transport/villager/LogisticiansTableBlock.java @@ -4,8 +4,8 @@ import java.util.Random; import com.simibubi.create.AllItems; import com.simibubi.create.foundation.block.IWithTileEntity; - import com.simibubi.create.foundation.utility.AllShapes; + import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; @@ -28,7 +28,6 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.GlobalPos; import net.minecraft.util.math.shapes.ISelectionContext; import net.minecraft.util.math.shapes.VoxelShape; -import net.minecraft.util.math.shapes.VoxelShapes; import net.minecraft.world.IBlockReader; import net.minecraft.world.World; diff --git a/src/main/resources/assets/create/blockstates/encased_belt.json b/src/main/resources/assets/create/blockstates/encased_belt.json index 862c7c9a6..b46146fdc 100644 --- a/src/main/resources/assets/create/blockstates/encased_belt.json +++ b/src/main/resources/assets/create/blockstates/encased_belt.json @@ -1,45 +1,31 @@ { "variants": { - "attached=false,attach_face=up,axis=y": { "model": "create:block/encased_belt", "x": 90 }, - "attached=false,attach_face=down,axis=y": { "model": "create:block/encased_belt", "x": 90 }, - "attached=false,attach_face=east,axis=y": { "model": "create:block/encased_belt", "x": 90 }, - "attached=false,attach_face=west,axis=y": { "model": "create:block/encased_belt", "x": 90 }, - "attached=false,attach_face=north,axis=y": { "model": "create:block/encased_belt", "x": 90 }, - "attached=false,attach_face=south,axis=y": { "model": "create:block/encased_belt", "x": 90 }, - - "attached=false,attach_face=up,axis=z": { "model": "create:block/encased_belt"}, - "attached=false,attach_face=down,axis=z": { "model": "create:block/encased_belt"}, - "attached=false,attach_face=east,axis=z": { "model": "create:block/encased_belt"}, - "attached=false,attach_face=west,axis=z": { "model": "create:block/encased_belt"}, - "attached=false,attach_face=north,axis=z": { "model": "create:block/encased_belt"}, - "attached=false,attach_face=south,axis=z": { "model": "create:block/encased_belt"}, + "part=none,axis_along_first=false,axis=x": { "model": "create:block/encased_belt/single", "y": 90 }, + "part=none,axis_along_first=false,axis=y": { "model": "create:block/encased_belt/single", "x": 90 }, + "part=none,axis_along_first=false,axis=z": { "model": "create:block/encased_belt/single" }, + "part=none,axis_along_first=true,axis=x": { "model": "create:block/encased_belt/single", "y": 90 }, + "part=none,axis_along_first=true,axis=y": { "model": "create:block/encased_belt/single", "x": 90 }, + "part=none,axis_along_first=true,axis=z": { "model": "create:block/encased_belt/single" }, - "attached=false,attach_face=up,axis=x": { "model": "create:block/encased_belt", "y": 90 }, - "attached=false,attach_face=down,axis=x": { "model": "create:block/encased_belt", "y": 90 }, - "attached=false,attach_face=east,axis=x": { "model": "create:block/encased_belt", "y": 90 }, - "attached=false,attach_face=west,axis=x": { "model": "create:block/encased_belt", "y": 90 }, - "attached=false,attach_face=north,axis=x": { "model": "create:block/encased_belt", "y": 90 }, - "attached=false,attach_face=south,axis=x": { "model": "create:block/encased_belt", "y": 90 }, + "part=start,axis_along_first=false,axis=x": { "model": "create:block/encased_belt/end_horizontal", "x": 180 }, + "part=start,axis_along_first=true,axis=x": { "model": "create:block/encased_belt/end_horizontal", "x": 270 }, + "part=middle,axis_along_first=false,axis=x": { "model": "create:block/encased_belt/middle_horizontal" }, + "part=middle,axis_along_first=true,axis=x": { "model": "create:block/encased_belt/middle_horizontal", "x": 90 }, + "part=end,axis_along_first=false,axis=x": { "model": "create:block/encased_belt/end_horizontal" }, + "part=end,axis_along_first=true,axis=x": { "model": "create:block/encased_belt/end_horizontal", "x": 90 }, - "attached=true,attach_face=up,axis=y": { "model": "block/dirt" }, - "attached=true,attach_face=down,axis=y": { "model": "block/dirt" }, - "attached=true,attach_face=east,axis=y": { "model": "create:block/encased_belt_attached_vertical", "y": 270 }, - "attached=true,attach_face=west,axis=y": { "model": "create:block/encased_belt_attached_vertical", "y": 90 }, - "attached=true,attach_face=north,axis=y": { "model": "create:block/encased_belt_attached_vertical", "y": 180 }, - "attached=true,attach_face=south,axis=y": { "model": "create:block/encased_belt_attached_vertical", "y": 0 }, - - "attached=true,attach_face=up,axis=z": { "model": "create:block/encased_belt_attached_horizontal", "x": 270, "y": 90 }, - "attached=true,attach_face=down,axis=z": { "model": "create:block/encased_belt_attached_horizontal", "x": 90, "y": 90 }, - "attached=true,attach_face=east,axis=z": { "model": "create:block/encased_belt_attached_horizontal", "x": 0, "y": 90 }, - "attached=true,attach_face=west,axis=z": { "model": "create:block/encased_belt_attached_horizontal", "x": 180, "y": 90 }, - "attached=true,attach_face=north,axis=z": { "model": "block/dirt"}, - "attached=true,attach_face=south,axis=z": { "model": "block/dirt"}, + "part=start,axis_along_first=false,axis=y": { "model": "create:block/encased_belt/end_vertical" }, + "part=start,axis_along_first=true,axis=y": { "model": "create:block/encased_belt/end_vertical", "y": 270 }, + "part=middle,axis_along_first=false,axis=y": { "model": "create:block/encased_belt/middle_vertical" }, + "part=middle,axis_along_first=true,axis=y": { "model": "create:block/encased_belt/middle_vertical", "y": 90 }, + "part=end,axis_along_first=false,axis=y": { "model": "create:block/encased_belt/end_vertical", "y": 180 }, + "part=end,axis_along_first=true,axis=y": { "model": "create:block/encased_belt/end_vertical", "y": 90 }, - "attached=true,attach_face=up,axis=x": { "model": "create:block/encased_belt_attached_horizontal", "x": 270 }, - "attached=true,attach_face=down,axis=x": { "model": "create:block/encased_belt_attached_horizontal", "x": 90 }, - "attached=true,attach_face=east,axis=x": { "model": "block/dirt" }, - "attached=true,attach_face=west,axis=x": { "model": "block/dirt" }, - "attached=true,attach_face=north,axis=x": { "model": "create:block/encased_belt_attached_horizontal", "x": 0 }, - "attached=true,attach_face=south,axis=x": { "model": "create:block/encased_belt_attached_horizontal", "x": 180 } + "part=start,axis_along_first=false,axis=z": { "model": "create:block/encased_belt/end_horizontal", "x": 270, "y": 90 }, + "part=start,axis_along_first=true,axis=z": { "model": "create:block/encased_belt/end_horizontal", "y": 90 }, + "part=middle,axis_along_first=false,axis=z": { "model": "create:block/encased_belt/middle_horizontal", "x": 90, "y": 90 }, + "part=middle,axis_along_first=true,axis=z": { "model": "create:block/encased_belt/middle_horizontal", "y": 90 }, + "part=end,axis_along_first=false,axis=z": { "model": "create:block/encased_belt/end_horizontal", "x": 90, "y": 90 }, + "part=end,axis_along_first=true,axis=z": { "model": "create:block/encased_belt/end_horizontal", "y": 270 } } } \ No newline at end of file diff --git a/src/main/resources/assets/create/lang/en_us.json b/src/main/resources/assets/create/lang/en_us.json index a42157cd6..96550a500 100644 --- a/src/main/resources/assets/create/lang/en_us.json +++ b/src/main/resources/assets/create/lang/en_us.json @@ -28,8 +28,6 @@ "item.create.deforester": "Deforester", "item.create.crushed_iron": "Crushed Iron Ore", "item.create.crushed_gold": "Crushed Gold Ore", - "item.create.time_scarf": "Scarf with a clock on it", - "item.create.motion_scarf": "Scarf of Perpetuality", "item.create.logistical_controller_supply": "Item Supply", "item.create.logistical_controller_request": "Item Request", @@ -521,9 +519,9 @@ "block.create.clutch.tooltip.behaviour1": "_Stops_ conveying rotation to the other side.", "block.create.encased_belt.tooltip": "ENCASED_BELT", - "block.create.encased_belt.tooltip.summary": "_Relays_ _Rotation_ through its block and to an attached _Encased_ _Belt._", - "block.create.encased_belt.tooltip.condition1": "When Attached to other Encased Belt", - "block.create.encased_belt.tooltip.behaviour1": "Attached Block will have the exact same rotation speed and direction. Attached Belts do not have to face the same way.", + "block.create.encased_belt.tooltip.summary": "_Relays_ _Rotation_ through its block and to attached _Encased_ _Belts._", + "block.create.encased_belt.tooltip.condition1": "When Connected", + "block.create.encased_belt.tooltip.behaviour1": "Attached Blocks will have the exact _same_ _rotation_ _speed_ and direction. They do not have to face the same way.", "item.create.belt_connector.tooltip": "BELT CONNECTOR", "item.create.belt_connector.tooltip.summary": "Connects two _Shafts_ with a _Mechanical_ _Belt._ Connected shafts will have the exact same rotation speed and direction. The Belt can act as a _Conveyor_ for _Entities._", diff --git a/src/main/resources/assets/create/models/block/encased_belt.json b/src/main/resources/assets/create/models/block/encased_belt.json deleted file mode 100644 index 0c2b1b245..000000000 --- a/src/main/resources/assets/create/models/block/encased_belt.json +++ /dev/null @@ -1,68 +0,0 @@ -{ - "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "parent": "block/cube", - "textures": { - "particle": "create:block/encased_belt", - "0": "create:block/encased_belt", - "1": "create:block/gearbox" - }, - "elements": [ - { - "name": "Base", - "from": [ 0.0, 0.0, 0.0 ], - "to": [ 16.0, 2.0, 16.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 14.0, 16.0, 16.0 ] }, - "east": { "texture": "#0", "uv": [ 14.0, 0.0, 16.0, 16.0 ], "rotation": 90 }, - "south": { "texture": "#0", "uv": [ 0.0, 14.0, 16.0, 16.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 2.0, 16.0 ], "rotation": 270 }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.0 ], "rotation": 180 } - } - }, - { - "name": "Core", - "from": [ 2.0, 2.0, 1.0 ], - "to": [ 14.0, 14.0, 15.0 ], - "faces": { - "north": { "texture": "#1", "uv": [ 2.0, 2.0, 14.0, 14.0 ] }, - "south": { "texture": "#1", "uv": [ 2.0, 2.0, 14.0, 14.0 ] } - } - }, - { - "name": "Top", - "from": [ 0.0, 14.0, 0.0 ], - "to": [ 16.0, 16.0, 16.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 2.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 2.0, 16.0 ], "rotation": 90 }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 2.0 ] }, - "west": { "texture": "#0", "uv": [ 14.0, 0.0, 16.0, 16.0 ], "rotation": 270 }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.0 ] } - } - }, - { - "name": "SIde", - "from": [ 0.0, 2.0, 0.0 ], - "to": [ 2.0, 14.0, 16.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 2.0, 14.0, 14.0, 16.0 ], "rotation": 270 }, - "east": { "texture": "#0", "uv": [ 2.0, 0.0, 14.0, 16.0 ], "rotation": 270 }, - "south": { "texture": "#0", "uv": [ 2.0, 0.0, 14.0, 2.0 ], "rotation": 270 }, - "west": { "texture": "#0", "uv": [ 2.0, 0.0, 14.0, 16.0 ], "rotation": 270 } - } - }, - { - "name": "Side", - "from": [ 14.0, 2.0, 0.0 ], - "to": [ 16.0, 14.0, 16.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 2.0, 0.0, 14.0, 2.0 ], "rotation": 270 }, - "east": { "texture": "#0", "uv": [ 2.0, 0.0, 14.0, 16.0 ], "rotation": 90 }, - "south": { "texture": "#0", "uv": [ 2.0, 14.0, 14.0, 16.0 ], "rotation": 270 }, - "west": { "texture": "#0", "uv": [ 2.0, 0.0, 14.0, 16.0 ], "rotation": 270 } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/encased_belt/end_horizontal.json b/src/main/resources/assets/create/models/block/encased_belt/end_horizontal.json new file mode 100644 index 000000000..3f5cdffc7 --- /dev/null +++ b/src/main/resources/assets/create/models/block/encased_belt/end_horizontal.json @@ -0,0 +1,57 @@ +{ + "credit": "Made with Blockbench", + "parent": "block/cube", + "textures": { + "0": "create:block/encased_belt", + "2": "create:block/encased_belt_end", + "particle": "create:block/encased_belt" + }, + "elements": [ + { + "name": "Base", + "from": [0, 0, 0], + "to": [16, 2, 16], + "faces": { + "north": {"uv": [14, 16, 16, 0], "rotation": 90, "texture": "#0"}, + "east": {"uv": [0, 14, 16, 16], "texture": "#2"}, + "south": {"uv": [0, 16, 2, 0], "rotation": 270, "texture": "#0"}, + "west": {"uv": [0, 0, 16, 2], "rotation": 180, "texture": "#2"}, + "up": {"uv": [0, 0, 16, 16], "rotation": 90, "texture": "#0"}, + "down": {"uv": [0, 0, 16, 16], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "Core", + "from": [1, 2, 0], + "to": [15, 14, 14], + "faces": { + "east": {"uv": [2, 2, 16, 14], "texture": "#2"}, + "west": {"uv": [2, 2, 16, 14], "rotation": 180, "texture": "#2"} + } + }, + { + "name": "Side", + "from": [0, 2, 14], + "to": [16, 14, 16], + "faces": { + "north": {"uv": [2, 16, 14, 0], "rotation": 270, "texture": "#0"}, + "east": {"uv": [2, 0, 14, 2], "rotation": 270, "texture": "#0"}, + "south": {"uv": [2, 0, 14, 16], "rotation": 90, "texture": "#0"}, + "west": {"uv": [2, 14, 14, 16], "rotation": 270, "texture": "#0"} + } + }, + { + "name": "Top", + "from": [0, 14, 0], + "to": [16, 16, 16], + "faces": { + "north": {"uv": [14, 16, 16, 0], "rotation": 90, "texture": "#0"}, + "east": {"uv": [0, 0, 16, 2], "texture": "#2"}, + "south": {"uv": [14, 16, 16, 0], "rotation": 270, "texture": "#0"}, + "west": {"uv": [0, 14, 16, 16], "rotation": 180, "texture": "#2"}, + "up": {"uv": [0, 0, 16, 16], "rotation": 90, "texture": "#0"}, + "down": {"uv": [0, 0, 16, 16], "rotation": 270, "texture": "#0"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/encased_belt/end_vertical.json b/src/main/resources/assets/create/models/block/encased_belt/end_vertical.json new file mode 100644 index 000000000..4cd2928a2 --- /dev/null +++ b/src/main/resources/assets/create/models/block/encased_belt/end_vertical.json @@ -0,0 +1,59 @@ +{ + "credit": "Made with Blockbench", + "parent": "block/cube", + "textures": { + "1": "create:block/encased_belt", + "2": "create:block/encased_belt_end", + "particle": "create:block/encased_belt" + }, + "elements": [ + { + "name": "Core", + "from": [2, 1, 2], + "to": [14, 15, 16], + "faces": { + "up": {"uv": [2, 2, 16, 14], "rotation": 90, "texture": "#2"}, + "down": {"uv": [2, 2, 16, 14], "rotation": 270, "texture": "#2"} + } + }, + { + "name": "Side", + "from": [0, 0, 0], + "to": [2, 16, 16], + "faces": { + "north": {"uv": [14, 0, 16, 16], "texture": "#1"}, + "east": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "south": {"uv": [0, 0, 2, 16], "texture": "#1"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "up": {"uv": [0, 14, 16, 16], "rotation": 90, "texture": "#2"}, + "down": {"uv": [0, 16, 16, 14], "rotation": 270, "texture": "#2"} + } + }, + { + "name": "Side", + "from": [14, 0, 0], + "to": [16, 16, 16], + "faces": { + "north": {"uv": [0, 0, 2, 16], "texture": "#1"}, + "east": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "south": {"uv": [14, 0, 16, 16], "texture": "#1"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "up": {"uv": [0, 0, 16, 2], "rotation": 90, "texture": "#2"}, + "down": {"uv": [0, 2, 16, 0], "rotation": 270, "texture": "#2"} + } + }, + { + "name": "Side", + "from": [2, 0, 0], + "to": [14, 16, 2], + "faces": { + "north": {"uv": [2, 0, 14, 16], "texture": "#1"}, + "east": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "south": {"uv": [2, 0, 14, 16], "texture": "#1"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "up": {"uv": [2, 14, 14, 16], "rotation": 180, "texture": "#1"}, + "down": {"uv": [2, 14, 14, 16], "texture": "#1"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/encased_belt/middle_horizontal.json b/src/main/resources/assets/create/models/block/encased_belt/middle_horizontal.json new file mode 100644 index 000000000..cd1e43d3e --- /dev/null +++ b/src/main/resources/assets/create/models/block/encased_belt/middle_horizontal.json @@ -0,0 +1,46 @@ +{ + "credit": "Made with Blockbench", + "parent": "block/cube", + "textures": { + "0": "create:block/encased_belt", + "1": "create:block/encased_belt_middle", + "particle": "create:block/encased_belt" + }, + "elements": [ + { + "name": "Base", + "from": [0, 0, 0], + "to": [16, 2, 16], + "faces": { + "north": {"uv": [14, 16, 16, 0], "rotation": 90, "texture": "#0"}, + "east": {"uv": [0, 14, 16, 16], "texture": "#1"}, + "south": {"uv": [0, 16, 2, 0], "rotation": 270, "texture": "#0"}, + "west": {"uv": [0, 0, 16, 2], "rotation": 180, "texture": "#1"}, + "up": {"uv": [0, 0, 16, 16], "rotation": 90, "texture": "#0"}, + "down": {"uv": [0, 0, 16, 16], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "Core", + "from": [1, 2, 0], + "to": [15, 14, 16], + "faces": { + "east": {"uv": [0, 2, 16, 14], "texture": "#1"}, + "west": {"uv": [0, 2, 16, 14], "rotation": 180, "texture": "#1"} + } + }, + { + "name": "Top", + "from": [0, 14, 0], + "to": [16, 16, 16], + "faces": { + "north": {"uv": [14, 16, 16, 0], "rotation": 90, "texture": "#0"}, + "east": {"uv": [0, 0, 16, 2], "texture": "#1"}, + "south": {"uv": [14, 16, 16, 0], "rotation": 270, "texture": "#0"}, + "west": {"uv": [0, 14, 16, 16], "rotation": 180, "texture": "#1"}, + "up": {"uv": [0, 0, 16, 16], "rotation": 90, "texture": "#0"}, + "down": {"uv": [0, 0, 16, 16], "rotation": 270, "texture": "#0"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/encased_belt/middle_vertical.json b/src/main/resources/assets/create/models/block/encased_belt/middle_vertical.json new file mode 100644 index 000000000..0ab6f44ba --- /dev/null +++ b/src/main/resources/assets/create/models/block/encased_belt/middle_vertical.json @@ -0,0 +1,46 @@ +{ + "credit": "Made with Blockbench", + "parent": "block/cube", + "textures": { + "0": "create:block/encased_belt", + "1": "create:block/encased_belt_middle", + "particle": "create:block/encased_belt" + }, + "elements": [ + { + "name": "Base", + "from": [14, 0, 0], + "to": [16, 16, 16], + "faces": { + "north": {"uv": [14, 16, 16, 0], "rotation": 180, "texture": "#0"}, + "east": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "south": {"uv": [0, 16, 2, 0], "rotation": 180, "texture": "#0"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "up": {"uv": [0, 14, 16, 16], "rotation": 270, "texture": "#1"}, + "down": {"uv": [0, 0, 16, 2], "rotation": 90, "texture": "#1"} + } + }, + { + "name": "Core", + "from": [2, 1, 0], + "to": [14, 15, 16], + "faces": { + "up": {"uv": [0, 2, 16, 14], "rotation": 270, "texture": "#1"}, + "down": {"uv": [0, 2, 16, 14], "rotation": 90, "texture": "#1"} + } + }, + { + "name": "Top", + "from": [0, 0, 0], + "to": [2, 16, 16], + "faces": { + "north": {"uv": [14, 16, 16, 0], "rotation": 180, "texture": "#0"}, + "east": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#0"}, + "south": {"uv": [14, 16, 16, 0], "rotation": 180, "texture": "#0"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "up": {"uv": [0, 0, 16, 2], "rotation": 270, "texture": "#1"}, + "down": {"uv": [0, 14, 16, 16], "rotation": 90, "texture": "#1"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/encased_belt/single.json b/src/main/resources/assets/create/models/block/encased_belt/single.json new file mode 100644 index 000000000..3d273fe4c --- /dev/null +++ b/src/main/resources/assets/create/models/block/encased_belt/single.json @@ -0,0 +1,68 @@ +{ + "credit": "Made with Blockbench", + "parent": "block/cube", + "textures": { + "0": "create:block/encased_belt", + "1": "create:block/gearbox", + "particle": "create:block/encased_belt" + }, + "elements": [ + { + "name": "Base", + "from": [0, 0, 0], + "to": [16, 2, 16], + "faces": { + "north": {"uv": [0, 14, 16, 16], "texture": "#1"}, + "east": {"uv": [14, 0, 16, 16], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 14, 16, 16], "texture": "#1"}, + "west": {"uv": [0, 0, 2, 16], "rotation": 270, "texture": "#0"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "down": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#0"} + } + }, + { + "name": "Core", + "from": [2, 2, 1], + "to": [14, 14, 15], + "faces": { + "north": {"uv": [2, 2, 14, 14], "texture": "#1"}, + "south": {"uv": [2, 2, 14, 14], "texture": "#1"} + } + }, + { + "name": "Top", + "from": [0, 14, 0], + "to": [16, 16, 16], + "faces": { + "north": {"uv": [0, 0, 16, 2], "texture": "#1"}, + "east": {"uv": [0, 0, 2, 16], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 0, 16, 2], "texture": "#1"}, + "west": {"uv": [14, 0, 16, 16], "rotation": 270, "texture": "#0"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#0"} + } + }, + { + "name": "SIde", + "from": [0, 2, 0], + "to": [2, 14, 16], + "faces": { + "north": {"uv": [14, 2, 16, 14], "texture": "#1"}, + "east": {"uv": [2, 0, 14, 16], "rotation": 270, "texture": "#0"}, + "south": {"uv": [0, 2, 2, 14], "texture": "#1"}, + "west": {"uv": [2, 0, 14, 16], "rotation": 270, "texture": "#0"} + } + }, + { + "name": "Side", + "from": [14, 2, 0], + "to": [16, 14, 16], + "faces": { + "north": {"uv": [0, 2, 2, 14], "texture": "#1"}, + "east": {"uv": [2, 0, 14, 16], "rotation": 90, "texture": "#0"}, + "south": {"uv": [14, 2, 16, 14], "texture": "#1"}, + "west": {"uv": [2, 0, 14, 16], "rotation": 270, "texture": "#0"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/encased_belt_attached_horizontal.json b/src/main/resources/assets/create/models/block/encased_belt_attached_horizontal.json deleted file mode 100644 index 156453cc3..000000000 --- a/src/main/resources/assets/create/models/block/encased_belt_attached_horizontal.json +++ /dev/null @@ -1,57 +0,0 @@ -{ - "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "parent": "block/cube", - "textures": { - "particle": "create:block/encased_belt", - "0": "create:block/encased_belt", - "1": "create:block/encased_belt_attached" - }, - "elements": [ - { - "name": "Base", - "from": [ 0.0, 0.0, 0.0 ], - "to": [ 16.0, 2.0, 16.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 14.0, 16.0, 16.0, 0.0 ], "rotation": 90 }, - "east": { "texture": "#0", "uv": [ 0.0, 14.0, 16.0, 16.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 16.0, 2.0, 0.0 ], "rotation": 270 }, - "west": { "texture": "#0", "uv": [ 0.0, 14.0, 16.0, 16.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.0 ], "rotation": 90 }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.0 ], "rotation": 90 } - } - }, - { - "name": "Core", - "from": [ 1.0, 2.0, 0.0 ], - "to": [ 15.0, 14.0, 14.0 ], - "faces": { - "east": { "texture": "#1", "uv": [ 2.0, 2.0, 16.0, 14.0 ] }, - "west": { "texture": "#1", "uv": [ 2.0, 2.0, 16.0, 14.0 ], "rotation": 180 } - } - }, - { - "name": "Side", - "from": [ 0.0, 2.0, 14.0 ], - "to": [ 16.0, 14.0, 16.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 2.0, 16.0, 14.0, 0.0 ], "rotation": 270 }, - "east": { "texture": "#0", "uv": [ 2.0, 0.0, 14.0, 2.0 ], "rotation": 270 }, - "south": { "texture": "#0", "uv": [ 2.0, 0.0, 14.0, 16.0 ], "rotation": 90 }, - "west": { "texture": "#0", "uv": [ 2.0, 14.0, 14.0, 16.0 ], "rotation": 270 } - } - }, - { - "name": "Top", - "from": [ 0.0, 14.0, 0.0 ], - "to": [ 16.0, 16.0, 16.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 14.0, 16.0, 16.0, 0.0 ], "rotation": 90 }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 2.0 ] }, - "south": { "texture": "#0", "uv": [ 14.0, 16.0, 16.0, 0.0 ], "rotation": 270 }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 2.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.0 ], "rotation": 90 }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.0 ], "rotation": 270 } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/encased_belt_attached_vertical.json b/src/main/resources/assets/create/models/block/encased_belt_attached_vertical.json deleted file mode 100644 index 3169b0c36..000000000 --- a/src/main/resources/assets/create/models/block/encased_belt_attached_vertical.json +++ /dev/null @@ -1,59 +0,0 @@ -{ - "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "parent": "block/cube", - "textures": { - "particle": "create:block/encased_belt", - "0": "create:block/encased_belt_attached", - "1": "create:block/encased_belt" - }, - "elements": [ - { - "name": "Core", - "from": [ 2.0, 1.0, 2.0 ], - "to": [ 14.0, 15.0, 16.0 ], - "faces": { - "up": { "texture": "#0", "uv": [ 2.0, 2.0, 16.0, 14.0 ], "rotation": 90 }, - "down": { "texture": "#0", "uv": [ 2.0, 2.0, 16.0, 14.0 ], "rotation": 270 } - } - }, - { - "name": "Side", - "from": [ 0.0, 0.0, 0.0 ], - "to": [ 2.0, 16.0, 16.0 ], - "faces": { - "north": { "texture": "#1", "uv": [ 14.0, 0.0, 16.0, 16.0 ] }, - "east": { "texture": "#1", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "south": { "texture": "#1", "uv": [ 0.0, 0.0, 2.0, 16.0 ] }, - "west": { "texture": "#1", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "up": { "texture": "#1", "uv": [ 0.0, 0.0, 16.0, 2.0 ], "rotation": 270 }, - "down": { "texture": "#1", "uv": [ 0.0, 2.0, 16.0, 0.0 ], "rotation": 90 } - } - }, - { - "name": "Side", - "from": [ 14.0, 0.0, 0.0 ], - "to": [ 16.0, 16.0, 16.0 ], - "faces": { - "north": { "texture": "#1", "uv": [ 0.0, 0.0, 2.0, 16.0 ] }, - "east": { "texture": "#1", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "south": { "texture": "#1", "uv": [ 14.0, 0.0, 16.0, 16.0 ] }, - "west": { "texture": "#1", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "up": { "texture": "#1", "uv": [ 0.0, 14.0, 16.0, 16.0 ], "rotation": 270 }, - "down": { "texture": "#1", "uv": [ 0.0, 16.0, 16.0, 14.0 ], "rotation": 90 } - } - }, - { - "name": "Side", - "from": [ 2.0, 0.0, 0.0 ], - "to": [ 14.0, 16.0, 2.0 ], - "faces": { - "north": { "texture": "#1", "uv": [ 2.0, 0.0, 14.0, 16.0 ] }, - "east": { "texture": "#1", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "south": { "texture": "#1", "uv": [ 2.0, 0.0, 14.0, 16.0 ] }, - "west": { "texture": "#1", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "up": { "texture": "#1", "uv": [ 2.0, 14.0, 14.0, 16.0 ], "rotation": 180 }, - "down": { "texture": "#1", "uv": [ 2.0, 14.0, 14.0, 16.0 ] } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/encased_belt.json b/src/main/resources/assets/create/models/item/encased_belt.json index c32cb1b87..46d36fd69 100644 --- a/src/main/resources/assets/create/models/item/encased_belt.json +++ b/src/main/resources/assets/create/models/item/encased_belt.json @@ -1,3 +1,3 @@ { - "parent": "create:block/encased_belt" + "parent": "create:block/encased_belt/single" } \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/motion_scarf.json b/src/main/resources/assets/create/models/item/motion_scarf.json deleted file mode 100644 index 3e6fae38a..000000000 --- a/src/main/resources/assets/create/models/item/motion_scarf.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "create:item/motion_scarf" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/time_scarf.json b/src/main/resources/assets/create/models/item/time_scarf.json deleted file mode 100644 index 1cd8f99a9..000000000 --- a/src/main/resources/assets/create/models/item/time_scarf.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "create:item/time_scarf" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/textures/block/CONCEPT_logistical_transaction_controller.pdn b/src/main/resources/assets/create/textures/block/CONCEPT_logistical_transaction_controller.pdn deleted file mode 100644 index b0a5ba795..000000000 Binary files a/src/main/resources/assets/create/textures/block/CONCEPT_logistical_transaction_controller.pdn and /dev/null differ diff --git a/src/main/resources/assets/create/textures/block/encased_belt.png b/src/main/resources/assets/create/textures/block/encased_belt.png index c1b8447a4..0dfbd374b 100644 Binary files a/src/main/resources/assets/create/textures/block/encased_belt.png and b/src/main/resources/assets/create/textures/block/encased_belt.png differ diff --git a/src/main/resources/assets/create/textures/block/encased_belt_attached.png b/src/main/resources/assets/create/textures/block/encased_belt_end.png similarity index 100% rename from src/main/resources/assets/create/textures/block/encased_belt_attached.png rename to src/main/resources/assets/create/textures/block/encased_belt_end.png diff --git a/src/main/resources/assets/create/textures/block/encased_belt_middle.png b/src/main/resources/assets/create/textures/block/encased_belt_middle.png new file mode 100644 index 000000000..9e4584314 Binary files /dev/null and b/src/main/resources/assets/create/textures/block/encased_belt_middle.png differ diff --git a/src/main/resources/assets/create/textures/block/old_belt.png b/src/main/resources/assets/create/textures/block/old_belt.png deleted file mode 100644 index 597617acd..000000000 Binary files a/src/main/resources/assets/create/textures/block/old_belt.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/item/TEMPLATE_crushed.png b/src/main/resources/assets/create/textures/item/unused/TEMPLATE_crushed.png similarity index 100% rename from src/main/resources/assets/create/textures/item/TEMPLATE_crushed.png rename to src/main/resources/assets/create/textures/item/unused/TEMPLATE_crushed.png diff --git a/src/main/resources/assets/create/textures/item/motion_scarf.png b/src/main/resources/assets/create/textures/item/unused/motion_scarf.png similarity index 100% rename from src/main/resources/assets/create/textures/item/motion_scarf.png rename to src/main/resources/assets/create/textures/item/unused/motion_scarf.png diff --git a/src/main/resources/assets/create/textures/item/time_scarf.png b/src/main/resources/assets/create/textures/item/unused/time_scarf.png similarity index 100% rename from src/main/resources/assets/create/textures/item/time_scarf.png rename to src/main/resources/assets/create/textures/item/unused/time_scarf.png