diff --git a/src/main/java/com/simibubi/create/AllBlocks.java b/src/main/java/com/simibubi/create/AllBlocks.java index 404210d61..feb29221c 100644 --- a/src/main/java/com/simibubi/create/AllBlocks.java +++ b/src/main/java/com/simibubi/create/AllBlocks.java @@ -1,102 +1,103 @@ package com.simibubi.create; -import static com.simibubi.create.foundation.registrate.CreateRegistrate.connectedTextures; -import static com.simibubi.create.foundation.utility.data.BlockStateGen.oxidizedBlockstate; -import static com.simibubi.create.foundation.utility.data.ModelGen.customItemModel; -import static com.simibubi.create.foundation.utility.data.ModelGen.oxidizedItemModel; -import static com.simibubi.create.modules.Sections.SCHEMATICS; +import static com.simibubi.create.content.AllSections.SCHEMATICS; +import static com.simibubi.create.foundation.data.BlockStateGen.oxidizedBlockstate; +import static com.simibubi.create.foundation.data.CreateRegistrate.connectedTextures; +import static com.simibubi.create.foundation.data.ModelGen.customItemModel; +import static com.simibubi.create.foundation.data.ModelGen.oxidizedItemModel; -import com.simibubi.create.config.StressConfigDefaults; -import com.simibubi.create.foundation.registrate.CreateRegistrate; -import com.simibubi.create.foundation.utility.data.AssetLookup; -import com.simibubi.create.foundation.utility.data.BlockStateGen; -import com.simibubi.create.foundation.utility.data.BuilderTransformers; -import com.simibubi.create.foundation.utility.data.ModelGen; -import com.simibubi.create.foundation.world.OxidizingBlock; -import com.simibubi.create.modules.Sections; -import com.simibubi.create.modules.contraptions.CasingBlock; -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.PloughBlock; -import com.simibubi.create.modules.contraptions.components.actors.PortableStorageInterfaceBlock; -import com.simibubi.create.modules.contraptions.components.clock.CuckooClockBlock; -import com.simibubi.create.modules.contraptions.components.contraptions.bearing.ClockworkBearingBlock; -import com.simibubi.create.modules.contraptions.components.contraptions.bearing.MechanicalBearingBlock; -import com.simibubi.create.modules.contraptions.components.contraptions.chassis.LinearChassisBlock; -import com.simibubi.create.modules.contraptions.components.contraptions.chassis.LinearChassisBlock.ChassisCTBehaviour; -import com.simibubi.create.modules.contraptions.components.contraptions.chassis.RadialChassisBlock; -import com.simibubi.create.modules.contraptions.components.contraptions.mounted.CartAssemblerBlock; -import com.simibubi.create.modules.contraptions.components.contraptions.mounted.CartAssemblerBlock.MinecartAnchorBlock; -import com.simibubi.create.modules.contraptions.components.contraptions.piston.MechanicalPistonBlock; -import com.simibubi.create.modules.contraptions.components.contraptions.piston.MechanicalPistonHeadBlock; -import com.simibubi.create.modules.contraptions.components.contraptions.piston.PistonExtensionPoleBlock; -import com.simibubi.create.modules.contraptions.components.contraptions.pulley.PulleyBlock; -import com.simibubi.create.modules.contraptions.components.crafter.MechanicalCrafterBlock; -import com.simibubi.create.modules.contraptions.components.crank.HandCrankBlock; -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.deployer.DeployerBlock; -import com.simibubi.create.modules.contraptions.components.fan.EncasedFanBlock; -import com.simibubi.create.modules.contraptions.components.fan.NozzleBlock; -import com.simibubi.create.modules.contraptions.components.flywheel.FlywheelBlock; -import com.simibubi.create.modules.contraptions.components.flywheel.FlywheelGenerator; -import com.simibubi.create.modules.contraptions.components.flywheel.engine.FurnaceEngineBlock; -import com.simibubi.create.modules.contraptions.components.millstone.MillstoneBlock; -import com.simibubi.create.modules.contraptions.components.mixer.BasinOperatorBlockItem; -import com.simibubi.create.modules.contraptions.components.mixer.MechanicalMixerBlock; -import com.simibubi.create.modules.contraptions.components.motor.MotorBlock; -import com.simibubi.create.modules.contraptions.components.motor.MotorGenerator; -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.saw.SawGenerator; -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.AnalogLeverBlock; -import com.simibubi.create.modules.contraptions.redstone.RedstoneContactBlock; -import com.simibubi.create.modules.contraptions.relays.advanced.SpeedControllerBlock; -import com.simibubi.create.modules.contraptions.relays.advanced.sequencer.SequencedGearshiftBlock; -import com.simibubi.create.modules.contraptions.relays.advanced.sequencer.SequencedGearshiftGenerator; -import com.simibubi.create.modules.contraptions.relays.belt.BeltBlock; -import com.simibubi.create.modules.contraptions.relays.belt.BeltGenerator; -import com.simibubi.create.modules.contraptions.relays.elementary.CogWheelBlock; -import com.simibubi.create.modules.contraptions.relays.elementary.CogwheelBlockItem; -import com.simibubi.create.modules.contraptions.relays.elementary.ShaftBlock; -import com.simibubi.create.modules.contraptions.relays.encased.AdjustablePulleyBlock; -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.EncasedBeltGenerator; -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.gauge.GaugeGenerator; -import com.simibubi.create.modules.contraptions.relays.gearbox.GearboxBlock; -import com.simibubi.create.modules.logistics.block.RedstoneLinkBlock; -import com.simibubi.create.modules.logistics.block.RedstoneLinkGenerator; -import com.simibubi.create.modules.logistics.block.StockpileSwitchBlock; -import com.simibubi.create.modules.logistics.block.belts.observer.BeltObserverBlock; -import com.simibubi.create.modules.logistics.block.belts.tunnel.BeltTunnelBlock; -import com.simibubi.create.modules.logistics.block.diodes.AbstractDiodeGenerator; -import com.simibubi.create.modules.logistics.block.diodes.AdjustableRepeaterBlock; -import com.simibubi.create.modules.logistics.block.diodes.AdjustableRepeaterGenerator; -import com.simibubi.create.modules.logistics.block.diodes.PoweredLatchBlock; -import com.simibubi.create.modules.logistics.block.diodes.PoweredLatchGenerator; -import com.simibubi.create.modules.logistics.block.diodes.PulseRepeaterBlock; -import com.simibubi.create.modules.logistics.block.diodes.PulseRepeaterGenerator; -import com.simibubi.create.modules.logistics.block.diodes.ToggleLatchBlock; -import com.simibubi.create.modules.logistics.block.diodes.ToggleLatchGenerator; -import com.simibubi.create.modules.logistics.block.extractor.ExtractorBlock; -import com.simibubi.create.modules.logistics.block.extractor.LinkedExtractorBlock; -import com.simibubi.create.modules.logistics.block.extractor.VerticalExtractorGenerator; -import com.simibubi.create.modules.logistics.block.funnel.FunnelBlock; -import com.simibubi.create.modules.logistics.block.funnel.VerticalFunnelGenerator; -import com.simibubi.create.modules.logistics.block.inventories.AdjustableCrateBlock; -import com.simibubi.create.modules.logistics.block.inventories.CreativeCrateBlock; -import com.simibubi.create.modules.logistics.block.transposer.LinkedTransposerBlock; -import com.simibubi.create.modules.logistics.block.transposer.TransposerBlock; -import com.simibubi.create.modules.logistics.block.transposer.VerticalTransposerGenerator; -import com.simibubi.create.modules.schematics.block.SchematicTableBlock; -import com.simibubi.create.modules.schematics.block.SchematicannonBlock; +import com.simibubi.create.content.AllSections; +import com.simibubi.create.content.contraptions.base.CasingBlock; +import com.simibubi.create.content.contraptions.components.actors.DrillBlock; +import com.simibubi.create.content.contraptions.components.actors.HarvesterBlock; +import com.simibubi.create.content.contraptions.components.actors.PloughBlock; +import com.simibubi.create.content.contraptions.components.actors.PortableStorageInterfaceBlock; +import com.simibubi.create.content.contraptions.components.clock.CuckooClockBlock; +import com.simibubi.create.content.contraptions.components.crafter.MechanicalCrafterBlock; +import com.simibubi.create.content.contraptions.components.crank.HandCrankBlock; +import com.simibubi.create.content.contraptions.components.crusher.CrushingWheelBlock; +import com.simibubi.create.content.contraptions.components.crusher.CrushingWheelControllerBlock; +import com.simibubi.create.content.contraptions.components.deployer.DeployerBlock; +import com.simibubi.create.content.contraptions.components.fan.EncasedFanBlock; +import com.simibubi.create.content.contraptions.components.fan.NozzleBlock; +import com.simibubi.create.content.contraptions.components.flywheel.FlywheelBlock; +import com.simibubi.create.content.contraptions.components.flywheel.FlywheelGenerator; +import com.simibubi.create.content.contraptions.components.flywheel.engine.FurnaceEngineBlock; +import com.simibubi.create.content.contraptions.components.millstone.MillstoneBlock; +import com.simibubi.create.content.contraptions.components.mixer.BasinOperatorBlockItem; +import com.simibubi.create.content.contraptions.components.mixer.MechanicalMixerBlock; +import com.simibubi.create.content.contraptions.components.motor.MotorBlock; +import com.simibubi.create.content.contraptions.components.motor.MotorGenerator; +import com.simibubi.create.content.contraptions.components.press.MechanicalPressBlock; +import com.simibubi.create.content.contraptions.components.saw.SawBlock; +import com.simibubi.create.content.contraptions.components.saw.SawGenerator; +import com.simibubi.create.content.contraptions.components.structureMovement.bearing.ClockworkBearingBlock; +import com.simibubi.create.content.contraptions.components.structureMovement.bearing.MechanicalBearingBlock; +import com.simibubi.create.content.contraptions.components.structureMovement.chassis.LinearChassisBlock; +import com.simibubi.create.content.contraptions.components.structureMovement.chassis.RadialChassisBlock; +import com.simibubi.create.content.contraptions.components.structureMovement.chassis.LinearChassisBlock.ChassisCTBehaviour; +import com.simibubi.create.content.contraptions.components.structureMovement.mounted.CartAssemblerBlock; +import com.simibubi.create.content.contraptions.components.structureMovement.mounted.CartAssemblerBlock.MinecartAnchorBlock; +import com.simibubi.create.content.contraptions.components.structureMovement.piston.MechanicalPistonBlock; +import com.simibubi.create.content.contraptions.components.structureMovement.piston.MechanicalPistonHeadBlock; +import com.simibubi.create.content.contraptions.components.structureMovement.piston.PistonExtensionPoleBlock; +import com.simibubi.create.content.contraptions.components.structureMovement.pulley.PulleyBlock; +import com.simibubi.create.content.contraptions.components.turntable.TurntableBlock; +import com.simibubi.create.content.contraptions.components.waterwheel.WaterWheelBlock; +import com.simibubi.create.content.contraptions.processing.BasinBlock; +import com.simibubi.create.content.contraptions.relays.advanced.SpeedControllerBlock; +import com.simibubi.create.content.contraptions.relays.advanced.sequencer.SequencedGearshiftBlock; +import com.simibubi.create.content.contraptions.relays.advanced.sequencer.SequencedGearshiftGenerator; +import com.simibubi.create.content.contraptions.relays.belt.BeltBlock; +import com.simibubi.create.content.contraptions.relays.belt.BeltGenerator; +import com.simibubi.create.content.contraptions.relays.elementary.CogWheelBlock; +import com.simibubi.create.content.contraptions.relays.elementary.CogwheelBlockItem; +import com.simibubi.create.content.contraptions.relays.elementary.ShaftBlock; +import com.simibubi.create.content.contraptions.relays.encased.AdjustablePulleyBlock; +import com.simibubi.create.content.contraptions.relays.encased.ClutchBlock; +import com.simibubi.create.content.contraptions.relays.encased.EncasedBeltBlock; +import com.simibubi.create.content.contraptions.relays.encased.EncasedBeltGenerator; +import com.simibubi.create.content.contraptions.relays.encased.EncasedShaftBlock; +import com.simibubi.create.content.contraptions.relays.encased.GearshiftBlock; +import com.simibubi.create.content.contraptions.relays.gauge.GaugeBlock; +import com.simibubi.create.content.contraptions.relays.gauge.GaugeGenerator; +import com.simibubi.create.content.contraptions.relays.gearbox.GearboxBlock; +import com.simibubi.create.content.logistics.block.belts.observer.BeltObserverBlock; +import com.simibubi.create.content.logistics.block.belts.tunnel.BeltTunnelBlock; +import com.simibubi.create.content.logistics.block.diodes.AbstractDiodeGenerator; +import com.simibubi.create.content.logistics.block.diodes.AdjustableRepeaterBlock; +import com.simibubi.create.content.logistics.block.diodes.AdjustableRepeaterGenerator; +import com.simibubi.create.content.logistics.block.diodes.PoweredLatchBlock; +import com.simibubi.create.content.logistics.block.diodes.PoweredLatchGenerator; +import com.simibubi.create.content.logistics.block.diodes.PulseRepeaterBlock; +import com.simibubi.create.content.logistics.block.diodes.PulseRepeaterGenerator; +import com.simibubi.create.content.logistics.block.diodes.ToggleLatchBlock; +import com.simibubi.create.content.logistics.block.diodes.ToggleLatchGenerator; +import com.simibubi.create.content.logistics.block.extractor.ExtractorBlock; +import com.simibubi.create.content.logistics.block.extractor.LinkedExtractorBlock; +import com.simibubi.create.content.logistics.block.extractor.VerticalExtractorGenerator; +import com.simibubi.create.content.logistics.block.funnel.FunnelBlock; +import com.simibubi.create.content.logistics.block.funnel.VerticalFunnelGenerator; +import com.simibubi.create.content.logistics.block.inventories.AdjustableCrateBlock; +import com.simibubi.create.content.logistics.block.inventories.CreativeCrateBlock; +import com.simibubi.create.content.logistics.block.redstone.AnalogLeverBlock; +import com.simibubi.create.content.logistics.block.redstone.RedstoneContactBlock; +import com.simibubi.create.content.logistics.block.redstone.RedstoneLinkBlock; +import com.simibubi.create.content.logistics.block.redstone.RedstoneLinkGenerator; +import com.simibubi.create.content.logistics.block.redstone.StockpileSwitchBlock; +import com.simibubi.create.content.logistics.block.transposer.LinkedTransposerBlock; +import com.simibubi.create.content.logistics.block.transposer.TransposerBlock; +import com.simibubi.create.content.logistics.block.transposer.VerticalTransposerGenerator; +import com.simibubi.create.content.schematics.block.SchematicTableBlock; +import com.simibubi.create.content.schematics.block.SchematicannonBlock; +import com.simibubi.create.foundation.config.StressConfigDefaults; +import com.simibubi.create.foundation.data.AssetLookup; +import com.simibubi.create.foundation.data.BlockStateGen; +import com.simibubi.create.foundation.data.BuilderTransformers; +import com.simibubi.create.foundation.data.CreateRegistrate; +import com.simibubi.create.foundation.data.ModelGen; +import com.simibubi.create.foundation.data.SharedProperties; +import com.simibubi.create.foundation.worldgen.OxidizingBlock; import com.tterrag.registrate.builders.BlockBuilder; import com.tterrag.registrate.builders.ItemBuilder; import com.tterrag.registrate.util.DataIngredient; @@ -150,7 +151,7 @@ public class AllBlocks { // Kinetics static { - REGISTRATE.startSection(Sections.KINETICS); + REGISTRATE.startSection(AllSections.KINETICS); } public static final BlockEntry SHAFT = REGISTRATE.block("shaft", ShaftBlock::new) @@ -591,7 +592,7 @@ public class AllBlocks { // Logistics static { - REGISTRATE.startSection(Sections.LOGISTICS); + REGISTRATE.startSection(AllSections.LOGISTICS); } public static final BlockEntry REDSTONE_CONTACT = @@ -781,7 +782,7 @@ public class AllBlocks { // Materials static { - REGISTRATE.startSection(Sections.MATERIALS); + REGISTRATE.startSection(AllSections.MATERIALS); } public static final BlockEntry COPPER_ORE = diff --git a/src/main/java/com/simibubi/create/AllContainers.java b/src/main/java/com/simibubi/create/AllContainerTypes.java similarity index 70% rename from src/main/java/com/simibubi/create/AllContainers.java rename to src/main/java/com/simibubi/create/AllContainerTypes.java index 77d47e7fb..81c1b2e27 100644 --- a/src/main/java/com/simibubi/create/AllContainers.java +++ b/src/main/java/com/simibubi/create/AllContainerTypes.java @@ -1,16 +1,16 @@ package com.simibubi.create; +import com.simibubi.create.content.logistics.block.inventories.AdjustableCrateContainer; +import com.simibubi.create.content.logistics.block.inventories.AdjustableCrateScreen; +import com.simibubi.create.content.logistics.item.filter.AttributeFilterContainer; +import com.simibubi.create.content.logistics.item.filter.AttributeFilterScreen; +import com.simibubi.create.content.logistics.item.filter.FilterContainer; +import com.simibubi.create.content.logistics.item.filter.FilterScreen; +import com.simibubi.create.content.schematics.block.SchematicTableContainer; +import com.simibubi.create.content.schematics.block.SchematicTableScreen; +import com.simibubi.create.content.schematics.block.SchematicannonContainer; +import com.simibubi.create.content.schematics.block.SchematicannonScreen; import com.simibubi.create.foundation.utility.Lang; -import com.simibubi.create.modules.logistics.block.inventories.AdjustableCrateContainer; -import com.simibubi.create.modules.logistics.block.inventories.AdjustableCrateScreen; -import com.simibubi.create.modules.logistics.item.filter.AttributeFilterContainer; -import com.simibubi.create.modules.logistics.item.filter.AttributeFilterScreen; -import com.simibubi.create.modules.logistics.item.filter.FilterContainer; -import com.simibubi.create.modules.logistics.item.filter.FilterScreen; -import com.simibubi.create.modules.schematics.block.SchematicTableContainer; -import com.simibubi.create.modules.schematics.block.SchematicTableScreen; -import com.simibubi.create.modules.schematics.block.SchematicannonContainer; -import com.simibubi.create.modules.schematics.block.SchematicannonScreen; import net.minecraft.client.gui.IHasContainer; import net.minecraft.client.gui.ScreenManager; @@ -25,7 +25,7 @@ import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.fml.network.IContainerFactory; -public enum AllContainers { +public enum AllContainerTypes { SCHEMATIC_TABLE(SchematicTableContainer::new), SCHEMATICANNON(SchematicannonContainer::new), @@ -38,12 +38,12 @@ public enum AllContainers { public ContainerType type; private IFactory factory; - private AllContainers(IContainerFactory factory) { + private AllContainerTypes(IContainerFactory factory) { this.factory = factory; } public static void register(RegistryEvent.Register> event) { - for (AllContainers container : values()) { + for (AllContainerTypes container : values()) { container.type = new ContainerType<>(container.factory) .setRegistryName(new ResourceLocation(Create.ID, Lang.asId(container.name()))); event.getRegistry().register(container.type); @@ -61,7 +61,7 @@ public enum AllContainers { @OnlyIn(Dist.CLIENT) @SuppressWarnings("unchecked") - private static > void bind(AllContainers c, + private static > void bind(AllContainerTypes c, IScreenFactory factory) { ScreenManager.registerFactory((ContainerType) c.type, factory); } diff --git a/src/main/java/com/simibubi/create/AllEntities.java b/src/main/java/com/simibubi/create/AllEntityTypes.java similarity index 83% rename from src/main/java/com/simibubi/create/AllEntities.java rename to src/main/java/com/simibubi/create/AllEntityTypes.java index 7a584786d..7711a6500 100644 --- a/src/main/java/com/simibubi/create/AllEntities.java +++ b/src/main/java/com/simibubi/create/AllEntityTypes.java @@ -2,11 +2,11 @@ package com.simibubi.create; import java.util.function.Function; +import com.simibubi.create.content.contraptions.components.structureMovement.ContraptionEntity; +import com.simibubi.create.content.contraptions.components.structureMovement.ContraptionEntityRenderer; +import com.simibubi.create.content.contraptions.components.structureMovement.glue.SuperGlueEntity; +import com.simibubi.create.content.contraptions.components.structureMovement.glue.SuperGlueRenderer; import com.simibubi.create.foundation.utility.Lang; -import com.simibubi.create.modules.contraptions.components.contraptions.ContraptionEntity; -import com.simibubi.create.modules.contraptions.components.contraptions.ContraptionEntityRenderer; -import com.simibubi.create.modules.contraptions.components.contraptions.glue.SuperGlueEntity; -import com.simibubi.create.modules.contraptions.components.contraptions.glue.SuperGlueRenderer; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityClassification; @@ -19,7 +19,7 @@ import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.fml.client.registry.RenderingRegistry; -public enum AllEntities { +public enum AllEntityTypes { CONTRAPTION(ContraptionEntity::new, EntityClassification.MISC, 5, 3, true, ContraptionEntity::build), STATIONARY_CONTRAPTION(ContraptionEntity::new, EntityClassification.MISC, 20, 40, false, ContraptionEntity::build), @@ -36,7 +36,7 @@ public enum AllEntities { public EntityType type; - private AllEntities(IFactory factory, EntityClassification group, int range, int updateFrequency, + private AllEntityTypes(IFactory factory, EntityClassification group, int range, int updateFrequency, boolean sendVelocity, Function, EntityType.Builder> propertyBuilder) { this.factory = factory; @@ -48,7 +48,7 @@ public enum AllEntities { } public static void register(final RegistryEvent.Register> event) { - for (AllEntities entity : values()) { + for (AllEntityTypes entity : values()) { String id = Lang.asId(entity.name()); ResourceLocation resourceLocation = new ResourceLocation(Create.ID, id); Builder builder = EntityType.Builder diff --git a/src/main/java/com/simibubi/create/AllItems.java b/src/main/java/com/simibubi/create/AllItems.java index b6f41553a..e22b3f62e 100644 --- a/src/main/java/com/simibubi/create/AllItems.java +++ b/src/main/java/com/simibubi/create/AllItems.java @@ -4,29 +4,29 @@ import java.util.HashSet; import java.util.Set; import java.util.function.Function; +import com.simibubi.create.content.AllSections; +import com.simibubi.create.content.contraptions.components.structureMovement.glue.SuperGlueItem; +import com.simibubi.create.content.contraptions.components.structureMovement.mounted.MinecartContraptionItem; +import com.simibubi.create.content.contraptions.goggles.GogglesItem; +import com.simibubi.create.content.contraptions.relays.belt.item.BeltConnectorItem; +import com.simibubi.create.content.contraptions.relays.gearbox.VerticalGearboxItem; +import com.simibubi.create.content.contraptions.wrench.WrenchItem; +import com.simibubi.create.content.curiosities.ChromaticCompoundCubeItem; +import com.simibubi.create.content.curiosities.RefinedRadianceItem; +import com.simibubi.create.content.curiosities.ShadowSteelItem; +import com.simibubi.create.content.curiosities.TreeFertilizerItem; +import com.simibubi.create.content.curiosities.symmetry.SymmetryWandItem; +import com.simibubi.create.content.curiosities.tools.DeforesterItem; +import com.simibubi.create.content.curiosities.tools.SandPaperItem; +import com.simibubi.create.content.curiosities.zapper.blockzapper.BlockzapperItem; +import com.simibubi.create.content.curiosities.zapper.terrainzapper.TerrainzapperItem; +import com.simibubi.create.content.logistics.item.filter.FilterItem; +import com.simibubi.create.content.schematics.item.SchematicAndQuillItem; +import com.simibubi.create.content.schematics.item.SchematicItem; +import com.simibubi.create.foundation.data.ITaggable; import com.simibubi.create.foundation.item.IHaveCustomItemModel; import com.simibubi.create.foundation.item.IItemWithColorHandler; import com.simibubi.create.foundation.utility.Lang; -import com.simibubi.create.foundation.utility.data.ITaggable; -import com.simibubi.create.modules.Sections; -import com.simibubi.create.modules.contraptions.GogglesItem; -import com.simibubi.create.modules.contraptions.WrenchItem; -import com.simibubi.create.modules.contraptions.components.contraptions.glue.SuperGlueItem; -import com.simibubi.create.modules.contraptions.components.contraptions.mounted.MinecartContraptionItem; -import com.simibubi.create.modules.contraptions.relays.belt.item.BeltConnectorItem; -import com.simibubi.create.modules.contraptions.relays.gearbox.VerticalGearboxItem; -import com.simibubi.create.modules.curiosities.ChromaticCompoundCubeItem; -import com.simibubi.create.modules.curiosities.RefinedRadianceItem; -import com.simibubi.create.modules.curiosities.ShadowSteelItem; -import com.simibubi.create.modules.curiosities.TreeFertilizerItem; -import com.simibubi.create.modules.curiosities.symmetry.SymmetryWandItem; -import com.simibubi.create.modules.curiosities.tools.DeforesterItem; -import com.simibubi.create.modules.curiosities.tools.SandPaperItem; -import com.simibubi.create.modules.curiosities.zapper.blockzapper.BlockzapperItem; -import com.simibubi.create.modules.curiosities.zapper.terrainzapper.TerrainzapperItem; -import com.simibubi.create.modules.logistics.item.filter.FilterItem; -import com.simibubi.create.modules.schematics.item.SchematicAndQuillItem; -import com.simibubi.create.modules.schematics.item.SchematicItem; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.color.ItemColors; @@ -47,7 +47,7 @@ import net.minecraftforge.registries.IForgeRegistry; @EventBusSubscriber(value = Dist.CLIENT, bus = Bus.MOD) public enum AllItems { - _1_(Sections.MATERIALS), + _1_(AllSections.MATERIALS), COPPER_NUGGET((TaggedItem) new TaggedItem().withForgeTags("nuggets/copper")), ZINC_NUGGET((TaggedItem) new TaggedItem().withForgeTags("nuggets/zinc")), @@ -80,7 +80,7 @@ public enum AllItems { ELECTRON_TUBE, INTEGRATED_CIRCUIT, - _2_(Sections.KINETICS), + _2_(AllSections.KINETICS), BELT_CONNECTOR(BeltConnectorItem::new), VERTICAL_GEARBOX(VerticalGearboxItem::new), @@ -96,12 +96,12 @@ public enum AllItems { MINECART_CONTRAPTION(p -> new MinecartContraptionItem(Type.RIDEABLE, p)), FURNACE_MINECART_CONTRAPTION(p -> new MinecartContraptionItem(Type.FURNACE, p)), - _3_(Sections.LOGISTICS), + _3_(AllSections.LOGISTICS), FILTER(FilterItem::new), PROPERTY_FILTER(FilterItem::new), - _4_(Sections.CURIOSITIES), + _4_(AllSections.CURIOSITIES), TREE_FERTILIZER(TreeFertilizerItem::new), PLACEMENT_HANDGUN(BlockzapperItem::new), @@ -109,7 +109,7 @@ public enum AllItems { DEFORESTER(DeforesterItem::new), SYMMETRY_WAND(SymmetryWandItem::new), - _5_(Sections.SCHEMATICS), + _5_(AllSections.SCHEMATICS), EMPTY_BLUEPRINT(Item::new, stackSize(1)), BLUEPRINT_AND_QUILL(SchematicAndQuillItem::new, stackSize(1)), @@ -118,17 +118,17 @@ public enum AllItems { ; private static class SectionTracker { - static Sections currentSection; + static AllSections currentSection; } // Common - public Sections section; + public AllSections section; private Function specialProperties; private TaggedItem taggedItem; private Item item; - AllItems(Sections section) { + AllItems(AllSections section) { SectionTracker.currentSection = section; taggedItem = new TaggedItem(null); } diff --git a/src/main/java/com/simibubi/create/AllParticles.java b/src/main/java/com/simibubi/create/AllParticleTypes.java similarity index 83% rename from src/main/java/com/simibubi/create/AllParticles.java rename to src/main/java/com/simibubi/create/AllParticleTypes.java index be412e54b..7df7d02b3 100644 --- a/src/main/java/com/simibubi/create/AllParticles.java +++ b/src/main/java/com/simibubi/create/AllParticleTypes.java @@ -2,10 +2,10 @@ package com.simibubi.create; import java.util.function.Supplier; +import com.simibubi.create.content.contraptions.particle.AirFlowParticleData; +import com.simibubi.create.content.contraptions.particle.ICustomParticle; +import com.simibubi.create.content.contraptions.particle.RotationIndicatorParticleData; import com.simibubi.create.foundation.utility.Lang; -import com.simibubi.create.modules.contraptions.particle.AirFlowParticleData; -import com.simibubi.create.modules.contraptions.particle.ICustomParticle; -import com.simibubi.create.modules.contraptions.particle.RotationIndicatorParticleData; import net.minecraft.client.Minecraft; import net.minecraft.client.particle.ParticleManager; @@ -18,7 +18,7 @@ import net.minecraftforge.client.event.ParticleFactoryRegisterEvent; import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.registries.IForgeRegistry; -public enum AllParticles { +public enum AllParticleTypes { ROTATION_INDICATOR(RotationIndicatorParticleData::new), AIR_FLOW(AirFlowParticleData::new), @@ -27,20 +27,20 @@ public enum AllParticles { private ParticleEntry entry; - private AllParticles(Supplier> typeFactory) { + private AllParticleTypes(Supplier> typeFactory) { String asId = Lang.asId(this.name()); entry = new ParticleEntry(new ResourceLocation(Create.ID, asId), typeFactory); } public static void register(RegistryEvent.Register> event) { - for (AllParticles particle : values()) + for (AllParticleTypes particle : values()) particle.entry.register(event.getRegistry()); } @OnlyIn(Dist.CLIENT) public static void registerFactories(ParticleFactoryRegisterEvent event) { ParticleManager particles = Minecraft.getInstance().particles; - for (AllParticles particle : values()) + for (AllParticleTypes particle : values()) particle.entry.registerFactory(particles); } diff --git a/src/main/java/com/simibubi/create/AllRecipes.java b/src/main/java/com/simibubi/create/AllRecipeTypes.java similarity index 73% rename from src/main/java/com/simibubi/create/AllRecipes.java rename to src/main/java/com/simibubi/create/AllRecipeTypes.java index b92c1ccdd..87fcec136 100644 --- a/src/main/java/com/simibubi/create/AllRecipes.java +++ b/src/main/java/com/simibubi/create/AllRecipeTypes.java @@ -3,19 +3,19 @@ package com.simibubi.create; import java.util.function.Supplier; import com.simibubi.create.compat.jei.ConversionRecipe; +import com.simibubi.create.content.contraptions.components.crafter.MechanicalCraftingRecipe; +import com.simibubi.create.content.contraptions.components.crusher.CrushingRecipe; +import com.simibubi.create.content.contraptions.components.fan.SplashingRecipe; +import com.simibubi.create.content.contraptions.components.millstone.MillingRecipe; +import com.simibubi.create.content.contraptions.components.mixer.MixingRecipe; +import com.simibubi.create.content.contraptions.components.press.PressingRecipe; +import com.simibubi.create.content.contraptions.components.saw.CuttingRecipe; +import com.simibubi.create.content.contraptions.processing.ProcessingRecipe; +import com.simibubi.create.content.contraptions.processing.ProcessingRecipeSerializer; +import com.simibubi.create.content.contraptions.processing.ProcessingRecipeSerializer.IRecipeFactory; +import com.simibubi.create.content.curiosities.tools.SandPaperPolishingRecipe; +import com.simibubi.create.content.curiosities.zapper.blockzapper.BlockzapperUpgradeRecipe; import com.simibubi.create.foundation.utility.Lang; -import com.simibubi.create.modules.contraptions.components.crafter.MechanicalCraftingRecipe; -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.millstone.MillingRecipe; -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.ProcessingRecipe; -import com.simibubi.create.modules.contraptions.processing.ProcessingRecipeSerializer; -import com.simibubi.create.modules.contraptions.processing.ProcessingRecipeSerializer.IRecipeFactory; -import com.simibubi.create.modules.curiosities.tools.SandPaperPolishingRecipe; -import com.simibubi.create.modules.curiosities.zapper.blockzapper.BlockzapperUpgradeRecipe; import net.minecraft.inventory.IInventory; import net.minecraft.item.crafting.IRecipe; @@ -26,7 +26,7 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.registry.Registry; import net.minecraftforge.event.RegistryEvent; -public enum AllRecipes { +public enum AllRecipeTypes { BLOCKZAPPER_UPGRADE(BlockzapperUpgradeRecipe.Serializer::new, IRecipeType.CRAFTING), MECHANICAL_CRAFTING(MechanicalCraftingRecipe.Serializer::new), @@ -50,11 +50,11 @@ public enum AllRecipes { return (T) type; } - private AllRecipes(Supplier> supplier) { + private AllRecipeTypes(Supplier> supplier) { this(supplier, null); } - private AllRecipes(Supplier> supplier, + private AllRecipeTypes(Supplier> supplier, IRecipeType> existingType) { this.supplier = supplier; this.type = existingType; @@ -63,7 +63,7 @@ public enum AllRecipes { public static void register(RegistryEvent.Register> event) { ShapedRecipe.setCraftingSize(9, 9); - for (AllRecipes r : AllRecipes.values()) { + for (AllRecipeTypes r : AllRecipeTypes.values()) { if (r.type == null) r.type = customType(Lang.asId(r.name())); diff --git a/src/main/java/com/simibubi/create/foundation/utility/AllShapes.java b/src/main/java/com/simibubi/create/AllShapes.java similarity index 98% rename from src/main/java/com/simibubi/create/foundation/utility/AllShapes.java rename to src/main/java/com/simibubi/create/AllShapes.java index 06c0d1bb4..1bf494a41 100644 --- a/src/main/java/com/simibubi/create/foundation/utility/AllShapes.java +++ b/src/main/java/com/simibubi/create/AllShapes.java @@ -1,4 +1,4 @@ -package com.simibubi.create.foundation.utility; +package com.simibubi.create; import static net.minecraft.util.Direction.NORTH; import static net.minecraft.util.Direction.SOUTH; @@ -6,6 +6,8 @@ import static net.minecraft.util.Direction.UP; import java.util.function.BiFunction; +import com.simibubi.create.foundation.utility.VoxelShaper; + import net.minecraft.block.Block; import net.minecraft.block.Blocks; import net.minecraft.block.DirectionalBlock; diff --git a/src/main/java/com/simibubi/create/AllSpriteShifts.java b/src/main/java/com/simibubi/create/AllSpriteShifts.java index 1519cda48..80aecb153 100644 --- a/src/main/java/com/simibubi/create/AllSpriteShifts.java +++ b/src/main/java/com/simibubi/create/AllSpriteShifts.java @@ -8,14 +8,14 @@ import static com.simibubi.create.foundation.block.connected.CTSpriteShifter.CTT import java.util.IdentityHashMap; import java.util.Map; +import com.simibubi.create.content.palettes.PaletteBlockPatterns; +import com.simibubi.create.content.palettes.PaletteStoneVariants; +import com.simibubi.create.content.palettes.PaletteBlockPatterns.CTs; import com.simibubi.create.foundation.block.connected.CTSpriteShiftEntry; import com.simibubi.create.foundation.block.connected.CTSpriteShifter.CTType; import com.simibubi.create.foundation.block.render.SpriteShiftEntry; import com.simibubi.create.foundation.block.render.SpriteShifter; import com.simibubi.create.foundation.utility.Lang; -import com.simibubi.create.modules.palettes.PaletteBlockPatterns; -import com.simibubi.create.modules.palettes.PaletteBlockPatterns.CTs; -import com.simibubi.create.modules.palettes.PaletteStoneVariants; import net.minecraft.block.WoodType; diff --git a/src/main/java/com/simibubi/create/AllTileEntities.java b/src/main/java/com/simibubi/create/AllTileEntities.java index 4810fdac6..5aa7dcc48 100644 --- a/src/main/java/com/simibubi/create/AllTileEntities.java +++ b/src/main/java/com/simibubi/create/AllTileEntities.java @@ -3,92 +3,92 @@ package com.simibubi.create; import java.util.function.Function; import java.util.function.Supplier; -import com.simibubi.create.foundation.behaviour.base.SmartTileEntityRenderer; +import com.simibubi.create.content.contraptions.base.KineticTileEntityRenderer; +import com.simibubi.create.content.contraptions.components.actors.DrillTileEntity; +import com.simibubi.create.content.contraptions.components.actors.DrillTileEntityRenderer; +import com.simibubi.create.content.contraptions.components.actors.HarvesterRenderer; +import com.simibubi.create.content.contraptions.components.actors.HarvesterTileEntity; +import com.simibubi.create.content.contraptions.components.clock.CuckooClockRenderer; +import com.simibubi.create.content.contraptions.components.clock.CuckooClockTileEntity; +import com.simibubi.create.content.contraptions.components.crafter.MechanicalCrafterTileEntity; +import com.simibubi.create.content.contraptions.components.crafter.MechanicalCrafterTileEntityRenderer; +import com.simibubi.create.content.contraptions.components.crank.HandCrankTileEntity; +import com.simibubi.create.content.contraptions.components.crank.HandCrankTileEntityRenderer; +import com.simibubi.create.content.contraptions.components.crusher.CrushingWheelControllerTileEntity; +import com.simibubi.create.content.contraptions.components.crusher.CrushingWheelTileEntity; +import com.simibubi.create.content.contraptions.components.deployer.DeployerTileEntity; +import com.simibubi.create.content.contraptions.components.deployer.DeployerTileEntityRenderer; +import com.simibubi.create.content.contraptions.components.fan.EncasedFanTileEntity; +import com.simibubi.create.content.contraptions.components.fan.EncasedFanTileEntityRenderer; +import com.simibubi.create.content.contraptions.components.fan.NozzleTileEntity; +import com.simibubi.create.content.contraptions.components.flywheel.FlywheelRenderer; +import com.simibubi.create.content.contraptions.components.flywheel.FlywheelTileEntity; +import com.simibubi.create.content.contraptions.components.flywheel.engine.EngineRenderer; +import com.simibubi.create.content.contraptions.components.flywheel.engine.FurnaceEngineTileEntity; +import com.simibubi.create.content.contraptions.components.millstone.MillstoneRenderer; +import com.simibubi.create.content.contraptions.components.millstone.MillstoneTileEntity; +import com.simibubi.create.content.contraptions.components.mixer.MechanicalMixerTileEntity; +import com.simibubi.create.content.contraptions.components.mixer.MechanicalMixerTileEntityRenderer; +import com.simibubi.create.content.contraptions.components.motor.MotorTileEntity; +import com.simibubi.create.content.contraptions.components.motor.MotorTileEntityRenderer; +import com.simibubi.create.content.contraptions.components.press.MechanicalPressTileEntity; +import com.simibubi.create.content.contraptions.components.press.MechanicalPressTileEntityRenderer; +import com.simibubi.create.content.contraptions.components.saw.SawTileEntity; +import com.simibubi.create.content.contraptions.components.saw.SawTileEntityRenderer; +import com.simibubi.create.content.contraptions.components.structureMovement.bearing.BearingTileEntityRenderer; +import com.simibubi.create.content.contraptions.components.structureMovement.bearing.ClockworkBearingTileEntity; +import com.simibubi.create.content.contraptions.components.structureMovement.bearing.MechanicalBearingTileEntity; +import com.simibubi.create.content.contraptions.components.structureMovement.chassis.ChassisTileEntity; +import com.simibubi.create.content.contraptions.components.structureMovement.mounted.CartAssemblerTileEntity; +import com.simibubi.create.content.contraptions.components.structureMovement.piston.MechanicalPistonTileEntity; +import com.simibubi.create.content.contraptions.components.structureMovement.piston.MechanicalPistonTileEntityRenderer; +import com.simibubi.create.content.contraptions.components.structureMovement.pulley.PulleyRenderer; +import com.simibubi.create.content.contraptions.components.structureMovement.pulley.PulleyTileEntity; +import com.simibubi.create.content.contraptions.components.turntable.TurntableTileEntity; +import com.simibubi.create.content.contraptions.components.waterwheel.WaterWheelTileEntity; +import com.simibubi.create.content.contraptions.processing.BasinTileEntity; +import com.simibubi.create.content.contraptions.processing.BasinTileEntityRenderer; +import com.simibubi.create.content.contraptions.relays.advanced.SpeedControllerRenderer; +import com.simibubi.create.content.contraptions.relays.advanced.SpeedControllerTileEntity; +import com.simibubi.create.content.contraptions.relays.advanced.sequencer.SequencedGearshiftTileEntity; +import com.simibubi.create.content.contraptions.relays.belt.BeltTileEntity; +import com.simibubi.create.content.contraptions.relays.belt.BeltTileEntityRenderer; +import com.simibubi.create.content.contraptions.relays.elementary.SimpleKineticTileEntity; +import com.simibubi.create.content.contraptions.relays.encased.AdjustablePulleyTileEntity; +import com.simibubi.create.content.contraptions.relays.encased.ClutchTileEntity; +import com.simibubi.create.content.contraptions.relays.encased.EncasedShaftTileEntity; +import com.simibubi.create.content.contraptions.relays.encased.EncasedShaftTileEntityRenderer; +import com.simibubi.create.content.contraptions.relays.encased.SplitShaftTileEntityRenderer; +import com.simibubi.create.content.contraptions.relays.gauge.GaugeBlock; +import com.simibubi.create.content.contraptions.relays.gauge.GaugeTileEntityRenderer; +import com.simibubi.create.content.contraptions.relays.gauge.SpeedGaugeTileEntity; +import com.simibubi.create.content.contraptions.relays.gauge.StressGaugeTileEntity; +import com.simibubi.create.content.contraptions.relays.gearbox.GearboxTileEntity; +import com.simibubi.create.content.contraptions.relays.gearbox.GearboxTileEntityRenderer; +import com.simibubi.create.content.contraptions.relays.gearbox.GearshiftTileEntity; +import com.simibubi.create.content.logistics.block.belts.observer.BeltObserverTileEntity; +import com.simibubi.create.content.logistics.block.belts.observer.BeltObserverTileEntityRenderer; +import com.simibubi.create.content.logistics.block.belts.tunnel.BeltTunnelTileEntity; +import com.simibubi.create.content.logistics.block.belts.tunnel.BeltTunnelTileEntityRenderer; +import com.simibubi.create.content.logistics.block.diodes.AdjustablePulseRepeaterTileEntity; +import com.simibubi.create.content.logistics.block.diodes.AdjustableRepeaterRenderer; +import com.simibubi.create.content.logistics.block.diodes.AdjustableRepeaterTileEntity; +import com.simibubi.create.content.logistics.block.extractor.ExtractorTileEntity; +import com.simibubi.create.content.logistics.block.extractor.LinkedExtractorTileEntity; +import com.simibubi.create.content.logistics.block.funnel.FunnelTileEntity; +import com.simibubi.create.content.logistics.block.inventories.AdjustableCrateTileEntity; +import com.simibubi.create.content.logistics.block.inventories.CreativeCrateTileEntity; +import com.simibubi.create.content.logistics.block.redstone.AnalogLeverTileEntity; +import com.simibubi.create.content.logistics.block.redstone.AnalogLeverTileEntityRenderer; +import com.simibubi.create.content.logistics.block.redstone.RedstoneLinkTileEntity; +import com.simibubi.create.content.logistics.block.redstone.StockpileSwitchTileEntity; +import com.simibubi.create.content.logistics.block.transposer.LinkedTransposerTileEntity; +import com.simibubi.create.content.logistics.block.transposer.TransposerTileEntity; +import com.simibubi.create.content.schematics.block.SchematicTableTileEntity; +import com.simibubi.create.content.schematics.block.SchematicannonRenderer; +import com.simibubi.create.content.schematics.block.SchematicannonTileEntity; +import com.simibubi.create.foundation.tileEntity.renderer.SmartTileEntityRenderer; import com.simibubi.create.foundation.utility.Lang; -import com.simibubi.create.modules.contraptions.base.KineticTileEntityRenderer; -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.HarvesterRenderer; -import com.simibubi.create.modules.contraptions.components.actors.HarvesterTileEntity; -import com.simibubi.create.modules.contraptions.components.clock.CuckooClockRenderer; -import com.simibubi.create.modules.contraptions.components.clock.CuckooClockTileEntity; -import com.simibubi.create.modules.contraptions.components.contraptions.bearing.BearingTileEntityRenderer; -import com.simibubi.create.modules.contraptions.components.contraptions.bearing.ClockworkBearingTileEntity; -import com.simibubi.create.modules.contraptions.components.contraptions.bearing.MechanicalBearingTileEntity; -import com.simibubi.create.modules.contraptions.components.contraptions.chassis.ChassisTileEntity; -import com.simibubi.create.modules.contraptions.components.contraptions.mounted.CartAssemblerTileEntity; -import com.simibubi.create.modules.contraptions.components.contraptions.piston.MechanicalPistonTileEntity; -import com.simibubi.create.modules.contraptions.components.contraptions.piston.MechanicalPistonTileEntityRenderer; -import com.simibubi.create.modules.contraptions.components.contraptions.pulley.PulleyRenderer; -import com.simibubi.create.modules.contraptions.components.contraptions.pulley.PulleyTileEntity; -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.crank.HandCrankTileEntity; -import com.simibubi.create.modules.contraptions.components.crank.HandCrankTileEntityRenderer; -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.deployer.DeployerTileEntity; -import com.simibubi.create.modules.contraptions.components.deployer.DeployerTileEntityRenderer; -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.fan.NozzleTileEntity; -import com.simibubi.create.modules.contraptions.components.flywheel.FlywheelRenderer; -import com.simibubi.create.modules.contraptions.components.flywheel.FlywheelTileEntity; -import com.simibubi.create.modules.contraptions.components.flywheel.engine.EngineRenderer; -import com.simibubi.create.modules.contraptions.components.flywheel.engine.FurnaceEngineTileEntity; -import com.simibubi.create.modules.contraptions.components.millstone.MillstoneRenderer; -import com.simibubi.create.modules.contraptions.components.millstone.MillstoneTileEntity; -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.redstone.AnalogLeverTileEntity; -import com.simibubi.create.modules.contraptions.redstone.AnalogLeverTileEntityRenderer; -import com.simibubi.create.modules.contraptions.relays.advanced.SpeedControllerRenderer; -import com.simibubi.create.modules.contraptions.relays.advanced.SpeedControllerTileEntity; -import com.simibubi.create.modules.contraptions.relays.advanced.sequencer.SequencedGearshiftTileEntity; -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.elementary.SimpleKineticTileEntity; -import com.simibubi.create.modules.contraptions.relays.encased.AdjustablePulleyTileEntity; -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.logistics.block.RedstoneLinkTileEntity; -import com.simibubi.create.modules.logistics.block.StockpileSwitchTileEntity; -import com.simibubi.create.modules.logistics.block.belts.observer.BeltObserverTileEntity; -import com.simibubi.create.modules.logistics.block.belts.observer.BeltObserverTileEntityRenderer; -import com.simibubi.create.modules.logistics.block.belts.tunnel.BeltTunnelTileEntity; -import com.simibubi.create.modules.logistics.block.belts.tunnel.BeltTunnelTileEntityRenderer; -import com.simibubi.create.modules.logistics.block.diodes.AdjustablePulseRepeaterTileEntity; -import com.simibubi.create.modules.logistics.block.diodes.AdjustableRepeaterRenderer; -import com.simibubi.create.modules.logistics.block.diodes.AdjustableRepeaterTileEntity; -import com.simibubi.create.modules.logistics.block.extractor.ExtractorTileEntity; -import com.simibubi.create.modules.logistics.block.extractor.LinkedExtractorTileEntity; -import com.simibubi.create.modules.logistics.block.funnel.FunnelTileEntity; -import com.simibubi.create.modules.logistics.block.inventories.AdjustableCrateTileEntity; -import com.simibubi.create.modules.logistics.block.inventories.CreativeCrateTileEntity; -import com.simibubi.create.modules.logistics.block.transposer.LinkedTransposerTileEntity; -import com.simibubi.create.modules.logistics.block.transposer.TransposerTileEntity; -import com.simibubi.create.modules.schematics.block.SchematicTableTileEntity; -import com.simibubi.create.modules.schematics.block.SchematicannonRenderer; -import com.simibubi.create.modules.schematics.block.SchematicannonTileEntity; import net.minecraft.block.Block; import net.minecraft.client.renderer.tileentity.TileEntityRenderer; diff --git a/src/main/java/com/simibubi/create/ClientEvents.java b/src/main/java/com/simibubi/create/ClientEvents.java index d926cbbf1..16e6f8b6a 100644 --- a/src/main/java/com/simibubi/create/ClientEvents.java +++ b/src/main/java/com/simibubi/create/ClientEvents.java @@ -4,17 +4,17 @@ import java.util.ArrayList; import java.util.List; import com.mojang.blaze3d.matrix.MatrixStack; -import com.simibubi.create.config.AllConfigs; -import com.simibubi.create.foundation.behaviour.filtering.FilteringHandler; -import com.simibubi.create.foundation.behaviour.scrollvalue.ScrollValueHandler; +import com.simibubi.create.content.contraptions.KineticDebugger; +import com.simibubi.create.content.contraptions.base.KineticTileEntityRenderer; +import com.simibubi.create.content.contraptions.components.turntable.TurntableHandler; +import com.simibubi.create.content.contraptions.relays.belt.item.BeltConnectorHandler; +import com.simibubi.create.content.curiosities.zapper.terrainzapper.TerrainZapperRenderHandler; +import com.simibubi.create.foundation.config.AllConfigs; import com.simibubi.create.foundation.gui.ScreenOpener; import com.simibubi.create.foundation.item.TooltipHelper; +import com.simibubi.create.foundation.tileEntity.behaviour.filtering.FilteringHandler; +import com.simibubi.create.foundation.tileEntity.behaviour.scrollvalue.ScrollValueHandler; 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.components.turntable.TurntableHandler; -import com.simibubi.create.modules.contraptions.relays.belt.item.BeltConnectorHandler; -import com.simibubi.create.modules.curiosities.zapper.terrainzapper.TerrainZapperRenderHandler; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.ActiveRenderInfo; diff --git a/src/main/java/com/simibubi/create/Events.java b/src/main/java/com/simibubi/create/CommonEvents.java similarity index 97% rename from src/main/java/com/simibubi/create/Events.java rename to src/main/java/com/simibubi/create/CommonEvents.java index 6b1b83884..6a6899714 100644 --- a/src/main/java/com/simibubi/create/Events.java +++ b/src/main/java/com/simibubi/create/CommonEvents.java @@ -11,7 +11,7 @@ import net.minecraftforge.fml.common.Mod.EventBusSubscriber; import net.minecraftforge.fml.event.server.FMLServerStoppingEvent; @EventBusSubscriber -public class Events { +public class CommonEvents { @SubscribeEvent public static void onTick(ServerTickEvent event) { diff --git a/src/main/java/com/simibubi/create/Create.java b/src/main/java/com/simibubi/create/Create.java index a6ddd098b..48b919eba 100644 --- a/src/main/java/com/simibubi/create/Create.java +++ b/src/main/java/com/simibubi/create/Create.java @@ -3,17 +3,19 @@ package com.simibubi.create; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import com.simibubi.create.config.AllConfigs; +import com.simibubi.create.content.CreateItemGroup; +import com.simibubi.create.content.contraptions.TorquePropagator; +import com.simibubi.create.content.logistics.RedstoneLinkNetworkHandler; +import com.simibubi.create.content.palettes.AllPaletteBlocks; +import com.simibubi.create.content.palettes.PalettesItemGroup; +import com.simibubi.create.content.schematics.ServerSchematicLoader; import com.simibubi.create.foundation.advancement.AllTriggers; import com.simibubi.create.foundation.command.CreateCommand; import com.simibubi.create.foundation.command.ServerLagger; -import com.simibubi.create.foundation.registrate.CreateRegistrate; -import com.simibubi.create.foundation.world.AllWorldFeatures; -import com.simibubi.create.modules.contraptions.TorquePropagator; -import com.simibubi.create.modules.logistics.RedstoneLinkNetworkHandler; -import com.simibubi.create.modules.palettes.AllPaletteBlocks; -import com.simibubi.create.modules.palettes.PalettesItemGroup; -import com.simibubi.create.modules.schematics.ServerSchematicLoader; +import com.simibubi.create.foundation.config.AllConfigs; +import com.simibubi.create.foundation.data.CreateRegistrate; +import com.simibubi.create.foundation.networking.AllPackets; +import com.simibubi.create.foundation.worldgen.AllWorldFeatures; import com.tterrag.registrate.util.NonNullLazyValue; import net.minecraft.entity.EntityType; @@ -58,17 +60,17 @@ public class Create { AllBlocks.register(); AllPaletteBlocks.register(); -// modEventBus.addGenericListener(Block.class, AllBlocks::register); + modEventBus.addGenericListener(Item.class, AllItems::register); - modEventBus.addGenericListener(IRecipeSerializer.class, AllRecipes::register); + modEventBus.addGenericListener(IRecipeSerializer.class, AllRecipeTypes::register); modEventBus.addGenericListener(TileEntityType.class, AllTileEntities::register); - modEventBus.addGenericListener(ContainerType.class, AllContainers::register); - modEventBus.addGenericListener(EntityType.class, AllEntities::register); - modEventBus.addGenericListener(ParticleType.class, AllParticles::register); + modEventBus.addGenericListener(ContainerType.class, AllContainerTypes::register); + modEventBus.addGenericListener(EntityType.class, AllEntityTypes::register); + modEventBus.addGenericListener(ParticleType.class, AllParticleTypes::register); modEventBus.addGenericListener(SoundEvent.class, AllSoundEvents::register); - modEventBus.addListener(AllConfigs::onLoad); modEventBus.addListener(AllConfigs::onReload); + CreateClient.addListeners(modEventBus); AllConfigs.registerClientCommon(); } diff --git a/src/main/java/com/simibubi/create/CreateClient.java b/src/main/java/com/simibubi/create/CreateClient.java index 9646f063e..d8552b941 100644 --- a/src/main/java/com/simibubi/create/CreateClient.java +++ b/src/main/java/com/simibubi/create/CreateClient.java @@ -5,21 +5,22 @@ import java.util.List; import java.util.Map; import java.util.function.Function; -import com.simibubi.create.foundation.behaviour.filtering.FilteringRenderer; -import com.simibubi.create.foundation.behaviour.linked.LinkRenderer; -import com.simibubi.create.foundation.behaviour.scrollvalue.ScrollValueRenderer; +import com.simibubi.create.content.contraptions.base.KineticTileEntityRenderer; +import com.simibubi.create.content.contraptions.components.structureMovement.ChassisRangeDisplay; +import com.simibubi.create.content.contraptions.components.structureMovement.ContraptionRenderer; +import com.simibubi.create.content.schematics.ClientSchematicLoader; +import com.simibubi.create.content.schematics.client.SchematicAndQuillHandler; +import com.simibubi.create.content.schematics.client.SchematicHandler; +import com.simibubi.create.foundation.ResourceReloadHandler; import com.simibubi.create.foundation.block.IHaveColorHandler; import com.simibubi.create.foundation.block.render.CustomBlockModels; import com.simibubi.create.foundation.block.render.SpriteShifter; import com.simibubi.create.foundation.item.IHaveCustomItemModel; +import com.simibubi.create.foundation.tileEntity.behaviour.filtering.FilteringRenderer; +import com.simibubi.create.foundation.tileEntity.behaviour.linked.LinkRenderer; +import com.simibubi.create.foundation.tileEntity.behaviour.scrollvalue.ScrollValueRenderer; import com.simibubi.create.foundation.utility.SuperByteBufferCache; import com.simibubi.create.foundation.utility.outliner.Outliner; -import com.simibubi.create.modules.contraptions.base.KineticTileEntityRenderer; -import com.simibubi.create.modules.contraptions.components.contraptions.ChassisRangeDisplay; -import com.simibubi.create.modules.contraptions.components.contraptions.ContraptionRenderer; -import com.simibubi.create.modules.schematics.ClientSchematicLoader; -import com.simibubi.create.modules.schematics.client.SchematicAndQuillHandler; -import com.simibubi.create.modules.schematics.client.SchematicHandler; import com.tterrag.registrate.util.entry.RegistryEntry; import net.minecraft.block.Block; @@ -57,7 +58,7 @@ public class CreateClient { modEventBus.addListener(CreateClient::onModelBake); modEventBus.addListener(CreateClient::onModelRegistry); modEventBus.addListener(CreateClient::onTextureStitch); - modEventBus.addListener(AllParticles::registerFactories); + modEventBus.addListener(AllParticleTypes::registerFactories); }); } @@ -72,10 +73,10 @@ public class CreateClient { bufferCache.registerCompartment(ContraptionRenderer.CONTRAPTION, 20); AllKeys.register(); - AllContainers.registerScreenFactories(); + AllContainerTypes.registerScreenFactories(); AllTileEntities.registerRenderers(); AllItems.registerColorHandlers(); - AllEntities.registerRenderers(); + AllEntityTypes.registerRenderers(); registerColorHandlers(); IResourceManager resourceManager = Minecraft.getInstance() diff --git a/src/main/java/com/simibubi/create/compat/jei/ConversionRecipe.java b/src/main/java/com/simibubi/create/compat/jei/ConversionRecipe.java index cf5f3913b..069783c75 100644 --- a/src/main/java/com/simibubi/create/compat/jei/ConversionRecipe.java +++ b/src/main/java/com/simibubi/create/compat/jei/ConversionRecipe.java @@ -3,11 +3,11 @@ package com.simibubi.create.compat.jei; import java.util.Arrays; import java.util.List; -import com.simibubi.create.AllRecipes; +import com.simibubi.create.AllRecipeTypes; import com.simibubi.create.Create; -import com.simibubi.create.modules.contraptions.processing.ProcessingIngredient; -import com.simibubi.create.modules.contraptions.processing.ProcessingOutput; -import com.simibubi.create.modules.contraptions.processing.ProcessingRecipe; +import com.simibubi.create.content.contraptions.processing.ProcessingIngredient; +import com.simibubi.create.content.contraptions.processing.ProcessingOutput; +import com.simibubi.create.content.contraptions.processing.ProcessingRecipe; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.Ingredient; @@ -25,7 +25,7 @@ public class ConversionRecipe extends ProcessingRecipe { public ConversionRecipe(ResourceLocation id, String group, List ingredients, List results, int processingDuration) { - super(AllRecipes.CONVERSION, id, group, ingredients, results, processingDuration); + super(AllRecipeTypes.CONVERSION, id, group, ingredients, results, processingDuration); } static int counter = 0; diff --git a/src/main/java/com/simibubi/create/compat/jei/CreateJEI.java b/src/main/java/com/simibubi/create/compat/jei/CreateJEI.java index 31e2451e5..12bf61b45 100644 --- a/src/main/java/com/simibubi/create/compat/jei/CreateJEI.java +++ b/src/main/java/com/simibubi/create/compat/jei/CreateJEI.java @@ -6,11 +6,15 @@ import java.util.stream.Collectors; import com.google.common.base.Predicate; import com.simibubi.create.AllBlocks; import com.simibubi.create.AllItems; -import com.simibubi.create.AllRecipes; +import com.simibubi.create.AllRecipeTypes; import com.simibubi.create.Create; import com.simibubi.create.compat.jei.category.BlastingViaFanCategory; import com.simibubi.create.compat.jei.category.BlockCuttingCategory; import com.simibubi.create.compat.jei.category.BlockCuttingCategory.CondensedBlockCuttingRecipe; +import com.simibubi.create.content.contraptions.components.mixer.MixingRecipe; +import com.simibubi.create.content.contraptions.components.press.MechanicalPressTileEntity; +import com.simibubi.create.content.logistics.block.inventories.AdjustableCrateScreen; +import com.simibubi.create.content.schematics.block.SchematicannonScreen; import com.simibubi.create.compat.jei.category.BlockzapperUpgradeCategory; import com.simibubi.create.compat.jei.category.CrushingCategory; import com.simibubi.create.compat.jei.category.MechanicalCraftingCategory; @@ -24,10 +28,6 @@ import com.simibubi.create.compat.jei.category.SawingCategory; import com.simibubi.create.compat.jei.category.SmokingViaFanCategory; import com.simibubi.create.compat.jei.category.SplashingCategory; import com.simibubi.create.foundation.utility.Lang; -import com.simibubi.create.modules.contraptions.components.mixer.MixingRecipe; -import com.simibubi.create.modules.contraptions.components.press.MechanicalPressTileEntity; -import com.simibubi.create.modules.logistics.block.inventories.AdjustableCrateScreen; -import com.simibubi.create.modules.schematics.block.SchematicannonScreen; import mezz.jei.api.IModPlugin; import mezz.jei.api.JeiPlugin; @@ -105,35 +105,35 @@ public class CreateJEI implements IModPlugin { @Override public void registerRecipes(IRecipeRegistration registration) { - registration.addRecipes(findRecipes(AllRecipes.MILLING), millingCategory.getUid()); - registration.addRecipes(findRecipes(AllRecipes.CRUSHING), crushingCategory.getUid()); - registration.addRecipes(findRecipesByTypeExcluding(AllRecipes.MILLING.getType(), AllRecipes.CRUSHING.getType()), + registration.addRecipes(findRecipes(AllRecipeTypes.MILLING), millingCategory.getUid()); + registration.addRecipes(findRecipes(AllRecipeTypes.CRUSHING), crushingCategory.getUid()); + registration.addRecipes(findRecipesByTypeExcluding(AllRecipeTypes.MILLING.getType(), AllRecipeTypes.CRUSHING.getType()), crushingCategory.getUid()); - registration.addRecipes(findRecipes(AllRecipes.SPLASHING), splashingCategory.getUid()); - registration.addRecipes(findRecipes(AllRecipes.PRESSING), pressingCategory.getUid()); - registration.addRecipes(findRecipesById(AllRecipes.BLOCKZAPPER_UPGRADE.serializer.getRegistryName()), + registration.addRecipes(findRecipes(AllRecipeTypes.SPLASHING), splashingCategory.getUid()); + registration.addRecipes(findRecipes(AllRecipeTypes.PRESSING), pressingCategory.getUid()); + registration.addRecipes(findRecipesById(AllRecipeTypes.BLOCKZAPPER_UPGRADE.serializer.getRegistryName()), blockzapperCategory.getUid()); registration.addRecipes(findRecipesByType(IRecipeType.SMOKING), smokingCategory.getUid()); registration.addRecipes(findRecipesByTypeExcluding(IRecipeType.SMELTING, IRecipeType.SMOKING), blastingCategory.getUid()); - registration.addRecipes(findRecipes(AllRecipes.MIXING), mixingCategory.getUid()); + registration.addRecipes(findRecipes(AllRecipeTypes.MIXING), mixingCategory.getUid()); registration.addRecipes(findRecipes(r -> r.getSerializer() == IRecipeSerializer.CRAFTING_SHAPELESS && !MechanicalPressTileEntity.canCompress(r.getIngredients())).stream().map(MixingRecipe::of) .collect(Collectors.toList()), mixingCategory.getUid()); - registration.addRecipes(findRecipes(AllRecipes.CUTTING), sawingCategory.getUid()); + registration.addRecipes(findRecipes(AllRecipeTypes.CUTTING), sawingCategory.getUid()); registration.addRecipes( CondensedBlockCuttingRecipe.condenseRecipes(findRecipesByType(IRecipeType.STONECUTTING)), blockCuttingCategory.getUid()); registration.addRecipes(findRecipes( r -> (r instanceof ICraftingRecipe) && MechanicalPressTileEntity.canCompress(r.getIngredients())), packingCategory.getUid()); - registration.addRecipes(findRecipes(AllRecipes.SANDPAPER_POLISHING), polishingCategory.getUid()); + registration.addRecipes(findRecipes(AllRecipeTypes.SANDPAPER_POLISHING), polishingCategory.getUid()); registration.addRecipes(MysteriousItemConversionCategory.getRecipes(), mysteryConversionCategory.getUid()); - registration.addRecipes(findRecipes(r -> (r.getType() == AllRecipes.MECHANICAL_CRAFTING.type)), + registration.addRecipes(findRecipes(r -> (r.getType() == AllRecipeTypes.MECHANICAL_CRAFTING.type)), mechanicalCraftingCategory.getUid()); registration.addRecipes(findRecipes(r -> (r.getType() == IRecipeType.CRAFTING - && r.getType() != AllRecipes.MECHANICAL_CRAFTING.type) && (r instanceof ShapedRecipe)), + && r.getType() != AllRecipeTypes.MECHANICAL_CRAFTING.type) && (r instanceof ShapedRecipe)), mechanicalCraftingCategory.getUid()); } @@ -180,7 +180,7 @@ public class CreateJEI implements IModPlugin { registration.addGuiContainerHandler(SchematicannonScreen.class, new SlotMover<>()); } - private static List> findRecipes(AllRecipes recipe) { + private static List> findRecipes(AllRecipeTypes recipe) { return findRecipesByType(recipe.type); } diff --git a/src/main/java/com/simibubi/create/compat/jei/ScreenResourceWrapper.java b/src/main/java/com/simibubi/create/compat/jei/ScreenResourceWrapper.java index e6f9f3526..b18961cde 100644 --- a/src/main/java/com/simibubi/create/compat/jei/ScreenResourceWrapper.java +++ b/src/main/java/com/simibubi/create/compat/jei/ScreenResourceWrapper.java @@ -1,15 +1,15 @@ package com.simibubi.create.compat.jei; -import com.simibubi.create.ScreenResources; +import com.simibubi.create.foundation.gui.AllGuiTextures; import mezz.jei.api.gui.drawable.IDrawable; import net.minecraft.client.gui.AbstractGui; public class ScreenResourceWrapper implements IDrawable { - private ScreenResources resource; + private AllGuiTextures resource; - public ScreenResourceWrapper(ScreenResources resource) { + public ScreenResourceWrapper(AllGuiTextures resource) { this.resource = resource; } diff --git a/src/main/java/com/simibubi/create/compat/jei/category/BlockCuttingCategory.java b/src/main/java/com/simibubi/create/compat/jei/category/BlockCuttingCategory.java index b11f30e91..90459b418 100644 --- a/src/main/java/com/simibubi/create/compat/jei/category/BlockCuttingCategory.java +++ b/src/main/java/com/simibubi/create/compat/jei/category/BlockCuttingCategory.java @@ -5,9 +5,9 @@ import java.util.Arrays; import java.util.List; import com.simibubi.create.AllBlocks; -import com.simibubi.create.ScreenResources; import com.simibubi.create.compat.jei.category.BlockCuttingCategory.CondensedBlockCuttingRecipe; import com.simibubi.create.compat.jei.category.animations.AnimatedSaw; +import com.simibubi.create.foundation.gui.AllGuiTextures; import com.simibubi.create.foundation.item.ItemHelper; import mezz.jei.api.constants.VanillaTypes; @@ -58,14 +58,14 @@ public class BlockCuttingCategory extends CreateRecipeCategory> implements IRec return background; } - protected static ScreenResources getRenderedSlot(IRecipe recipe, int index) { - ScreenResources jeiSlot = ScreenResources.JEI_SLOT; + protected static AllGuiTextures getRenderedSlot(IRecipe recipe, int index) { + AllGuiTextures jeiSlot = AllGuiTextures.JEI_SLOT; if (!(recipe instanceof ProcessingRecipe)) return jeiSlot; ProcessingRecipe processingRecipe = (ProcessingRecipe) recipe; @@ -64,7 +64,7 @@ public abstract class CreateRecipeCategory> implements IRec return jeiSlot; if (processingRecipe.getRollableResults().get(index).getChance() == 1) return jeiSlot; - return ScreenResources.JEI_CHANCE_SLOT; + return AllGuiTextures.JEI_CHANCE_SLOT; } protected static IDrawable emptyBackground(int width, int height) { diff --git a/src/main/java/com/simibubi/create/compat/jei/category/CrushingCategory.java b/src/main/java/com/simibubi/create/compat/jei/category/CrushingCategory.java index 59c388522..5e95a3c2c 100644 --- a/src/main/java/com/simibubi/create/compat/jei/category/CrushingCategory.java +++ b/src/main/java/com/simibubi/create/compat/jei/category/CrushingCategory.java @@ -5,10 +5,10 @@ import java.util.List; import com.simibubi.create.AllBlocks; import com.simibubi.create.AllItems; -import com.simibubi.create.ScreenResources; import com.simibubi.create.compat.jei.category.animations.AnimatedCrushingWheels; -import com.simibubi.create.modules.contraptions.components.crusher.AbstractCrushingRecipe; -import com.simibubi.create.modules.contraptions.processing.ProcessingOutput; +import com.simibubi.create.content.contraptions.components.crusher.AbstractCrushingRecipe; +import com.simibubi.create.content.contraptions.processing.ProcessingOutput; +import com.simibubi.create.foundation.gui.AllGuiTextures; import mezz.jei.api.constants.VanillaTypes; import mezz.jei.api.gui.IRecipeLayout; @@ -55,8 +55,8 @@ public class CrushingCategory extends CreateRecipeCategory results = recipe.getRollableResults(); - ScreenResources.JEI_SLOT.draw(50, 2); - ScreenResources.JEI_DOWN_ARROW.draw(72, 7); + AllGuiTextures.JEI_SLOT.draw(50, 2); + AllGuiTextures.JEI_DOWN_ARROW.draw(72, 7); int size = results.size(); int offset = -size * 19 / 2; diff --git a/src/main/java/com/simibubi/create/compat/jei/category/MechanicalCraftingCategory.java b/src/main/java/com/simibubi/create/compat/jei/category/MechanicalCraftingCategory.java index 4b9d01f6b..8f93ffa81 100644 --- a/src/main/java/com/simibubi/create/compat/jei/category/MechanicalCraftingCategory.java +++ b/src/main/java/com/simibubi/create/compat/jei/category/MechanicalCraftingCategory.java @@ -7,8 +7,8 @@ import java.util.stream.Collectors; import com.mojang.blaze3d.systems.RenderSystem; import com.simibubi.create.AllBlocks; -import com.simibubi.create.ScreenResources; import com.simibubi.create.compat.jei.category.animations.AnimatedCrafter; +import com.simibubi.create.foundation.gui.AllGuiTextures; import mezz.jei.api.constants.VanillaTypes; import mezz.jei.api.gui.IRecipeLayout; @@ -160,14 +160,14 @@ public class MechanicalCraftingCategory extends CreateRecipeCategory { int size = actualIngredients.size(); int xOffset = size < 3 ? (3 - size) * 19 / 2 : 0; for (int i = 0; i < size; i++) { - ScreenResources jeiSlot = ScreenResources.JEI_SLOT; + AllGuiTextures jeiSlot = AllGuiTextures.JEI_SLOT; for (ProcessingIngredient processingIngredient : recipe.getRollableIngredients()) { if (processingIngredient.isCatalyst() && ItemHelper .matchIngredients(processingIngredient.getIngredient(), actualIngredients.get(i).getKey())) { - jeiSlot = ScreenResources.JEI_CATALYST_SLOT; + jeiSlot = AllGuiTextures.JEI_CATALYST_SLOT; break; } } jeiSlot.draw(16 + xOffset + (i % 3) * 19, 50 - (i / 3) * 19); } - ScreenResources.JEI_SLOT.draw(141, 50); - ScreenResources.JEI_DOWN_ARROW.draw(136, 32); - ScreenResources.JEI_SHADOW.draw(81, 57); + AllGuiTextures.JEI_SLOT.draw(141, 50); + AllGuiTextures.JEI_DOWN_ARROW.draw(136, 32); + AllGuiTextures.JEI_SHADOW.draw(81, 57); mixer.draw(getBackground().getWidth() / 2 + 3, 25); } diff --git a/src/main/java/com/simibubi/create/compat/jei/category/MysteriousItemConversionCategory.java b/src/main/java/com/simibubi/create/compat/jei/category/MysteriousItemConversionCategory.java index 5dca137a5..42a1cdde0 100644 --- a/src/main/java/com/simibubi/create/compat/jei/category/MysteriousItemConversionCategory.java +++ b/src/main/java/com/simibubi/create/compat/jei/category/MysteriousItemConversionCategory.java @@ -5,9 +5,9 @@ import java.util.Arrays; import java.util.List; import com.simibubi.create.AllItems; -import com.simibubi.create.ScreenResources; import com.simibubi.create.compat.jei.ConversionRecipe; -import com.simibubi.create.modules.contraptions.processing.ProcessingOutput; +import com.simibubi.create.content.contraptions.processing.ProcessingOutput; +import com.simibubi.create.foundation.gui.AllGuiTextures; import mezz.jei.api.constants.VanillaTypes; import mezz.jei.api.gui.IRecipeLayout; @@ -50,10 +50,10 @@ public class MysteriousItemConversionCategory extends CreateRecipeCategory> { int size = ingredients2.size(); int rows = size == 4 ? 2 : 3; for (int i = 0; i < size; i++) { - ScreenResources.JEI_SLOT.draw((rows == 2 ? 26 : 17) + (i % rows) * 19, 50 - (i / rows) * 19); + AllGuiTextures.JEI_SLOT.draw((rows == 2 ? 26 : 17) + (i % rows) * 19, 50 - (i / rows) * 19); } - ScreenResources.JEI_SLOT.draw(141, 50); - ScreenResources.JEI_DOWN_ARROW.draw(136, 32); - ScreenResources.JEI_SHADOW.draw(81, 57); + AllGuiTextures.JEI_SLOT.draw(141, 50); + AllGuiTextures.JEI_DOWN_ARROW.draw(136, 32); + AllGuiTextures.JEI_SHADOW.draw(81, 57); press.draw(getBackground().getWidth() / 2 + 6, 30); } diff --git a/src/main/java/com/simibubi/create/compat/jei/category/PolishingCategory.java b/src/main/java/com/simibubi/create/compat/jei/category/PolishingCategory.java index c3d222e2f..3b3399f27 100644 --- a/src/main/java/com/simibubi/create/compat/jei/category/PolishingCategory.java +++ b/src/main/java/com/simibubi/create/compat/jei/category/PolishingCategory.java @@ -5,9 +5,9 @@ import java.util.List; import com.mojang.blaze3d.systems.RenderSystem; import com.simibubi.create.AllItems; -import com.simibubi.create.ScreenResources; -import com.simibubi.create.modules.contraptions.processing.ProcessingOutput; -import com.simibubi.create.modules.curiosities.tools.SandPaperPolishingRecipe; +import com.simibubi.create.content.contraptions.processing.ProcessingOutput; +import com.simibubi.create.content.curiosities.tools.SandPaperPolishingRecipe; +import com.simibubi.create.foundation.gui.AllGuiTextures; import mezz.jei.api.constants.VanillaTypes; import mezz.jei.api.gui.IRecipeLayout; @@ -55,10 +55,10 @@ public class PolishingCategory extends CreateRecipeCategory ingredients = recipe.getIngredients(); ItemStack[] matchingStacks = ingredients.get(0).getMatchingStacks(); diff --git a/src/main/java/com/simibubi/create/compat/jei/category/PressingCategory.java b/src/main/java/com/simibubi/create/compat/jei/category/PressingCategory.java index e01e749b4..f1260b4fd 100644 --- a/src/main/java/com/simibubi/create/compat/jei/category/PressingCategory.java +++ b/src/main/java/com/simibubi/create/compat/jei/category/PressingCategory.java @@ -5,10 +5,10 @@ import java.util.List; import com.simibubi.create.AllBlocks; import com.simibubi.create.AllItems; -import com.simibubi.create.ScreenResources; import com.simibubi.create.compat.jei.category.animations.AnimatedPress; -import com.simibubi.create.modules.contraptions.components.press.PressingRecipe; -import com.simibubi.create.modules.contraptions.processing.ProcessingOutput; +import com.simibubi.create.content.contraptions.components.press.PressingRecipe; +import com.simibubi.create.content.contraptions.processing.ProcessingOutput; +import com.simibubi.create.foundation.gui.AllGuiTextures; import mezz.jei.api.constants.VanillaTypes; import mezz.jei.api.gui.IRecipeLayout; @@ -52,12 +52,12 @@ public class PressingCategory extends CreateRecipeCategory { @Override public void draw(PressingRecipe recipe, double mouseX, double mouseY) { - ScreenResources.JEI_SLOT.draw(26, 50); + AllGuiTextures.JEI_SLOT.draw(26, 50); getRenderedSlot(recipe, 0).draw(131, 50); if (recipe.getRollableResults().size() > 1) getRenderedSlot(recipe, 1).draw(131 + 19, 50); - ScreenResources.JEI_SHADOW.draw(61, 41); - ScreenResources.JEI_LONG_ARROW.draw(52, 54); + AllGuiTextures.JEI_SHADOW.draw(61, 41); + AllGuiTextures.JEI_LONG_ARROW.draw(52, 54); press.draw(getBackground().getWidth() / 2 - 17, 22); } diff --git a/src/main/java/com/simibubi/create/compat/jei/category/ProcessingViaFanCategory.java b/src/main/java/com/simibubi/create/compat/jei/category/ProcessingViaFanCategory.java index 85c3f88e0..4778bf058 100644 --- a/src/main/java/com/simibubi/create/compat/jei/category/ProcessingViaFanCategory.java +++ b/src/main/java/com/simibubi/create/compat/jei/category/ProcessingViaFanCategory.java @@ -5,8 +5,8 @@ import java.util.Arrays; import com.mojang.blaze3d.systems.RenderSystem; import com.simibubi.create.AllBlockPartials; import com.simibubi.create.AllBlocks; -import com.simibubi.create.ScreenResources; import com.simibubi.create.compat.jei.category.animations.AnimatedKinetics; +import com.simibubi.create.foundation.gui.AllGuiTextures; import com.simibubi.create.foundation.gui.GuiGameElement; import mezz.jei.api.constants.VanillaTypes; @@ -41,11 +41,11 @@ public abstract class ProcessingViaFanCategory> extends Cre } protected void renderWidgets(T recipe, double mouseX, double mouseY) { - ScreenResources.JEI_SLOT.draw(20, 47); - ScreenResources.JEI_SLOT.draw(139, 47); - ScreenResources.JEI_SHADOW.draw(47, 29); - ScreenResources.JEI_LIGHT.draw(66, 39); - ScreenResources.JEI_LONG_ARROW.draw(53, 51); + AllGuiTextures.JEI_SLOT.draw(20, 47); + AllGuiTextures.JEI_SLOT.draw(139, 47); + AllGuiTextures.JEI_SHADOW.draw(47, 29); + AllGuiTextures.JEI_LIGHT.draw(66, 39); + AllGuiTextures.JEI_LONG_ARROW.draw(53, 51); } @Override diff --git a/src/main/java/com/simibubi/create/compat/jei/category/SawingCategory.java b/src/main/java/com/simibubi/create/compat/jei/category/SawingCategory.java index c41b2d9ee..91c46a6d6 100644 --- a/src/main/java/com/simibubi/create/compat/jei/category/SawingCategory.java +++ b/src/main/java/com/simibubi/create/compat/jei/category/SawingCategory.java @@ -4,10 +4,10 @@ import java.util.Arrays; import java.util.List; import com.simibubi.create.AllBlocks; -import com.simibubi.create.ScreenResources; import com.simibubi.create.compat.jei.category.animations.AnimatedSaw; -import com.simibubi.create.modules.contraptions.components.saw.CuttingRecipe; -import com.simibubi.create.modules.contraptions.processing.ProcessingOutput; +import com.simibubi.create.content.contraptions.components.saw.CuttingRecipe; +import com.simibubi.create.content.contraptions.processing.ProcessingOutput; +import com.simibubi.create.foundation.gui.AllGuiTextures; import mezz.jei.api.constants.VanillaTypes; import mezz.jei.api.gui.IRecipeLayout; @@ -54,14 +54,14 @@ public class SawingCategory extends CreateRecipeCategory { @Override public void draw(CuttingRecipe recipe, double mouseX, double mouseY) { - ScreenResources.JEI_SLOT.draw(43, 4); + AllGuiTextures.JEI_SLOT.draw(43, 4); int size = recipe.getRollableResults().size(); for (int i = 0; i < size; i++) { int xOffset = i % 2 == 0 ? 0 : 19; int yOffset = (i / 2) * -19; getRenderedSlot(recipe, i).draw(117 + xOffset, 47 + yOffset); } - ScreenResources.JEI_DOWN_ARROW.draw(70, 6); + AllGuiTextures.JEI_DOWN_ARROW.draw(70, 6); saw.draw(72, 42); } diff --git a/src/main/java/com/simibubi/create/compat/jei/category/SplashingCategory.java b/src/main/java/com/simibubi/create/compat/jei/category/SplashingCategory.java index 52314979f..9fe2eb3c6 100644 --- a/src/main/java/com/simibubi/create/compat/jei/category/SplashingCategory.java +++ b/src/main/java/com/simibubi/create/compat/jei/category/SplashingCategory.java @@ -5,10 +5,10 @@ import java.util.List; import com.mojang.blaze3d.systems.RenderSystem; import com.simibubi.create.AllItems; -import com.simibubi.create.ScreenResources; +import com.simibubi.create.content.contraptions.components.fan.SplashingRecipe; +import com.simibubi.create.content.contraptions.processing.ProcessingOutput; +import com.simibubi.create.foundation.gui.AllGuiTextures; import com.simibubi.create.foundation.gui.GuiGameElement; -import com.simibubi.create.modules.contraptions.components.fan.SplashingRecipe; -import com.simibubi.create.modules.contraptions.processing.ProcessingOutput; import mezz.jei.api.constants.VanillaTypes; import mezz.jei.api.gui.IRecipeLayout; @@ -61,10 +61,10 @@ public class SplashingCategory extends ProcessingViaFanCategory int size = recipe.getPossibleOutputs() .size(); - ScreenResources.JEI_SLOT.draw(20, 47); - ScreenResources.JEI_SHADOW.draw(47, 29); - ScreenResources.JEI_SHADOW.draw(66, 39); - ScreenResources.JEI_LONG_ARROW.draw(53, 51); + AllGuiTextures.JEI_SLOT.draw(20, 47); + AllGuiTextures.JEI_SHADOW.draw(47, 29); + AllGuiTextures.JEI_SHADOW.draw(66, 39); + AllGuiTextures.JEI_LONG_ARROW.draw(53, 51); if (size == 1) { getRenderedSlot(recipe, 0).draw(139, 47); diff --git a/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedCrafter.java b/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedCrafter.java index 908f9d421..54ca7f4f1 100644 --- a/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedCrafter.java +++ b/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedCrafter.java @@ -2,7 +2,7 @@ package com.simibubi.create.compat.jei.category.animations; import com.mojang.blaze3d.systems.RenderSystem; import com.simibubi.create.AllBlocks; -import com.simibubi.create.ScreenResources; +import com.simibubi.create.foundation.gui.AllGuiTextures; import com.simibubi.create.foundation.gui.GuiGameElement; public class AnimatedCrafter extends AnimatedKinetics { @@ -11,7 +11,7 @@ public class AnimatedCrafter extends AnimatedKinetics { public void draw(int xOffset, int yOffset) { RenderSystem.pushMatrix(); RenderSystem.translatef(xOffset, yOffset, 0); - ScreenResources.JEI_SHADOW.draw(-16, 13); + AllGuiTextures.JEI_SHADOW.draw(-16, 13); RenderSystem.translatef(3, 16, 0); RenderSystem.rotatef(-12.5f, 1, 0, 0); diff --git a/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedMillstone.java b/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedMillstone.java index e0c69ed36..95f9238de 100644 --- a/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedMillstone.java +++ b/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedMillstone.java @@ -3,7 +3,7 @@ package com.simibubi.create.compat.jei.category.animations; import com.mojang.blaze3d.systems.RenderSystem; import com.simibubi.create.AllBlockPartials; import com.simibubi.create.AllBlocks; -import com.simibubi.create.ScreenResources; +import com.simibubi.create.foundation.gui.AllGuiTextures; import com.simibubi.create.foundation.gui.GuiGameElement; public class AnimatedMillstone extends AnimatedKinetics { @@ -12,7 +12,7 @@ public class AnimatedMillstone extends AnimatedKinetics { public void draw(int xOffset, int yOffset) { RenderSystem.pushMatrix(); RenderSystem.translatef(xOffset, yOffset, 0); - ScreenResources.JEI_SHADOW.draw(-16, 13); + AllGuiTextures.JEI_SHADOW.draw(-16, 13); RenderSystem.translatef(-2, 18, 0); int scale = 22; diff --git a/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedSaw.java b/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedSaw.java index 895d8d9fe..ad6ed39a2 100644 --- a/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedSaw.java +++ b/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedSaw.java @@ -2,9 +2,9 @@ package com.simibubi.create.compat.jei.category.animations; import com.mojang.blaze3d.systems.RenderSystem; import com.simibubi.create.AllBlocks; -import com.simibubi.create.ScreenResources; +import com.simibubi.create.content.contraptions.components.saw.SawBlock; +import com.simibubi.create.foundation.gui.AllGuiTextures; import com.simibubi.create.foundation.gui.GuiGameElement; -import com.simibubi.create.modules.contraptions.components.saw.SawBlock; import net.minecraft.util.Direction; import net.minecraft.util.Direction.Axis; @@ -15,7 +15,7 @@ public class AnimatedSaw extends AnimatedKinetics { public void draw(int xOffset, int yOffset) { RenderSystem.pushMatrix(); RenderSystem.translatef(xOffset, yOffset, 0); - ScreenResources.JEI_SHADOW.draw(-16, 13); + AllGuiTextures.JEI_SHADOW.draw(-16, 13); RenderSystem.translatef(0, 0, 200); RenderSystem.translatef(-6, 19, 0); diff --git a/src/main/java/com/simibubi/create/modules/Sections.java b/src/main/java/com/simibubi/create/content/AllSections.java similarity index 83% rename from src/main/java/com/simibubi/create/modules/Sections.java rename to src/main/java/com/simibubi/create/content/AllSections.java index fc1231280..011d4b853 100644 --- a/src/main/java/com/simibubi/create/modules/Sections.java +++ b/src/main/java/com/simibubi/create/content/AllSections.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules; +package com.simibubi.create.content; import com.simibubi.create.AllItems; import com.simibubi.create.Create; @@ -9,7 +9,7 @@ import net.minecraft.item.BlockItem; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -public enum Sections { +public enum AllSections { /** Create's kinetic mechanisms */ KINETICS(Palette.Red), @@ -36,7 +36,7 @@ public enum Sections { private Palette tooltipPalette; - private Sections(Palette tooltipPalette) { + private AllSections(Palette tooltipPalette) { this.tooltipPalette = tooltipPalette; } @@ -44,21 +44,21 @@ public enum Sections { return tooltipPalette; } - public static Sections of(ItemStack stack) { + public static AllSections of(ItemStack stack) { Item item = stack.getItem(); if (item instanceof BlockItem) return ofBlock(((BlockItem) item).getBlock()); return ofItem(item); } - static Sections ofItem(Item item) { + static AllSections ofItem(Item item) { for (AllItems allItems : AllItems.values()) if (allItems.get() == item) return allItems.section; return UNASSIGNED; } - static Sections ofBlock(Block block) { + static AllSections ofBlock(Block block) { return Create.registrate().getSection(block); } diff --git a/src/main/java/com/simibubi/create/CreateItemGroup.java b/src/main/java/com/simibubi/create/content/CreateItemGroup.java similarity index 52% rename from src/main/java/com/simibubi/create/CreateItemGroup.java rename to src/main/java/com/simibubi/create/content/CreateItemGroup.java index 8aad1d18e..e773d83b5 100644 --- a/src/main/java/com/simibubi/create/CreateItemGroup.java +++ b/src/main/java/com/simibubi/create/content/CreateItemGroup.java @@ -1,8 +1,9 @@ -package com.simibubi.create; +package com.simibubi.create.content; import java.util.EnumSet; -import com.simibubi.create.modules.Sections; +import com.simibubi.create.AllBlocks; +import com.simibubi.create.foundation.item.CreateItemGroupBase; import net.minecraft.item.ItemStack; @@ -13,8 +14,8 @@ public class CreateItemGroup extends CreateItemGroupBase { } @Override - protected EnumSet getSections() { - return EnumSet.complementOf(EnumSet.of(Sections.PALETTES)); + protected EnumSet getSections() { + return EnumSet.complementOf(EnumSet.of(AllSections.PALETTES)); } @Override diff --git a/src/main/java/com/simibubi/create/modules/contraptions/KineticDebugger.java b/src/main/java/com/simibubi/create/content/contraptions/KineticDebugger.java similarity index 92% rename from src/main/java/com/simibubi/create/modules/contraptions/KineticDebugger.java rename to src/main/java/com/simibubi/create/content/contraptions/KineticDebugger.java index ce2bcae3e..22de500d7 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/KineticDebugger.java +++ b/src/main/java/com/simibubi/create/content/contraptions/KineticDebugger.java @@ -1,10 +1,10 @@ -package com.simibubi.create.modules.contraptions; +package com.simibubi.create.content.contraptions; import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.vertex.IVertexBuilder; -import com.simibubi.create.config.AllConfigs; -import com.simibubi.create.modules.contraptions.base.IRotate; -import com.simibubi.create.modules.contraptions.base.KineticTileEntity; +import com.simibubi.create.content.contraptions.base.IRotate; +import com.simibubi.create.content.contraptions.base.KineticTileEntity; +import com.simibubi.create.foundation.config.AllConfigs; import net.minecraft.block.BlockState; import net.minecraft.client.Minecraft; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/KineticNetwork.java b/src/main/java/com/simibubi/create/content/contraptions/KineticNetwork.java similarity index 97% rename from src/main/java/com/simibubi/create/modules/contraptions/KineticNetwork.java rename to src/main/java/com/simibubi/create/content/contraptions/KineticNetwork.java index 01b32ab0e..d89c7b678 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/KineticNetwork.java +++ b/src/main/java/com/simibubi/create/content/contraptions/KineticNetwork.java @@ -1,10 +1,10 @@ -package com.simibubi.create.modules.contraptions; +package com.simibubi.create.content.contraptions; import java.util.HashMap; import java.util.Iterator; import java.util.Map; -import com.simibubi.create.modules.contraptions.base.KineticTileEntity; +import com.simibubi.create.content.contraptions.base.KineticTileEntity; public class KineticNetwork { diff --git a/src/main/java/com/simibubi/create/modules/contraptions/RotationPropagator.java b/src/main/java/com/simibubi/create/content/contraptions/RotationPropagator.java similarity index 95% rename from src/main/java/com/simibubi/create/modules/contraptions/RotationPropagator.java rename to src/main/java/com/simibubi/create/content/contraptions/RotationPropagator.java index d4fd81ee1..006127819 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/RotationPropagator.java +++ b/src/main/java/com/simibubi/create/content/contraptions/RotationPropagator.java @@ -1,21 +1,21 @@ -package com.simibubi.create.modules.contraptions; +package com.simibubi.create.content.contraptions; -import static com.simibubi.create.modules.contraptions.relays.elementary.CogWheelBlock.isLargeCog; +import static com.simibubi.create.content.contraptions.relays.elementary.CogWheelBlock.isLargeCog; import static net.minecraft.state.properties.BlockStateProperties.AXIS; import java.util.LinkedList; import java.util.List; import com.simibubi.create.AllBlocks; -import com.simibubi.create.config.AllConfigs; -import com.simibubi.create.modules.contraptions.base.IRotate; -import com.simibubi.create.modules.contraptions.base.KineticTileEntity; -import com.simibubi.create.modules.contraptions.relays.advanced.SpeedControllerTileEntity; -import com.simibubi.create.modules.contraptions.relays.belt.BeltTileEntity; -import com.simibubi.create.modules.contraptions.relays.encased.DirectionalShaftHalvesTileEntity; -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 com.simibubi.create.content.contraptions.base.IRotate; +import com.simibubi.create.content.contraptions.base.KineticTileEntity; +import com.simibubi.create.content.contraptions.relays.advanced.SpeedControllerTileEntity; +import com.simibubi.create.content.contraptions.relays.belt.BeltTileEntity; +import com.simibubi.create.content.contraptions.relays.encased.DirectionalShaftHalvesTileEntity; +import com.simibubi.create.content.contraptions.relays.encased.EncasedBeltBlock; +import com.simibubi.create.content.contraptions.relays.encased.SplitShaftTileEntity; +import com.simibubi.create.content.contraptions.relays.gearbox.GearboxTileEntity; +import com.simibubi.create.foundation.config.AllConfigs; import net.minecraft.block.BlockState; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/TorquePropagator.java b/src/main/java/com/simibubi/create/content/contraptions/TorquePropagator.java similarity index 89% rename from src/main/java/com/simibubi/create/modules/contraptions/TorquePropagator.java rename to src/main/java/com/simibubi/create/content/contraptions/TorquePropagator.java index 54f61a940..35a25f007 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/TorquePropagator.java +++ b/src/main/java/com/simibubi/create/content/contraptions/TorquePropagator.java @@ -1,10 +1,10 @@ -package com.simibubi.create.modules.contraptions; +package com.simibubi.create.content.contraptions; import java.util.HashMap; import java.util.Map; import com.simibubi.create.Create; -import com.simibubi.create.modules.contraptions.base.KineticTileEntity; +import com.simibubi.create.content.contraptions.base.KineticTileEntity; import net.minecraft.world.IWorld; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/CasingBlock.java b/src/main/java/com/simibubi/create/content/contraptions/base/CasingBlock.java similarity index 90% rename from src/main/java/com/simibubi/create/modules/contraptions/CasingBlock.java rename to src/main/java/com/simibubi/create/content/contraptions/base/CasingBlock.java index 4e9e8ddab..75fb9c3d3 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/CasingBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/base/CasingBlock.java @@ -1,4 +1,6 @@ -package com.simibubi.create.modules.contraptions; +package com.simibubi.create.content.contraptions.base; + +import com.simibubi.create.content.contraptions.wrench.IWrenchable; import net.minecraft.block.Block; import net.minecraft.block.BlockState; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/base/DirectionalAxisKineticBlock.java b/src/main/java/com/simibubi/create/content/contraptions/base/DirectionalAxisKineticBlock.java similarity index 98% rename from src/main/java/com/simibubi/create/modules/contraptions/base/DirectionalAxisKineticBlock.java rename to src/main/java/com/simibubi/create/content/contraptions/base/DirectionalAxisKineticBlock.java index e46db4510..605184e99 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/base/DirectionalAxisKineticBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/base/DirectionalAxisKineticBlock.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.contraptions.base; +package com.simibubi.create.content.contraptions.base; import net.minecraft.block.Block; import net.minecraft.block.BlockState; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/base/DirectionalKineticBlock.java b/src/main/java/com/simibubi/create/content/contraptions/base/DirectionalKineticBlock.java similarity index 97% rename from src/main/java/com/simibubi/create/modules/contraptions/base/DirectionalKineticBlock.java rename to src/main/java/com/simibubi/create/content/contraptions/base/DirectionalKineticBlock.java index f6b1ed89d..28b281500 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/base/DirectionalKineticBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/base/DirectionalKineticBlock.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.contraptions.base; +package com.simibubi.create.content.contraptions.base; import net.minecraft.block.Block; import net.minecraft.block.BlockState; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/base/GeneratingKineticTileEntity.java b/src/main/java/com/simibubi/create/content/contraptions/base/GeneratingKineticTileEntity.java similarity index 94% rename from src/main/java/com/simibubi/create/modules/contraptions/base/GeneratingKineticTileEntity.java rename to src/main/java/com/simibubi/create/content/contraptions/base/GeneratingKineticTileEntity.java index e83403818..e04c3f99e 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/base/GeneratingKineticTileEntity.java +++ b/src/main/java/com/simibubi/create/content/contraptions/base/GeneratingKineticTileEntity.java @@ -1,11 +1,11 @@ -package com.simibubi.create.modules.contraptions.base; +package com.simibubi.create.content.contraptions.base; import java.util.List; +import com.simibubi.create.content.contraptions.KineticNetwork; +import com.simibubi.create.content.contraptions.base.IRotate.SpeedLevel; +import com.simibubi.create.content.contraptions.goggles.IHaveGoggleInformation; import com.simibubi.create.foundation.utility.Lang; -import com.simibubi.create.modules.contraptions.KineticNetwork; -import com.simibubi.create.modules.contraptions.base.IRotate.SpeedLevel; -import com.simibubi.create.modules.contraptions.goggle.IHaveGoggleInformation; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityType; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/base/HorizontalAxisKineticBlock.java b/src/main/java/com/simibubi/create/content/contraptions/base/HorizontalAxisKineticBlock.java similarity index 97% rename from src/main/java/com/simibubi/create/modules/contraptions/base/HorizontalAxisKineticBlock.java rename to src/main/java/com/simibubi/create/content/contraptions/base/HorizontalAxisKineticBlock.java index ed522e416..dc6e004a9 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/base/HorizontalAxisKineticBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/base/HorizontalAxisKineticBlock.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.contraptions.base; +package com.simibubi.create.content.contraptions.base; import net.minecraft.block.Block; import net.minecraft.block.BlockState; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/base/HorizontalKineticBlock.java b/src/main/java/com/simibubi/create/content/contraptions/base/HorizontalKineticBlock.java similarity index 97% rename from src/main/java/com/simibubi/create/modules/contraptions/base/HorizontalKineticBlock.java rename to src/main/java/com/simibubi/create/content/contraptions/base/HorizontalKineticBlock.java index 2fbc3a639..0de1bc213 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/base/HorizontalKineticBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/base/HorizontalKineticBlock.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.contraptions.base; +package com.simibubi.create.content.contraptions.base; import net.minecraft.block.Block; import net.minecraft.block.BlockState; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/base/IRotate.java b/src/main/java/com/simibubi/create/content/contraptions/base/IRotate.java similarity index 93% rename from src/main/java/com/simibubi/create/modules/contraptions/base/IRotate.java rename to src/main/java/com/simibubi/create/content/contraptions/base/IRotate.java index 2c1ea85bb..3f7663a38 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/base/IRotate.java +++ b/src/main/java/com/simibubi/create/content/contraptions/base/IRotate.java @@ -1,10 +1,10 @@ -package com.simibubi.create.modules.contraptions.base; +package com.simibubi.create.content.contraptions.base; -import com.simibubi.create.config.AllConfigs; +import com.simibubi.create.content.contraptions.goggles.IHaveGoggleInformation; +import com.simibubi.create.content.contraptions.wrench.IWrenchable; +import com.simibubi.create.foundation.config.AllConfigs; import com.simibubi.create.foundation.item.ItemDescription; import com.simibubi.create.foundation.utility.Lang; -import com.simibubi.create.modules.contraptions.IWrenchable; -import com.simibubi.create.modules.contraptions.goggle.IHaveGoggleInformation; import net.minecraft.block.BlockState; import net.minecraft.util.Direction; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/base/KineticBlock.java b/src/main/java/com/simibubi/create/content/contraptions/base/KineticBlock.java similarity index 98% rename from src/main/java/com/simibubi/create/modules/contraptions/base/KineticBlock.java rename to src/main/java/com/simibubi/create/content/contraptions/base/KineticBlock.java index d570b7c9a..fb8806782 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/base/KineticBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/base/KineticBlock.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.contraptions.base; +package com.simibubi.create.content.contraptions.base; import com.simibubi.create.foundation.item.ItemDescription.Palette; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/base/KineticEffectHandler.java b/src/main/java/com/simibubi/create/content/contraptions/base/KineticEffectHandler.java similarity index 94% rename from src/main/java/com/simibubi/create/modules/contraptions/base/KineticEffectHandler.java rename to src/main/java/com/simibubi/create/content/contraptions/base/KineticEffectHandler.java index bbb3d3c71..a24750752 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/base/KineticEffectHandler.java +++ b/src/main/java/com/simibubi/create/content/contraptions/base/KineticEffectHandler.java @@ -1,11 +1,11 @@ -package com.simibubi.create.modules.contraptions.base; +package com.simibubi.create.content.contraptions.base; import java.util.Random; +import com.simibubi.create.content.contraptions.base.IRotate.SpeedLevel; +import com.simibubi.create.content.contraptions.particle.RotationIndicatorParticleData; import com.simibubi.create.foundation.advancement.AllTriggers; import com.simibubi.create.foundation.utility.VecHelper; -import com.simibubi.create.modules.contraptions.base.IRotate.SpeedLevel; -import com.simibubi.create.modules.contraptions.particle.RotationIndicatorParticleData; import net.minecraft.block.Block; import net.minecraft.block.BlockState; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/base/KineticTileEntity.java b/src/main/java/com/simibubi/create/content/contraptions/base/KineticTileEntity.java similarity index 94% rename from src/main/java/com/simibubi/create/modules/contraptions/base/KineticTileEntity.java rename to src/main/java/com/simibubi/create/content/contraptions/base/KineticTileEntity.java index c8bcb2b17..bbaacd262 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/base/KineticTileEntity.java +++ b/src/main/java/com/simibubi/create/content/contraptions/base/KineticTileEntity.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.contraptions.base; +package com.simibubi.create.content.contraptions.base; import static net.minecraft.util.text.TextFormatting.GOLD; import static net.minecraft.util.text.TextFormatting.GRAY; @@ -8,18 +8,18 @@ import java.util.List; import javax.annotation.Nullable; import com.simibubi.create.Create; -import com.simibubi.create.config.AllConfigs; +import com.simibubi.create.content.contraptions.KineticNetwork; +import com.simibubi.create.content.contraptions.RotationPropagator; +import com.simibubi.create.content.contraptions.base.IRotate.SpeedLevel; +import com.simibubi.create.content.contraptions.base.IRotate.StressImpact; +import com.simibubi.create.content.contraptions.goggles.IHaveGoggleInformation; +import com.simibubi.create.content.contraptions.goggles.IHaveHoveringInformation; import com.simibubi.create.foundation.advancement.AllTriggers; -import com.simibubi.create.foundation.behaviour.base.SmartTileEntity; -import com.simibubi.create.foundation.behaviour.base.TileEntityBehaviour; +import com.simibubi.create.foundation.config.AllConfigs; import com.simibubi.create.foundation.item.TooltipHelper; +import com.simibubi.create.foundation.tileEntity.SmartTileEntity; +import com.simibubi.create.foundation.tileEntity.TileEntityBehaviour; import com.simibubi.create.foundation.utility.Lang; -import com.simibubi.create.modules.contraptions.KineticNetwork; -import com.simibubi.create.modules.contraptions.RotationPropagator; -import com.simibubi.create.modules.contraptions.base.IRotate.SpeedLevel; -import com.simibubi.create.modules.contraptions.base.IRotate.StressImpact; -import com.simibubi.create.modules.contraptions.goggle.IHaveGoggleInformation; -import com.simibubi.create.modules.contraptions.goggle.IHaveHoveringInformation; import net.minecraft.block.BlockState; import net.minecraft.client.resources.I18n; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/base/KineticTileEntityRenderer.java b/src/main/java/com/simibubi/create/content/contraptions/base/KineticTileEntityRenderer.java similarity index 94% rename from src/main/java/com/simibubi/create/modules/contraptions/base/KineticTileEntityRenderer.java rename to src/main/java/com/simibubi/create/content/contraptions/base/KineticTileEntityRenderer.java index 70bdc802f..9bfd0e88a 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/base/KineticTileEntityRenderer.java +++ b/src/main/java/com/simibubi/create/content/contraptions/base/KineticTileEntityRenderer.java @@ -1,16 +1,16 @@ -package com.simibubi.create.modules.contraptions.base; +package com.simibubi.create.content.contraptions.base; import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.vertex.IVertexBuilder; import com.simibubi.create.AllBlocks; import com.simibubi.create.CreateClient; -import com.simibubi.create.foundation.block.SafeTileEntityRenderer; +import com.simibubi.create.content.contraptions.KineticDebugger; +import com.simibubi.create.content.contraptions.relays.elementary.CogWheelBlock; +import com.simibubi.create.foundation.tileEntity.renderer.SafeTileEntityRenderer; import com.simibubi.create.foundation.utility.AnimationTickHolder; import com.simibubi.create.foundation.utility.ColorHelper; import com.simibubi.create.foundation.utility.SuperByteBuffer; import com.simibubi.create.foundation.utility.SuperByteBufferCache.Compartment; -import com.simibubi.create.modules.contraptions.KineticDebugger; -import com.simibubi.create.modules.contraptions.relays.elementary.CogWheelBlock; import net.minecraft.block.BlockState; import net.minecraft.client.renderer.IRenderTypeBuffer; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/base/RotatedPillarKineticBlock.java b/src/main/java/com/simibubi/create/content/contraptions/base/RotatedPillarKineticBlock.java similarity index 97% rename from src/main/java/com/simibubi/create/modules/contraptions/base/RotatedPillarKineticBlock.java rename to src/main/java/com/simibubi/create/content/contraptions/base/RotatedPillarKineticBlock.java index ec0a94300..b4f661d1f 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/base/RotatedPillarKineticBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/base/RotatedPillarKineticBlock.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.contraptions.base; +package com.simibubi.create.content.contraptions.base; import net.minecraft.block.Block; import net.minecraft.block.BlockState; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/actors/AttachedActorBlock.java b/src/main/java/com/simibubi/create/content/contraptions/components/actors/AttachedActorBlock.java similarity index 88% rename from src/main/java/com/simibubi/create/modules/contraptions/components/actors/AttachedActorBlock.java rename to src/main/java/com/simibubi/create/content/contraptions/components/actors/AttachedActorBlock.java index 8c245de5b..ccde0e5fa 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/actors/AttachedActorBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/actors/AttachedActorBlock.java @@ -1,8 +1,8 @@ -package com.simibubi.create.modules.contraptions.components.actors; +package com.simibubi.create.content.contraptions.components.actors; -import com.simibubi.create.foundation.utility.AllShapes; -import com.simibubi.create.modules.contraptions.IWrenchable; -import com.simibubi.create.modules.contraptions.components.contraptions.IPortableBlock; +import com.simibubi.create.AllShapes; +import com.simibubi.create.content.contraptions.components.structureMovement.IPortableBlock; +import com.simibubi.create.content.contraptions.wrench.IWrenchable; import net.minecraft.block.Block; import net.minecraft.block.BlockState; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/actors/BlockBreakingKineticTileEntity.java b/src/main/java/com/simibubi/create/content/contraptions/components/actors/BlockBreakingKineticTileEntity.java similarity index 97% rename from src/main/java/com/simibubi/create/modules/contraptions/components/actors/BlockBreakingKineticTileEntity.java rename to src/main/java/com/simibubi/create/content/contraptions/components/actors/BlockBreakingKineticTileEntity.java index 2a899db2b..5ac4e1b75 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/actors/BlockBreakingKineticTileEntity.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/actors/BlockBreakingKineticTileEntity.java @@ -1,9 +1,9 @@ -package com.simibubi.create.modules.contraptions.components.actors; +package com.simibubi.create.content.contraptions.components.actors; import java.util.concurrent.atomic.AtomicInteger; +import com.simibubi.create.content.contraptions.base.KineticTileEntity; import com.simibubi.create.foundation.utility.VecHelper; -import com.simibubi.create.modules.contraptions.base.KineticTileEntity; import net.minecraft.block.AirBlock; import net.minecraft.block.Block; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/actors/BlockBreakingMovementBehaviour.java b/src/main/java/com/simibubi/create/content/contraptions/components/actors/BlockBreakingMovementBehaviour.java similarity index 95% rename from src/main/java/com/simibubi/create/modules/contraptions/components/actors/BlockBreakingMovementBehaviour.java rename to src/main/java/com/simibubi/create/content/contraptions/components/actors/BlockBreakingMovementBehaviour.java index cfaa5a87f..67d6b00c1 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/actors/BlockBreakingMovementBehaviour.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/actors/BlockBreakingMovementBehaviour.java @@ -1,9 +1,9 @@ -package com.simibubi.create.modules.contraptions.components.actors; +package com.simibubi.create.content.contraptions.components.actors; +import com.simibubi.create.content.contraptions.components.structureMovement.ContraptionEntity; +import com.simibubi.create.content.contraptions.components.structureMovement.MovementBehaviour; +import com.simibubi.create.content.contraptions.components.structureMovement.MovementContext; import com.simibubi.create.foundation.utility.BlockHelper; -import com.simibubi.create.modules.contraptions.components.contraptions.ContraptionEntity; -import com.simibubi.create.modules.contraptions.components.contraptions.MovementBehaviour; -import com.simibubi.create.modules.contraptions.components.contraptions.MovementContext; import net.minecraft.block.BlockState; import net.minecraft.block.FallingBlock; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/actors/DrillBlock.java b/src/main/java/com/simibubi/create/content/contraptions/components/actors/DrillBlock.java similarity index 88% rename from src/main/java/com/simibubi/create/modules/contraptions/components/actors/DrillBlock.java rename to src/main/java/com/simibubi/create/content/contraptions/components/actors/DrillBlock.java index 25f09b5ba..ed792dced 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/actors/DrillBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/actors/DrillBlock.java @@ -1,10 +1,10 @@ -package com.simibubi.create.modules.contraptions.components.actors; +package com.simibubi.create.content.contraptions.components.actors; +import com.simibubi.create.AllShapes; +import com.simibubi.create.content.contraptions.base.DirectionalKineticBlock; +import com.simibubi.create.content.contraptions.components.structureMovement.IPortableBlock; +import com.simibubi.create.content.contraptions.components.structureMovement.MovementBehaviour; import com.simibubi.create.foundation.block.ITE; -import com.simibubi.create.foundation.utility.AllShapes; -import com.simibubi.create.modules.contraptions.base.DirectionalKineticBlock; -import com.simibubi.create.modules.contraptions.components.contraptions.IPortableBlock; -import com.simibubi.create.modules.contraptions.components.contraptions.MovementBehaviour; import net.minecraft.block.Block; import net.minecraft.block.BlockState; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/actors/DrillMovementBehaviour.java b/src/main/java/com/simibubi/create/content/contraptions/components/actors/DrillMovementBehaviour.java similarity index 89% rename from src/main/java/com/simibubi/create/modules/contraptions/components/actors/DrillMovementBehaviour.java rename to src/main/java/com/simibubi/create/content/contraptions/components/actors/DrillMovementBehaviour.java index be4ff48b1..30d1e60be 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/actors/DrillMovementBehaviour.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/actors/DrillMovementBehaviour.java @@ -1,8 +1,8 @@ -package com.simibubi.create.modules.contraptions.components.actors; +package com.simibubi.create.content.contraptions.components.actors; +import com.simibubi.create.content.contraptions.components.structureMovement.MovementContext; import com.simibubi.create.foundation.utility.SuperByteBuffer; import com.simibubi.create.foundation.utility.VecHelper; -import com.simibubi.create.modules.contraptions.components.contraptions.MovementContext; import net.minecraft.block.BlockState; import net.minecraft.util.DamageSource; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/actors/DrillTileEntity.java b/src/main/java/com/simibubi/create/content/contraptions/components/actors/DrillTileEntity.java similarity index 88% rename from src/main/java/com/simibubi/create/modules/contraptions/components/actors/DrillTileEntity.java rename to src/main/java/com/simibubi/create/content/contraptions/components/actors/DrillTileEntity.java index f2c31c166..e7c712408 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/actors/DrillTileEntity.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/actors/DrillTileEntity.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.contraptions.components.actors; +package com.simibubi.create.content.contraptions.components.actors; import com.simibubi.create.AllTileEntities; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/actors/DrillTileEntityRenderer.java b/src/main/java/com/simibubi/create/content/contraptions/components/actors/DrillTileEntityRenderer.java similarity index 81% rename from src/main/java/com/simibubi/create/modules/contraptions/components/actors/DrillTileEntityRenderer.java rename to src/main/java/com/simibubi/create/content/contraptions/components/actors/DrillTileEntityRenderer.java index 9bf0e14a9..d23d88f2e 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/actors/DrillTileEntityRenderer.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/actors/DrillTileEntityRenderer.java @@ -1,15 +1,15 @@ -package com.simibubi.create.modules.contraptions.components.actors; +package com.simibubi.create.content.contraptions.components.actors; import static net.minecraft.state.properties.BlockStateProperties.FACING; import com.simibubi.create.AllBlockPartials; +import com.simibubi.create.content.contraptions.base.IRotate; +import com.simibubi.create.content.contraptions.base.KineticTileEntity; +import com.simibubi.create.content.contraptions.base.KineticTileEntityRenderer; +import com.simibubi.create.content.contraptions.components.structureMovement.MovementContext; import com.simibubi.create.foundation.utility.AnimationTickHolder; import com.simibubi.create.foundation.utility.SuperByteBuffer; import com.simibubi.create.foundation.utility.VecHelper; -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.components.contraptions.MovementContext; import net.minecraft.block.BlockState; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/actors/HarvesterBlock.java b/src/main/java/com/simibubi/create/content/contraptions/components/actors/HarvesterBlock.java similarity index 72% rename from src/main/java/com/simibubi/create/modules/contraptions/components/actors/HarvesterBlock.java rename to src/main/java/com/simibubi/create/content/contraptions/components/actors/HarvesterBlock.java index dca366a5d..56429c94b 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/actors/HarvesterBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/actors/HarvesterBlock.java @@ -1,7 +1,7 @@ -package com.simibubi.create.modules.contraptions.components.actors; +package com.simibubi.create.content.contraptions.components.actors; -import com.simibubi.create.modules.contraptions.components.contraptions.IPortableBlock; -import com.simibubi.create.modules.contraptions.components.contraptions.MovementBehaviour; +import com.simibubi.create.content.contraptions.components.structureMovement.IPortableBlock; +import com.simibubi.create.content.contraptions.components.structureMovement.MovementBehaviour; import net.minecraft.block.BlockState; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/actors/HarvesterMovementBehaviour.java b/src/main/java/com/simibubi/create/content/contraptions/components/actors/HarvesterMovementBehaviour.java similarity index 94% rename from src/main/java/com/simibubi/create/modules/contraptions/components/actors/HarvesterMovementBehaviour.java rename to src/main/java/com/simibubi/create/content/contraptions/components/actors/HarvesterMovementBehaviour.java index 596c14880..f49443b2d 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/actors/HarvesterMovementBehaviour.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/actors/HarvesterMovementBehaviour.java @@ -1,14 +1,14 @@ -package com.simibubi.create.modules.contraptions.components.actors; +package com.simibubi.create.content.contraptions.components.actors; import static net.minecraft.block.HorizontalBlock.HORIZONTAL_FACING; import org.apache.commons.lang3.mutable.MutableBoolean; +import com.simibubi.create.content.contraptions.components.structureMovement.MovementBehaviour; +import com.simibubi.create.content.contraptions.components.structureMovement.MovementContext; import com.simibubi.create.foundation.utility.BlockHelper; import com.simibubi.create.foundation.utility.SuperByteBuffer; import com.simibubi.create.foundation.utility.VecHelper; -import com.simibubi.create.modules.contraptions.components.contraptions.MovementBehaviour; -import com.simibubi.create.modules.contraptions.components.contraptions.MovementContext; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/actors/HarvesterRenderer.java b/src/main/java/com/simibubi/create/content/contraptions/components/actors/HarvesterRenderer.java similarity index 92% rename from src/main/java/com/simibubi/create/modules/contraptions/components/actors/HarvesterRenderer.java rename to src/main/java/com/simibubi/create/content/contraptions/components/actors/HarvesterRenderer.java index 438155b26..de4ff7668 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/actors/HarvesterRenderer.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/actors/HarvesterRenderer.java @@ -1,14 +1,14 @@ -package com.simibubi.create.modules.contraptions.components.actors; +package com.simibubi.create.content.contraptions.components.actors; import static net.minecraft.state.properties.BlockStateProperties.HORIZONTAL_FACING; import com.mojang.blaze3d.matrix.MatrixStack; import com.simibubi.create.AllBlockPartials; -import com.simibubi.create.foundation.block.SafeTileEntityRenderer; +import com.simibubi.create.content.contraptions.components.structureMovement.MovementContext; +import com.simibubi.create.foundation.tileEntity.renderer.SafeTileEntityRenderer; import com.simibubi.create.foundation.utility.AnimationTickHolder; import com.simibubi.create.foundation.utility.SuperByteBuffer; import com.simibubi.create.foundation.utility.VecHelper; -import com.simibubi.create.modules.contraptions.components.contraptions.MovementContext; import net.minecraft.block.BlockState; import net.minecraft.client.renderer.IRenderTypeBuffer; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/actors/HarvesterTileEntity.java b/src/main/java/com/simibubi/create/content/contraptions/components/actors/HarvesterTileEntity.java similarity index 66% rename from src/main/java/com/simibubi/create/modules/contraptions/components/actors/HarvesterTileEntity.java rename to src/main/java/com/simibubi/create/content/contraptions/components/actors/HarvesterTileEntity.java index ef9b3dda5..3436370d8 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/actors/HarvesterTileEntity.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/actors/HarvesterTileEntity.java @@ -1,7 +1,7 @@ -package com.simibubi.create.modules.contraptions.components.actors; +package com.simibubi.create.content.contraptions.components.actors; import com.simibubi.create.AllTileEntities; -import com.simibubi.create.foundation.block.SyncedTileEntity; +import com.simibubi.create.foundation.tileEntity.SyncedTileEntity; public class HarvesterTileEntity extends SyncedTileEntity { diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/actors/PloughBlock.java b/src/main/java/com/simibubi/create/content/contraptions/components/actors/PloughBlock.java similarity index 83% rename from src/main/java/com/simibubi/create/modules/contraptions/components/actors/PloughBlock.java rename to src/main/java/com/simibubi/create/content/contraptions/components/actors/PloughBlock.java index 70445c07f..ad3b53960 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/actors/PloughBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/actors/PloughBlock.java @@ -1,9 +1,9 @@ -package com.simibubi.create.modules.contraptions.components.actors; +package com.simibubi.create.content.contraptions.components.actors; import java.util.UUID; import com.mojang.authlib.GameProfile; -import com.simibubi.create.modules.contraptions.components.contraptions.MovementBehaviour; +import com.simibubi.create.content.contraptions.components.structureMovement.MovementBehaviour; import net.minecraft.world.server.ServerWorld; import net.minecraftforge.common.util.FakePlayer; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/actors/PloughMovementBehaviour.java b/src/main/java/com/simibubi/create/content/contraptions/components/actors/PloughMovementBehaviour.java similarity index 92% rename from src/main/java/com/simibubi/create/modules/contraptions/components/actors/PloughMovementBehaviour.java rename to src/main/java/com/simibubi/create/content/contraptions/components/actors/PloughMovementBehaviour.java index 81fd2b07d..4f02e6b4b 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/actors/PloughMovementBehaviour.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/actors/PloughMovementBehaviour.java @@ -1,10 +1,10 @@ -package com.simibubi.create.modules.contraptions.components.actors; +package com.simibubi.create.content.contraptions.components.actors; import static net.minecraft.block.HorizontalBlock.HORIZONTAL_FACING; +import com.simibubi.create.content.contraptions.components.actors.PloughBlock.PloughFakePlayer; +import com.simibubi.create.content.contraptions.components.structureMovement.MovementContext; import com.simibubi.create.foundation.utility.VecHelper; -import com.simibubi.create.modules.contraptions.components.actors.PloughBlock.PloughFakePlayer; -import com.simibubi.create.modules.contraptions.components.contraptions.MovementContext; import net.minecraft.block.BlockState; import net.minecraft.block.FlowingFluidBlock; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/actors/PortableStorageInterfaceBlock.java b/src/main/java/com/simibubi/create/content/contraptions/components/actors/PortableStorageInterfaceBlock.java similarity index 78% rename from src/main/java/com/simibubi/create/modules/contraptions/components/actors/PortableStorageInterfaceBlock.java rename to src/main/java/com/simibubi/create/content/contraptions/components/actors/PortableStorageInterfaceBlock.java index 8c8fce16c..5f10333fc 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/actors/PortableStorageInterfaceBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/actors/PortableStorageInterfaceBlock.java @@ -1,9 +1,9 @@ -package com.simibubi.create.modules.contraptions.components.actors; +package com.simibubi.create.content.contraptions.components.actors; +import com.simibubi.create.AllShapes; +import com.simibubi.create.content.contraptions.components.structureMovement.IPortableBlock; +import com.simibubi.create.content.contraptions.components.structureMovement.MovementBehaviour; import com.simibubi.create.foundation.block.ProperDirectionalBlock; -import com.simibubi.create.foundation.utility.AllShapes; -import com.simibubi.create.modules.contraptions.components.contraptions.IPortableBlock; -import com.simibubi.create.modules.contraptions.components.contraptions.MovementBehaviour; import net.minecraft.block.BlockState; import net.minecraft.item.BlockItemUseContext; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/actors/SawMovementBehaviour.java b/src/main/java/com/simibubi/create/content/contraptions/components/actors/SawMovementBehaviour.java similarity index 89% rename from src/main/java/com/simibubi/create/modules/contraptions/components/actors/SawMovementBehaviour.java rename to src/main/java/com/simibubi/create/content/contraptions/components/actors/SawMovementBehaviour.java index 4c0036de2..39e060e39 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/actors/SawMovementBehaviour.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/actors/SawMovementBehaviour.java @@ -1,12 +1,12 @@ -package com.simibubi.create.modules.contraptions.components.actors; +package com.simibubi.create.content.contraptions.components.actors; +import com.simibubi.create.content.contraptions.components.saw.SawBlock; +import com.simibubi.create.content.contraptions.components.saw.SawTileEntity; +import com.simibubi.create.content.contraptions.components.structureMovement.MovementContext; import com.simibubi.create.foundation.utility.BlockHelper; import com.simibubi.create.foundation.utility.TreeCutter; import com.simibubi.create.foundation.utility.TreeCutter.Tree; import com.simibubi.create.foundation.utility.VecHelper; -import com.simibubi.create.modules.contraptions.components.contraptions.MovementContext; -import com.simibubi.create.modules.contraptions.components.saw.SawBlock; -import com.simibubi.create.modules.contraptions.components.saw.SawTileEntity; import net.minecraft.block.BlockState; import net.minecraft.entity.item.ItemEntity; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/actors/StorageInterfaceMovement.java b/src/main/java/com/simibubi/create/content/contraptions/components/actors/StorageInterfaceMovement.java similarity index 87% rename from src/main/java/com/simibubi/create/modules/contraptions/components/actors/StorageInterfaceMovement.java rename to src/main/java/com/simibubi/create/content/contraptions/components/actors/StorageInterfaceMovement.java index d647423c1..ea8997c43 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/actors/StorageInterfaceMovement.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/actors/StorageInterfaceMovement.java @@ -1,17 +1,17 @@ -package com.simibubi.create.modules.contraptions.components.actors; +package com.simibubi.create.content.contraptions.components.actors; import java.util.function.Predicate; -import com.simibubi.create.config.AllConfigs; -import com.simibubi.create.foundation.behaviour.base.TileEntityBehaviour; -import com.simibubi.create.foundation.behaviour.filtering.FilteringBehaviour; -import com.simibubi.create.foundation.behaviour.inventory.SingleTargetAutoExtractingBehaviour; +import com.simibubi.create.content.contraptions.components.structureMovement.MovementBehaviour; +import com.simibubi.create.content.contraptions.components.structureMovement.MovementContext; +import com.simibubi.create.content.logistics.block.transposer.TransposerBlock; +import com.simibubi.create.content.logistics.block.transposer.TransposerTileEntity; +import com.simibubi.create.foundation.config.AllConfigs; import com.simibubi.create.foundation.item.ItemHelper; +import com.simibubi.create.foundation.tileEntity.TileEntityBehaviour; +import com.simibubi.create.foundation.tileEntity.behaviour.filtering.FilteringBehaviour; +import com.simibubi.create.foundation.tileEntity.behaviour.inventory.SingleTargetAutoExtractingBehaviour; import com.simibubi.create.foundation.utility.VecHelper; -import com.simibubi.create.modules.contraptions.components.contraptions.MovementBehaviour; -import com.simibubi.create.modules.contraptions.components.contraptions.MovementContext; -import com.simibubi.create.modules.logistics.block.transposer.TransposerBlock; -import com.simibubi.create.modules.logistics.block.transposer.TransposerTileEntity; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTUtil; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/clock/CuckooClockBlock.java b/src/main/java/com/simibubi/create/content/contraptions/components/clock/CuckooClockBlock.java similarity index 92% rename from src/main/java/com/simibubi/create/modules/contraptions/components/clock/CuckooClockBlock.java rename to src/main/java/com/simibubi/create/content/contraptions/components/clock/CuckooClockBlock.java index 1041fb861..65eb7c08a 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/clock/CuckooClockBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/clock/CuckooClockBlock.java @@ -1,7 +1,7 @@ -package com.simibubi.create.modules.contraptions.components.clock; +package com.simibubi.create.content.contraptions.components.clock; -import com.simibubi.create.foundation.utility.AllShapes; -import com.simibubi.create.modules.contraptions.base.HorizontalKineticBlock; +import com.simibubi.create.AllShapes; +import com.simibubi.create.content.contraptions.base.HorizontalKineticBlock; import net.minecraft.block.Block; import net.minecraft.block.BlockState; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/clock/CuckooClockRenderer.java b/src/main/java/com/simibubi/create/content/contraptions/components/clock/CuckooClockRenderer.java similarity index 94% rename from src/main/java/com/simibubi/create/modules/contraptions/components/clock/CuckooClockRenderer.java rename to src/main/java/com/simibubi/create/content/contraptions/components/clock/CuckooClockRenderer.java index fe588b73b..56902685f 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/clock/CuckooClockRenderer.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/clock/CuckooClockRenderer.java @@ -1,13 +1,13 @@ -package com.simibubi.create.modules.contraptions.components.clock; +package com.simibubi.create.content.contraptions.components.clock; import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.vertex.IVertexBuilder; import com.simibubi.create.AllBlockPartials; +import com.simibubi.create.content.contraptions.base.KineticTileEntity; +import com.simibubi.create.content.contraptions.base.KineticTileEntityRenderer; +import com.simibubi.create.content.contraptions.components.clock.CuckooClockTileEntity.Animation; import com.simibubi.create.foundation.utility.AngleHelper; import com.simibubi.create.foundation.utility.SuperByteBuffer; -import com.simibubi.create.modules.contraptions.base.KineticTileEntity; -import com.simibubi.create.modules.contraptions.base.KineticTileEntityRenderer; -import com.simibubi.create.modules.contraptions.components.clock.CuckooClockTileEntity.Animation; import net.minecraft.block.BlockState; import net.minecraft.client.renderer.IRenderTypeBuffer; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/clock/CuckooClockTileEntity.java b/src/main/java/com/simibubi/create/content/contraptions/components/clock/CuckooClockTileEntity.java similarity index 97% rename from src/main/java/com/simibubi/create/modules/contraptions/components/clock/CuckooClockTileEntity.java rename to src/main/java/com/simibubi/create/content/contraptions/components/clock/CuckooClockTileEntity.java index 620c40b0b..d3c83c4c9 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/clock/CuckooClockTileEntity.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/clock/CuckooClockTileEntity.java @@ -1,16 +1,16 @@ -package com.simibubi.create.modules.contraptions.components.clock; +package com.simibubi.create.content.contraptions.components.clock; import static com.simibubi.create.foundation.utility.AngleHelper.deg; import static com.simibubi.create.foundation.utility.AngleHelper.getShortestAngleDiff; import static com.simibubi.create.foundation.utility.AngleHelper.rad; import com.simibubi.create.AllTileEntities; +import com.simibubi.create.content.contraptions.base.KineticTileEntity; import com.simibubi.create.foundation.gui.widgets.InterpolatedChasingValue; import com.simibubi.create.foundation.gui.widgets.InterpolatedValue; import com.simibubi.create.foundation.utility.AnimationTickHolder; import com.simibubi.create.foundation.utility.NBTHelper; import com.simibubi.create.foundation.utility.VecHelper; -import com.simibubi.create.modules.contraptions.base.KineticTileEntity; import net.minecraft.nbt.CompoundNBT; import net.minecraft.particles.ParticleTypes; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/crafter/ConnectedInputHandler.java b/src/main/java/com/simibubi/create/content/contraptions/components/crafter/ConnectedInputHandler.java similarity index 98% rename from src/main/java/com/simibubi/create/modules/contraptions/components/crafter/ConnectedInputHandler.java rename to src/main/java/com/simibubi/create/content/contraptions/components/crafter/ConnectedInputHandler.java index 479fd8c9b..2923d1da6 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/crafter/ConnectedInputHandler.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/crafter/ConnectedInputHandler.java @@ -1,6 +1,6 @@ -package com.simibubi.create.modules.contraptions.components.crafter; +package com.simibubi.create.content.contraptions.components.crafter; -import static com.simibubi.create.modules.contraptions.base.HorizontalKineticBlock.HORIZONTAL_FACING; +import static com.simibubi.create.content.contraptions.base.HorizontalKineticBlock.HORIZONTAL_FACING; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/crafter/ConnectedInputRenderer.java b/src/main/java/com/simibubi/create/content/contraptions/components/crafter/ConnectedInputRenderer.java similarity index 97% rename from src/main/java/com/simibubi/create/modules/contraptions/components/crafter/ConnectedInputRenderer.java rename to src/main/java/com/simibubi/create/content/contraptions/components/crafter/ConnectedInputRenderer.java index aa48f5bf9..91eac5084 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/crafter/ConnectedInputRenderer.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/crafter/ConnectedInputRenderer.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.contraptions.components.crafter; +package com.simibubi.create.content.contraptions.components.crafter; import org.apache.commons.lang3.tuple.Pair; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/crafter/CrafterCTBehaviour.java b/src/main/java/com/simibubi/create/content/contraptions/components/crafter/CrafterCTBehaviour.java similarity index 91% rename from src/main/java/com/simibubi/create/modules/contraptions/components/crafter/CrafterCTBehaviour.java rename to src/main/java/com/simibubi/create/content/contraptions/components/crafter/CrafterCTBehaviour.java index 5b73a641d..7ff7153ae 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/crafter/CrafterCTBehaviour.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/crafter/CrafterCTBehaviour.java @@ -1,11 +1,11 @@ -package com.simibubi.create.modules.contraptions.components.crafter; +package com.simibubi.create.content.contraptions.components.crafter; -import static com.simibubi.create.modules.contraptions.base.HorizontalKineticBlock.HORIZONTAL_FACING; +import static com.simibubi.create.content.contraptions.base.HorizontalKineticBlock.HORIZONTAL_FACING; import com.simibubi.create.AllSpriteShifts; +import com.simibubi.create.content.contraptions.components.crafter.ConnectedInputHandler.ConnectedInput; import com.simibubi.create.foundation.block.connected.CTSpriteShiftEntry; import com.simibubi.create.foundation.block.connected.ConnectedTextureBehaviour; -import com.simibubi.create.modules.contraptions.components.crafter.ConnectedInputHandler.ConnectedInput; import net.minecraft.block.BlockState; import net.minecraft.util.Direction; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/crafter/CrafterHelper.java b/src/main/java/com/simibubi/create/content/contraptions/components/crafter/CrafterHelper.java similarity index 90% rename from src/main/java/com/simibubi/create/modules/contraptions/components/crafter/CrafterHelper.java rename to src/main/java/com/simibubi/create/content/contraptions/components/crafter/CrafterHelper.java index c02028027..6d9fd80e9 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/crafter/CrafterHelper.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/crafter/CrafterHelper.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.contraptions.components.crafter; +package com.simibubi.create.content.contraptions.components.crafter; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/crafter/MechanicalCrafterBlock.java b/src/main/java/com/simibubi/create/content/contraptions/components/crafter/MechanicalCrafterBlock.java similarity index 97% rename from src/main/java/com/simibubi/create/modules/contraptions/components/crafter/MechanicalCrafterBlock.java rename to src/main/java/com/simibubi/create/content/contraptions/components/crafter/MechanicalCrafterBlock.java index 283dff755..20cb17feb 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/crafter/MechanicalCrafterBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/crafter/MechanicalCrafterBlock.java @@ -1,14 +1,14 @@ -package com.simibubi.create.modules.contraptions.components.crafter; +package com.simibubi.create.content.contraptions.components.crafter; import com.simibubi.create.AllBlocks; import com.simibubi.create.AllItems; +import com.simibubi.create.content.contraptions.base.HorizontalKineticBlock; +import com.simibubi.create.content.contraptions.components.crafter.ConnectedInputHandler.ConnectedInput; +import com.simibubi.create.content.contraptions.components.crafter.MechanicalCrafterTileEntity.Phase; import com.simibubi.create.foundation.block.ITE; import com.simibubi.create.foundation.utility.AngleHelper; import com.simibubi.create.foundation.utility.Lang; import com.simibubi.create.foundation.utility.VecHelper; -import com.simibubi.create.modules.contraptions.base.HorizontalKineticBlock; -import com.simibubi.create.modules.contraptions.components.crafter.ConnectedInputHandler.ConnectedInput; -import com.simibubi.create.modules.contraptions.components.crafter.MechanicalCrafterTileEntity.Phase; import net.minecraft.block.Block; import net.minecraft.block.BlockState; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/crafter/MechanicalCrafterTileEntity.java b/src/main/java/com/simibubi/create/content/contraptions/components/crafter/MechanicalCrafterTileEntity.java similarity index 94% rename from src/main/java/com/simibubi/create/modules/contraptions/components/crafter/MechanicalCrafterTileEntity.java rename to src/main/java/com/simibubi/create/content/contraptions/components/crafter/MechanicalCrafterTileEntity.java index d59ed6ab5..3692ca43e 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/crafter/MechanicalCrafterTileEntity.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/crafter/MechanicalCrafterTileEntity.java @@ -1,6 +1,6 @@ -package com.simibubi.create.modules.contraptions.components.crafter; +package com.simibubi.create.content.contraptions.components.crafter; -import static com.simibubi.create.modules.contraptions.base.HorizontalKineticBlock.HORIZONTAL_FACING; +import static com.simibubi.create.content.contraptions.base.HorizontalKineticBlock.HORIZONTAL_FACING; import java.util.ArrayList; import java.util.LinkedList; @@ -10,15 +10,15 @@ import org.apache.commons.lang3.tuple.Pair; import com.simibubi.create.AllBlocks; import com.simibubi.create.AllTileEntities; -import com.simibubi.create.foundation.behaviour.base.TileEntityBehaviour; -import com.simibubi.create.foundation.behaviour.inventory.InsertingBehaviour; -import com.simibubi.create.foundation.behaviour.inventory.InventoryManagementBehaviour.Attachments; +import com.simibubi.create.content.contraptions.base.KineticTileEntity; +import com.simibubi.create.content.contraptions.components.crafter.ConnectedInputHandler.ConnectedInput; +import com.simibubi.create.content.contraptions.components.crafter.MechanicalCrafterBlock.Pointing; +import com.simibubi.create.content.contraptions.components.crafter.RecipeGridHandler.GroupedItems; +import com.simibubi.create.content.contraptions.relays.belt.BeltTileEntity; +import com.simibubi.create.foundation.tileEntity.TileEntityBehaviour; +import com.simibubi.create.foundation.tileEntity.behaviour.inventory.InsertingBehaviour; +import com.simibubi.create.foundation.tileEntity.behaviour.inventory.InventoryManagementBehaviour.Attachments; import com.simibubi.create.foundation.utility.VecHelper; -import com.simibubi.create.modules.contraptions.base.KineticTileEntity; -import com.simibubi.create.modules.contraptions.components.crafter.ConnectedInputHandler.ConnectedInput; -import com.simibubi.create.modules.contraptions.components.crafter.MechanicalCrafterBlock.Pointing; -import com.simibubi.create.modules.contraptions.components.crafter.RecipeGridHandler.GroupedItems; -import com.simibubi.create.modules.contraptions.relays.belt.BeltTileEntity; import net.minecraft.block.BlockState; import net.minecraft.entity.item.ItemEntity; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/crafter/MechanicalCrafterTileEntityRenderer.java b/src/main/java/com/simibubi/create/content/contraptions/components/crafter/MechanicalCrafterTileEntityRenderer.java similarity index 95% rename from src/main/java/com/simibubi/create/modules/contraptions/components/crafter/MechanicalCrafterTileEntityRenderer.java rename to src/main/java/com/simibubi/create/content/contraptions/components/crafter/MechanicalCrafterTileEntityRenderer.java index cfba443d2..be5628d84 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/crafter/MechanicalCrafterTileEntityRenderer.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/crafter/MechanicalCrafterTileEntityRenderer.java @@ -1,19 +1,19 @@ -package com.simibubi.create.modules.contraptions.components.crafter; +package com.simibubi.create.content.contraptions.components.crafter; -import static com.simibubi.create.modules.contraptions.base.HorizontalKineticBlock.HORIZONTAL_FACING; -import static com.simibubi.create.modules.contraptions.base.KineticTileEntityRenderer.standardKineticRotationTransform; +import static com.simibubi.create.content.contraptions.base.HorizontalKineticBlock.HORIZONTAL_FACING; +import static com.simibubi.create.content.contraptions.base.KineticTileEntityRenderer.standardKineticRotationTransform; import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.vertex.IVertexBuilder; import com.simibubi.create.AllBlockPartials; import com.simibubi.create.AllSpriteShifts; -import com.simibubi.create.foundation.block.SafeTileEntityRenderer; +import com.simibubi.create.content.contraptions.components.crafter.MechanicalCrafterTileEntity.Phase; +import com.simibubi.create.content.contraptions.components.crafter.RecipeGridHandler.GroupedItems; +import com.simibubi.create.foundation.tileEntity.renderer.SafeTileEntityRenderer; import com.simibubi.create.foundation.utility.AngleHelper; import com.simibubi.create.foundation.utility.AnimationTickHolder; import com.simibubi.create.foundation.utility.SuperByteBuffer; import com.simibubi.create.foundation.utility.TessellatorHelper; -import com.simibubi.create.modules.contraptions.components.crafter.MechanicalCrafterTileEntity.Phase; -import com.simibubi.create.modules.contraptions.components.crafter.RecipeGridHandler.GroupedItems; import net.minecraft.block.BlockState; import net.minecraft.client.Minecraft; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/crafter/MechanicalCraftingInventory.java b/src/main/java/com/simibubi/create/content/contraptions/components/crafter/MechanicalCraftingInventory.java similarity index 87% rename from src/main/java/com/simibubi/create/modules/contraptions/components/crafter/MechanicalCraftingInventory.java rename to src/main/java/com/simibubi/create/content/contraptions/components/crafter/MechanicalCraftingInventory.java index 6c2d13b28..600cb4996 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/crafter/MechanicalCraftingInventory.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/crafter/MechanicalCraftingInventory.java @@ -1,8 +1,8 @@ -package com.simibubi.create.modules.contraptions.components.crafter; +package com.simibubi.create.content.contraptions.components.crafter; import org.apache.commons.lang3.tuple.Pair; -import com.simibubi.create.modules.contraptions.components.crafter.RecipeGridHandler.GroupedItems; +import com.simibubi.create.content.contraptions.components.crafter.RecipeGridHandler.GroupedItems; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.CraftingInventory; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/crafter/MechanicalCraftingRecipe.java b/src/main/java/com/simibubi/create/content/contraptions/components/crafter/MechanicalCraftingRecipe.java similarity index 88% rename from src/main/java/com/simibubi/create/modules/contraptions/components/crafter/MechanicalCraftingRecipe.java rename to src/main/java/com/simibubi/create/content/contraptions/components/crafter/MechanicalCraftingRecipe.java index 9048eed88..56e037b84 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/crafter/MechanicalCraftingRecipe.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/crafter/MechanicalCraftingRecipe.java @@ -1,7 +1,7 @@ -package com.simibubi.create.modules.contraptions.components.crafter; +package com.simibubi.create.content.contraptions.components.crafter; import com.google.gson.JsonObject; -import com.simibubi.create.AllRecipes; +import com.simibubi.create.AllRecipeTypes; import net.minecraft.inventory.CraftingInventory; import net.minecraft.item.ItemStack; @@ -33,12 +33,12 @@ public class MechanicalCraftingRecipe extends ShapedRecipe { @Override public IRecipeType getType() { - return AllRecipes.MECHANICAL_CRAFTING.type; + return AllRecipeTypes.MECHANICAL_CRAFTING.type; } @Override public IRecipeSerializer getSerializer() { - return AllRecipes.MECHANICAL_CRAFTING.serializer; + return AllRecipeTypes.MECHANICAL_CRAFTING.serializer; } public static class Serializer extends ShapedRecipe.Serializer { diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/crafter/RecipeGridHandler.java b/src/main/java/com/simibubi/create/content/contraptions/components/crafter/RecipeGridHandler.java similarity index 95% rename from src/main/java/com/simibubi/create/modules/contraptions/components/crafter/RecipeGridHandler.java rename to src/main/java/com/simibubi/create/content/contraptions/components/crafter/RecipeGridHandler.java index b69136a39..830086716 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/crafter/RecipeGridHandler.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/crafter/RecipeGridHandler.java @@ -1,6 +1,6 @@ -package com.simibubi.create.modules.contraptions.components.crafter; +package com.simibubi.create.content.contraptions.components.crafter; -import static com.simibubi.create.modules.contraptions.base.HorizontalKineticBlock.HORIZONTAL_FACING; +import static com.simibubi.create.content.contraptions.base.HorizontalKineticBlock.HORIZONTAL_FACING; import java.util.ArrayList; import java.util.HashMap; @@ -14,8 +14,8 @@ import org.apache.commons.lang3.tuple.Pair; import com.google.common.base.Predicates; import com.simibubi.create.AllBlocks; -import com.simibubi.create.AllRecipes; -import com.simibubi.create.modules.contraptions.components.crafter.MechanicalCrafterBlock.Pointing; +import com.simibubi.create.AllRecipeTypes; +import com.simibubi.create.content.contraptions.components.crafter.MechanicalCrafterBlock.Pointing; import net.minecraft.block.BlockState; import net.minecraft.inventory.CraftingInventory; @@ -128,7 +128,7 @@ public class RecipeGridHandler { .orElse(null); if (result == null) result = world.getRecipeManager() - .getRecipe(AllRecipes.MECHANICAL_CRAFTING.getType(), craftinginventory, world) + .getRecipe(AllRecipeTypes.MECHANICAL_CRAFTING.getType(), craftinginventory, world) .map(r -> r.getCraftingResult(craftinginventory)) .orElse(null); diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/crank/HandCrankBlock.java b/src/main/java/com/simibubi/create/content/contraptions/components/crank/HandCrankBlock.java similarity index 94% rename from src/main/java/com/simibubi/create/modules/contraptions/components/crank/HandCrankBlock.java rename to src/main/java/com/simibubi/create/content/contraptions/components/crank/HandCrankBlock.java index c917d6f07..664d6d9e0 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/crank/HandCrankBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/crank/HandCrankBlock.java @@ -1,8 +1,8 @@ -package com.simibubi.create.modules.contraptions.components.crank; +package com.simibubi.create.content.contraptions.components.crank; +import com.simibubi.create.AllShapes; +import com.simibubi.create.content.contraptions.base.DirectionalKineticBlock; import com.simibubi.create.foundation.block.ITE; -import com.simibubi.create.foundation.utility.AllShapes; -import com.simibubi.create.modules.contraptions.base.DirectionalKineticBlock; import net.minecraft.block.Block; import net.minecraft.block.BlockRenderType; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/crank/HandCrankTileEntity.java b/src/main/java/com/simibubi/create/content/contraptions/components/crank/HandCrankTileEntity.java similarity index 90% rename from src/main/java/com/simibubi/create/modules/contraptions/components/crank/HandCrankTileEntity.java rename to src/main/java/com/simibubi/create/content/contraptions/components/crank/HandCrankTileEntity.java index 2ab8f98f4..e4f27f890 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/crank/HandCrankTileEntity.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/crank/HandCrankTileEntity.java @@ -1,7 +1,7 @@ -package com.simibubi.create.modules.contraptions.components.crank; +package com.simibubi.create.content.contraptions.components.crank; import com.simibubi.create.AllTileEntities; -import com.simibubi.create.modules.contraptions.base.GeneratingKineticTileEntity; +import com.simibubi.create.content.contraptions.base.GeneratingKineticTileEntity; import net.minecraft.nbt.CompoundNBT; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/crank/HandCrankTileEntityRenderer.java b/src/main/java/com/simibubi/create/content/contraptions/components/crank/HandCrankTileEntityRenderer.java similarity index 87% rename from src/main/java/com/simibubi/create/modules/contraptions/components/crank/HandCrankTileEntityRenderer.java rename to src/main/java/com/simibubi/create/content/contraptions/components/crank/HandCrankTileEntityRenderer.java index ad4238b39..09f2a18a8 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/crank/HandCrankTileEntityRenderer.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/crank/HandCrankTileEntityRenderer.java @@ -1,12 +1,12 @@ -package com.simibubi.create.modules.contraptions.components.crank; +package com.simibubi.create.content.contraptions.components.crank; import static net.minecraft.state.properties.BlockStateProperties.FACING; import com.mojang.blaze3d.matrix.MatrixStack; import com.simibubi.create.AllBlockPartials; +import com.simibubi.create.content.contraptions.base.KineticTileEntity; +import com.simibubi.create.content.contraptions.base.KineticTileEntityRenderer; import com.simibubi.create.foundation.utility.SuperByteBuffer; -import com.simibubi.create.modules.contraptions.base.KineticTileEntity; -import com.simibubi.create.modules.contraptions.base.KineticTileEntityRenderer; import net.minecraft.block.BlockState; import net.minecraft.client.renderer.IRenderTypeBuffer; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/crusher/AbstractCrushingRecipe.java b/src/main/java/com/simibubi/create/content/contraptions/components/crusher/AbstractCrushingRecipe.java similarity index 53% rename from src/main/java/com/simibubi/create/modules/contraptions/components/crusher/AbstractCrushingRecipe.java rename to src/main/java/com/simibubi/create/content/contraptions/components/crusher/AbstractCrushingRecipe.java index a3bc18aa2..2ee5d5f1d 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/crusher/AbstractCrushingRecipe.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/crusher/AbstractCrushingRecipe.java @@ -1,18 +1,18 @@ -package com.simibubi.create.modules.contraptions.components.crusher; +package com.simibubi.create.content.contraptions.components.crusher; import java.util.List; -import com.simibubi.create.AllRecipes; -import com.simibubi.create.modules.contraptions.processing.ProcessingIngredient; -import com.simibubi.create.modules.contraptions.processing.ProcessingOutput; -import com.simibubi.create.modules.contraptions.processing.ProcessingRecipe; +import com.simibubi.create.AllRecipeTypes; +import com.simibubi.create.content.contraptions.processing.ProcessingIngredient; +import com.simibubi.create.content.contraptions.processing.ProcessingOutput; +import com.simibubi.create.content.contraptions.processing.ProcessingRecipe; import net.minecraft.util.ResourceLocation; import net.minecraftforge.items.wrapper.RecipeWrapper; public abstract class AbstractCrushingRecipe extends ProcessingRecipe { - public AbstractCrushingRecipe(AllRecipes recipeType, ResourceLocation id, String group, + public AbstractCrushingRecipe(AllRecipeTypes recipeType, ResourceLocation id, String group, List ingredients, List results, int processingDuration) { super(recipeType, id, group, ingredients, results, processingDuration); } diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/crusher/CrushingRecipe.java b/src/main/java/com/simibubi/create/content/contraptions/components/crusher/CrushingRecipe.java similarity index 67% rename from src/main/java/com/simibubi/create/modules/contraptions/components/crusher/CrushingRecipe.java rename to src/main/java/com/simibubi/create/content/contraptions/components/crusher/CrushingRecipe.java index 159056b95..9f77db133 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/crusher/CrushingRecipe.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/crusher/CrushingRecipe.java @@ -1,10 +1,10 @@ -package com.simibubi.create.modules.contraptions.components.crusher; +package com.simibubi.create.content.contraptions.components.crusher; import java.util.List; -import com.simibubi.create.AllRecipes; -import com.simibubi.create.modules.contraptions.processing.ProcessingIngredient; -import com.simibubi.create.modules.contraptions.processing.ProcessingOutput; +import com.simibubi.create.AllRecipeTypes; +import com.simibubi.create.content.contraptions.processing.ProcessingIngredient; +import com.simibubi.create.content.contraptions.processing.ProcessingOutput; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; @@ -14,7 +14,7 @@ public class CrushingRecipe extends AbstractCrushingRecipe { public CrushingRecipe(ResourceLocation id, String group, List ingredients, List results, int processingDuration) { - super(AllRecipes.CRUSHING, id, group, ingredients, results, processingDuration); + super(AllRecipeTypes.CRUSHING, id, group, ingredients, results, processingDuration); } @Override diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/crusher/CrushingWheelBlock.java b/src/main/java/com/simibubi/create/content/contraptions/components/crusher/CrushingWheelBlock.java similarity index 95% rename from src/main/java/com/simibubi/create/modules/contraptions/components/crusher/CrushingWheelBlock.java rename to src/main/java/com/simibubi/create/content/contraptions/components/crusher/CrushingWheelBlock.java index 243ed744e..e6c275ff4 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/crusher/CrushingWheelBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/crusher/CrushingWheelBlock.java @@ -1,11 +1,11 @@ -package com.simibubi.create.modules.contraptions.components.crusher; +package com.simibubi.create.content.contraptions.components.crusher; -import static com.simibubi.create.modules.contraptions.components.crusher.CrushingWheelControllerBlock.VALID; +import static com.simibubi.create.content.contraptions.components.crusher.CrushingWheelControllerBlock.VALID; import com.simibubi.create.AllBlocks; +import com.simibubi.create.AllShapes; +import com.simibubi.create.content.contraptions.base.RotatedPillarKineticBlock; import com.simibubi.create.foundation.block.ITE; -import com.simibubi.create.foundation.utility.AllShapes; -import com.simibubi.create.modules.contraptions.base.RotatedPillarKineticBlock; import net.minecraft.block.BlockRenderType; import net.minecraft.block.BlockState; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/crusher/CrushingWheelControllerBlock.java b/src/main/java/com/simibubi/create/content/contraptions/components/crusher/CrushingWheelControllerBlock.java similarity index 97% rename from src/main/java/com/simibubi/create/modules/contraptions/components/crusher/CrushingWheelControllerBlock.java rename to src/main/java/com/simibubi/create/content/contraptions/components/crusher/CrushingWheelControllerBlock.java index 1863a97f7..ac28b87a5 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/crusher/CrushingWheelControllerBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/crusher/CrushingWheelControllerBlock.java @@ -1,11 +1,11 @@ -package com.simibubi.create.modules.contraptions.components.crusher; +package com.simibubi.create.content.contraptions.components.crusher; import java.util.Random; import com.simibubi.create.AllBlocks; +import com.simibubi.create.content.contraptions.base.KineticTileEntity; import com.simibubi.create.foundation.block.ITE; import com.simibubi.create.foundation.item.ItemHelper; -import com.simibubi.create.modules.contraptions.base.KineticTileEntity; import net.minecraft.block.Block; import net.minecraft.block.BlockState; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/crusher/CrushingWheelControllerTileEntity.java b/src/main/java/com/simibubi/create/content/contraptions/components/crusher/CrushingWheelControllerTileEntity.java similarity index 94% rename from src/main/java/com/simibubi/create/modules/contraptions/components/crusher/CrushingWheelControllerTileEntity.java rename to src/main/java/com/simibubi/create/content/contraptions/components/crusher/CrushingWheelControllerTileEntity.java index 394882555..9b00a7f98 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/crusher/CrushingWheelControllerTileEntity.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/crusher/CrushingWheelControllerTileEntity.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.contraptions.components.crusher; +package com.simibubi.create.content.contraptions.components.crusher; import java.util.ArrayList; import java.util.List; @@ -6,14 +6,14 @@ import java.util.Optional; import java.util.Random; import java.util.UUID; -import com.simibubi.create.AllRecipes; +import com.simibubi.create.AllRecipeTypes; import com.simibubi.create.AllTileEntities; -import com.simibubi.create.config.AllConfigs; -import com.simibubi.create.foundation.block.SyncedTileEntity; +import com.simibubi.create.content.contraptions.processing.ProcessingInventory; +import com.simibubi.create.content.contraptions.processing.ProcessingRecipe; +import com.simibubi.create.foundation.config.AllConfigs; import com.simibubi.create.foundation.item.ItemHelper; +import com.simibubi.create.foundation.tileEntity.SyncedTileEntity; import com.simibubi.create.foundation.utility.VecHelper; -import com.simibubi.create.modules.contraptions.processing.ProcessingInventory; -import com.simibubi.create.modules.contraptions.processing.ProcessingRecipe; import net.minecraft.entity.Entity; import net.minecraft.entity.item.ItemEntity; @@ -196,9 +196,9 @@ public class CrushingWheelControllerTileEntity extends SyncedTileEntity implemen public Optional> findRecipe() { Optional> crushingRecipe = - world.getRecipeManager().getRecipe(AllRecipes.CRUSHING.getType(), wrapper, world); + world.getRecipeManager().getRecipe(AllRecipeTypes.CRUSHING.getType(), wrapper, world); if (!crushingRecipe.isPresent()) - crushingRecipe = world.getRecipeManager().getRecipe(AllRecipes.MILLING.getType(), wrapper, world); + crushingRecipe = world.getRecipeManager().getRecipe(AllRecipeTypes.MILLING.getType(), wrapper, world); return crushingRecipe; } diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/crusher/CrushingWheelTileEntity.java b/src/main/java/com/simibubi/create/content/contraptions/components/crusher/CrushingWheelTileEntity.java similarity index 92% rename from src/main/java/com/simibubi/create/modules/contraptions/components/crusher/CrushingWheelTileEntity.java rename to src/main/java/com/simibubi/create/content/contraptions/components/crusher/CrushingWheelTileEntity.java index dee0b5d97..4c8b563f8 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/crusher/CrushingWheelTileEntity.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/crusher/CrushingWheelTileEntity.java @@ -1,7 +1,7 @@ -package com.simibubi.create.modules.contraptions.components.crusher; +package com.simibubi.create.content.contraptions.components.crusher; import com.simibubi.create.AllTileEntities; -import com.simibubi.create.modules.contraptions.base.KineticTileEntity; +import com.simibubi.create.content.contraptions.base.KineticTileEntity; import net.minecraft.util.DamageSource; import net.minecraft.util.Direction; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/deployer/DeployerBlock.java b/src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerBlock.java similarity index 86% rename from src/main/java/com/simibubi/create/modules/contraptions/components/deployer/DeployerBlock.java rename to src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerBlock.java index 94078ab73..2587d5391 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/deployer/DeployerBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerBlock.java @@ -1,13 +1,13 @@ -package com.simibubi.create.modules.contraptions.components.deployer; +package com.simibubi.create.content.contraptions.components.deployer; import com.simibubi.create.AllItems; -import com.simibubi.create.foundation.behaviour.base.TileEntityBehaviour; -import com.simibubi.create.foundation.behaviour.filtering.FilteringBehaviour; +import com.simibubi.create.AllShapes; +import com.simibubi.create.content.contraptions.base.DirectionalAxisKineticBlock; +import com.simibubi.create.content.contraptions.components.structureMovement.IPortableBlock; +import com.simibubi.create.content.contraptions.components.structureMovement.MovementBehaviour; import com.simibubi.create.foundation.block.ITE; -import com.simibubi.create.foundation.utility.AllShapes; -import com.simibubi.create.modules.contraptions.base.DirectionalAxisKineticBlock; -import com.simibubi.create.modules.contraptions.components.contraptions.IPortableBlock; -import com.simibubi.create.modules.contraptions.components.contraptions.MovementBehaviour; +import com.simibubi.create.foundation.tileEntity.TileEntityBehaviour; +import com.simibubi.create.foundation.tileEntity.behaviour.filtering.FilteringBehaviour; import net.minecraft.block.BlockState; import net.minecraft.block.material.PushReaction; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/deployer/DeployerFakePlayer.java b/src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerFakePlayer.java similarity index 96% rename from src/main/java/com/simibubi/create/modules/contraptions/components/deployer/DeployerFakePlayer.java rename to src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerFakePlayer.java index 318f20bb6..677b05ce3 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/deployer/DeployerFakePlayer.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerFakePlayer.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.contraptions.components.deployer; +package com.simibubi.create.content.contraptions.components.deployer; import java.util.OptionalInt; import java.util.UUID; @@ -6,8 +6,8 @@ import java.util.UUID; import org.apache.commons.lang3.tuple.Pair; import com.mojang.authlib.GameProfile; -import com.simibubi.create.config.AllConfigs; -import com.simibubi.create.config.CKinetics; +import com.simibubi.create.foundation.config.AllConfigs; +import com.simibubi.create.foundation.config.CKinetics; import com.simibubi.create.foundation.utility.Lang; import io.netty.util.concurrent.Future; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/deployer/DeployerFilterSlot.java b/src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerFilterSlot.java similarity index 89% rename from src/main/java/com/simibubi/create/modules/contraptions/components/deployer/DeployerFilterSlot.java rename to src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerFilterSlot.java index 65e113dfc..f70fc3bfc 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/deployer/DeployerFilterSlot.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerFilterSlot.java @@ -1,7 +1,7 @@ -package com.simibubi.create.modules.contraptions.components.deployer; +package com.simibubi.create.content.contraptions.components.deployer; import com.mojang.blaze3d.matrix.MatrixStack; -import com.simibubi.create.foundation.behaviour.ValueBoxTransform; +import com.simibubi.create.foundation.tileEntity.behaviour.ValueBoxTransform; import com.simibubi.create.foundation.utility.AngleHelper; import com.simibubi.create.foundation.utility.VecHelper; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/deployer/DeployerHandler.java b/src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerHandler.java similarity index 97% rename from src/main/java/com/simibubi/create/modules/contraptions/components/deployer/DeployerHandler.java rename to src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerHandler.java index 2a660555a..cd80bce22 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/deployer/DeployerHandler.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerHandler.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.contraptions.components.deployer; +package com.simibubi.create.content.contraptions.components.deployer; import static net.minecraftforge.eventbus.api.Event.Result.DEFAULT; import static net.minecraftforge.eventbus.api.Event.Result.DENY; @@ -9,9 +9,9 @@ import java.util.List; import org.apache.commons.lang3.tuple.Pair; import com.google.common.collect.Multimap; -import com.simibubi.create.foundation.utility.WrappedWorld; -import com.simibubi.create.modules.contraptions.components.deployer.DeployerTileEntity.Mode; -import com.simibubi.create.modules.curiosities.tools.SandPaperItem; +import com.simibubi.create.content.contraptions.components.deployer.DeployerTileEntity.Mode; +import com.simibubi.create.content.curiosities.tools.SandPaperItem; +import com.simibubi.create.foundation.utility.worldWrappers.WrappedWorld; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/deployer/DeployerItemHandler.java b/src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerItemHandler.java similarity index 91% rename from src/main/java/com/simibubi/create/modules/contraptions/components/deployer/DeployerItemHandler.java rename to src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerItemHandler.java index cd507742b..aaf093fa1 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/deployer/DeployerItemHandler.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerItemHandler.java @@ -1,7 +1,7 @@ -package com.simibubi.create.modules.contraptions.components.deployer; +package com.simibubi.create.content.contraptions.components.deployer; -import com.simibubi.create.foundation.behaviour.base.TileEntityBehaviour; -import com.simibubi.create.foundation.behaviour.filtering.FilteringBehaviour; +import com.simibubi.create.foundation.tileEntity.TileEntityBehaviour; +import com.simibubi.create.foundation.tileEntity.behaviour.filtering.FilteringBehaviour; import net.minecraft.item.ItemStack; import net.minecraft.util.Hand; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/deployer/DeployerMovementBehaviour.java b/src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerMovementBehaviour.java similarity index 91% rename from src/main/java/com/simibubi/create/modules/contraptions/components/deployer/DeployerMovementBehaviour.java rename to src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerMovementBehaviour.java index 91485ee75..ae886516a 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/deployer/DeployerMovementBehaviour.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerMovementBehaviour.java @@ -1,19 +1,19 @@ -package com.simibubi.create.modules.contraptions.components.deployer; +package com.simibubi.create.content.contraptions.components.deployer; import java.util.Arrays; import java.util.List; import org.apache.commons.lang3.tuple.Pair; +import com.simibubi.create.content.contraptions.components.deployer.DeployerTileEntity.Mode; +import com.simibubi.create.content.contraptions.components.structureMovement.ContraptionEntity; +import com.simibubi.create.content.contraptions.components.structureMovement.MovementBehaviour; +import com.simibubi.create.content.contraptions.components.structureMovement.MovementContext; +import com.simibubi.create.content.logistics.item.filter.FilterItem; import com.simibubi.create.foundation.item.ItemHelper; import com.simibubi.create.foundation.utility.NBTHelper; import com.simibubi.create.foundation.utility.SuperByteBuffer; import com.simibubi.create.foundation.utility.VecHelper; -import com.simibubi.create.modules.contraptions.components.contraptions.ContraptionEntity; -import com.simibubi.create.modules.contraptions.components.contraptions.MovementBehaviour; -import com.simibubi.create.modules.contraptions.components.contraptions.MovementContext; -import com.simibubi.create.modules.contraptions.components.deployer.DeployerTileEntity.Mode; -import com.simibubi.create.modules.logistics.item.filter.FilterItem; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/deployer/DeployerTileEntity.java b/src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerTileEntity.java similarity index 96% rename from src/main/java/com/simibubi/create/modules/contraptions/components/deployer/DeployerTileEntity.java rename to src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerTileEntity.java index 2a52c822e..7fd1c367e 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/deployer/DeployerTileEntity.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerTileEntity.java @@ -1,6 +1,6 @@ -package com.simibubi.create.modules.contraptions.components.deployer; +package com.simibubi.create.content.contraptions.components.deployer; -import static com.simibubi.create.modules.contraptions.base.DirectionalKineticBlock.FACING; +import static com.simibubi.create.content.contraptions.base.DirectionalKineticBlock.FACING; import java.util.ArrayList; import java.util.Arrays; @@ -13,15 +13,15 @@ import org.apache.commons.lang3.tuple.Pair; import com.simibubi.create.AllBlockPartials; import com.simibubi.create.AllBlocks; import com.simibubi.create.AllTileEntities; +import com.simibubi.create.content.contraptions.base.KineticTileEntity; +import com.simibubi.create.content.curiosities.tools.SandPaperItem; import com.simibubi.create.foundation.advancement.AllTriggers; -import com.simibubi.create.foundation.behaviour.base.TileEntityBehaviour; -import com.simibubi.create.foundation.behaviour.filtering.FilteringBehaviour; -import com.simibubi.create.foundation.behaviour.inventory.ExtractingBehaviour; import com.simibubi.create.foundation.item.ItemHelper; +import com.simibubi.create.foundation.tileEntity.TileEntityBehaviour; +import com.simibubi.create.foundation.tileEntity.behaviour.filtering.FilteringBehaviour; +import com.simibubi.create.foundation.tileEntity.behaviour.inventory.ExtractingBehaviour; import com.simibubi.create.foundation.utility.NBTHelper; import com.simibubi.create.foundation.utility.VecHelper; -import com.simibubi.create.modules.contraptions.base.KineticTileEntity; -import com.simibubi.create.modules.curiosities.tools.SandPaperItem; import net.minecraft.entity.item.ItemEntity; import net.minecraft.entity.player.PlayerInventory; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/deployer/DeployerTileEntityRenderer.java b/src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerTileEntityRenderer.java similarity index 91% rename from src/main/java/com/simibubi/create/modules/contraptions/components/deployer/DeployerTileEntityRenderer.java rename to src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerTileEntityRenderer.java index 482804c22..e06fc0608 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/deployer/DeployerTileEntityRenderer.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerTileEntityRenderer.java @@ -1,7 +1,7 @@ -package com.simibubi.create.modules.contraptions.components.deployer; +package com.simibubi.create.content.contraptions.components.deployer; -import static com.simibubi.create.modules.contraptions.base.DirectionalAxisKineticBlock.AXIS_ALONG_FIRST_COORDINATE; -import static com.simibubi.create.modules.contraptions.base.DirectionalKineticBlock.FACING; +import static com.simibubi.create.content.contraptions.base.DirectionalAxisKineticBlock.AXIS_ALONG_FIRST_COORDINATE; +import static com.simibubi.create.content.contraptions.base.DirectionalKineticBlock.FACING; import java.util.Arrays; import java.util.List; @@ -9,18 +9,18 @@ import java.util.List; import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.vertex.IVertexBuilder; import com.simibubi.create.AllBlockPartials; -import com.simibubi.create.foundation.behaviour.filtering.FilteringRenderer; -import com.simibubi.create.foundation.block.SafeTileEntityRenderer; +import com.simibubi.create.content.contraptions.base.KineticTileEntity; +import com.simibubi.create.content.contraptions.base.KineticTileEntityRenderer; +import com.simibubi.create.content.contraptions.components.deployer.DeployerTileEntity.Mode; +import com.simibubi.create.content.contraptions.components.deployer.DeployerTileEntity.State; +import com.simibubi.create.content.contraptions.components.structureMovement.MovementContext; +import com.simibubi.create.foundation.tileEntity.behaviour.filtering.FilteringRenderer; +import com.simibubi.create.foundation.tileEntity.renderer.SafeTileEntityRenderer; import com.simibubi.create.foundation.utility.AngleHelper; import com.simibubi.create.foundation.utility.AnimationTickHolder; import com.simibubi.create.foundation.utility.NBTHelper; import com.simibubi.create.foundation.utility.SuperByteBuffer; import com.simibubi.create.foundation.utility.VecHelper; -import com.simibubi.create.modules.contraptions.base.KineticTileEntity; -import com.simibubi.create.modules.contraptions.base.KineticTileEntityRenderer; -import com.simibubi.create.modules.contraptions.components.contraptions.MovementContext; -import com.simibubi.create.modules.contraptions.components.deployer.DeployerTileEntity.Mode; -import com.simibubi.create.modules.contraptions.components.deployer.DeployerTileEntity.State; import net.minecraft.block.BlockState; import net.minecraft.client.Minecraft; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/fan/AirCurrent.java b/src/main/java/com/simibubi/create/content/contraptions/components/fan/AirCurrent.java similarity index 96% rename from src/main/java/com/simibubi/create/modules/contraptions/components/fan/AirCurrent.java rename to src/main/java/com/simibubi/create/content/contraptions/components/fan/AirCurrent.java index 982b5740f..4d159e624 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/fan/AirCurrent.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/fan/AirCurrent.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.contraptions.components.fan; +package com.simibubi.create.content.contraptions.components.fan; import java.util.ArrayList; import java.util.Iterator; @@ -6,13 +6,13 @@ import java.util.List; import org.apache.commons.lang3.tuple.Pair; -import com.simibubi.create.config.AllConfigs; +import com.simibubi.create.content.contraptions.particle.AirFlowParticleData; +import com.simibubi.create.content.contraptions.relays.belt.BeltHelper; +import com.simibubi.create.content.contraptions.relays.belt.BeltTileEntity; +import com.simibubi.create.content.logistics.InWorldProcessing; +import com.simibubi.create.content.logistics.InWorldProcessing.Type; +import com.simibubi.create.foundation.config.AllConfigs; import com.simibubi.create.foundation.utility.VecHelper; -import com.simibubi.create.modules.contraptions.particle.AirFlowParticleData; -import com.simibubi.create.modules.contraptions.relays.belt.BeltHelper; -import com.simibubi.create.modules.contraptions.relays.belt.BeltTileEntity; -import com.simibubi.create.modules.logistics.InWorldProcessing; -import com.simibubi.create.modules.logistics.InWorldProcessing.Type; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/fan/EncasedFanBlock.java b/src/main/java/com/simibubi/create/content/contraptions/components/fan/EncasedFanBlock.java similarity index 93% rename from src/main/java/com/simibubi/create/modules/contraptions/components/fan/EncasedFanBlock.java rename to src/main/java/com/simibubi/create/content/contraptions/components/fan/EncasedFanBlock.java index c70a067da..d13bf43f1 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/fan/EncasedFanBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/fan/EncasedFanBlock.java @@ -1,8 +1,8 @@ -package com.simibubi.create.modules.contraptions.components.fan; +package com.simibubi.create.content.contraptions.components.fan; +import com.simibubi.create.content.contraptions.base.DirectionalKineticBlock; import com.simibubi.create.foundation.block.ITE; -import com.simibubi.create.foundation.utility.WrappedWorld; -import com.simibubi.create.modules.contraptions.base.DirectionalKineticBlock; +import com.simibubi.create.foundation.utility.worldWrappers.WrappedWorld; import net.minecraft.block.Block; import net.minecraft.block.BlockState; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/fan/EncasedFanTileEntity.java b/src/main/java/com/simibubi/create/content/contraptions/components/fan/EncasedFanTileEntity.java similarity index 93% rename from src/main/java/com/simibubi/create/modules/contraptions/components/fan/EncasedFanTileEntity.java rename to src/main/java/com/simibubi/create/content/contraptions/components/fan/EncasedFanTileEntity.java index 699d23817..272008982 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/fan/EncasedFanTileEntity.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/fan/EncasedFanTileEntity.java @@ -1,10 +1,10 @@ -package com.simibubi.create.modules.contraptions.components.fan; +package com.simibubi.create.content.contraptions.components.fan; import com.simibubi.create.AllBlockTags; import com.simibubi.create.AllTileEntities; -import com.simibubi.create.config.AllConfigs; -import com.simibubi.create.config.CKinetics; -import com.simibubi.create.modules.contraptions.base.GeneratingKineticTileEntity; +import com.simibubi.create.content.contraptions.base.GeneratingKineticTileEntity; +import com.simibubi.create.foundation.config.AllConfigs; +import com.simibubi.create.foundation.config.CKinetics; import net.minecraft.nbt.CompoundNBT; import net.minecraft.state.properties.BlockStateProperties; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/fan/EncasedFanTileEntityRenderer.java b/src/main/java/com/simibubi/create/content/contraptions/components/fan/EncasedFanTileEntityRenderer.java similarity index 90% rename from src/main/java/com/simibubi/create/modules/contraptions/components/fan/EncasedFanTileEntityRenderer.java rename to src/main/java/com/simibubi/create/content/contraptions/components/fan/EncasedFanTileEntityRenderer.java index 553939520..f61b227d8 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/fan/EncasedFanTileEntityRenderer.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/fan/EncasedFanTileEntityRenderer.java @@ -1,14 +1,14 @@ -package com.simibubi.create.modules.contraptions.components.fan; +package com.simibubi.create.content.contraptions.components.fan; import static net.minecraft.state.properties.BlockStateProperties.FACING; import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.vertex.IVertexBuilder; import com.simibubi.create.AllBlockPartials; +import com.simibubi.create.content.contraptions.base.KineticTileEntity; +import com.simibubi.create.content.contraptions.base.KineticTileEntityRenderer; import com.simibubi.create.foundation.utility.AnimationTickHolder; import com.simibubi.create.foundation.utility.SuperByteBuffer; -import com.simibubi.create.modules.contraptions.base.KineticTileEntity; -import com.simibubi.create.modules.contraptions.base.KineticTileEntityRenderer; import net.minecraft.client.renderer.IRenderTypeBuffer; import net.minecraft.client.renderer.RenderType; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/fan/NozzleBlock.java b/src/main/java/com/simibubi/create/content/contraptions/components/fan/NozzleBlock.java similarity index 92% rename from src/main/java/com/simibubi/create/modules/contraptions/components/fan/NozzleBlock.java rename to src/main/java/com/simibubi/create/content/contraptions/components/fan/NozzleBlock.java index 6e8a7ac26..47b6c4cc6 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/fan/NozzleBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/fan/NozzleBlock.java @@ -1,9 +1,9 @@ -package com.simibubi.create.modules.contraptions.components.fan; +package com.simibubi.create.content.contraptions.components.fan; import com.simibubi.create.AllBlocks; +import com.simibubi.create.AllShapes; +import com.simibubi.create.content.contraptions.wrench.IWrenchable; import com.simibubi.create.foundation.block.ProperDirectionalBlock; -import com.simibubi.create.foundation.utility.AllShapes; -import com.simibubi.create.modules.contraptions.IWrenchable; import net.minecraft.block.Block; import net.minecraft.block.BlockState; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/fan/NozzleTileEntity.java b/src/main/java/com/simibubi/create/content/contraptions/components/fan/NozzleTileEntity.java similarity index 95% rename from src/main/java/com/simibubi/create/modules/contraptions/components/fan/NozzleTileEntity.java rename to src/main/java/com/simibubi/create/content/contraptions/components/fan/NozzleTileEntity.java index 23d67634d..885c45e03 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/fan/NozzleTileEntity.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/fan/NozzleTileEntity.java @@ -1,13 +1,13 @@ -package com.simibubi.create.modules.contraptions.components.fan; +package com.simibubi.create.content.contraptions.components.fan; import java.util.ArrayList; import java.util.Iterator; import java.util.List; import com.simibubi.create.AllTileEntities; -import com.simibubi.create.config.AllConfigs; -import com.simibubi.create.foundation.behaviour.base.SmartTileEntity; -import com.simibubi.create.foundation.behaviour.base.TileEntityBehaviour; +import com.simibubi.create.foundation.config.AllConfigs; +import com.simibubi.create.foundation.tileEntity.SmartTileEntity; +import com.simibubi.create.foundation.tileEntity.TileEntityBehaviour; import com.simibubi.create.foundation.utility.VecHelper; import net.minecraft.entity.Entity; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/fan/SplashingRecipe.java b/src/main/java/com/simibubi/create/content/contraptions/components/fan/SplashingRecipe.java similarity index 55% rename from src/main/java/com/simibubi/create/modules/contraptions/components/fan/SplashingRecipe.java rename to src/main/java/com/simibubi/create/content/contraptions/components/fan/SplashingRecipe.java index 4e09e1082..47da85aa0 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/fan/SplashingRecipe.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/fan/SplashingRecipe.java @@ -1,13 +1,13 @@ -package com.simibubi.create.modules.contraptions.components.fan; +package com.simibubi.create.content.contraptions.components.fan; import java.util.List; -import com.simibubi.create.AllRecipes; -import com.simibubi.create.modules.contraptions.processing.ProcessingIngredient; -import com.simibubi.create.modules.contraptions.processing.ProcessingOutput; -import com.simibubi.create.modules.contraptions.processing.ProcessingRecipe; -import com.simibubi.create.modules.logistics.InWorldProcessing; -import com.simibubi.create.modules.logistics.InWorldProcessing.SplashingInv; +import com.simibubi.create.AllRecipeTypes; +import com.simibubi.create.content.contraptions.processing.ProcessingIngredient; +import com.simibubi.create.content.contraptions.processing.ProcessingOutput; +import com.simibubi.create.content.contraptions.processing.ProcessingRecipe; +import com.simibubi.create.content.logistics.InWorldProcessing; +import com.simibubi.create.content.logistics.InWorldProcessing.SplashingInv; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; @@ -16,7 +16,7 @@ public class SplashingRecipe extends ProcessingRecipe ingredients, List results, int processingDuration) { - super(AllRecipes.SPLASHING, id, group, ingredients, results, processingDuration); + super(AllRecipeTypes.SPLASHING, id, group, ingredients, results, processingDuration); } @Override diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/flywheel/FlywheelBlock.java b/src/main/java/com/simibubi/create/content/contraptions/components/flywheel/FlywheelBlock.java similarity index 95% rename from src/main/java/com/simibubi/create/modules/contraptions/components/flywheel/FlywheelBlock.java rename to src/main/java/com/simibubi/create/content/contraptions/components/flywheel/FlywheelBlock.java index 8bc1422aa..23b04820c 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/flywheel/FlywheelBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/flywheel/FlywheelBlock.java @@ -1,7 +1,7 @@ -package com.simibubi.create.modules.contraptions.components.flywheel; +package com.simibubi.create.content.contraptions.components.flywheel; +import com.simibubi.create.content.contraptions.base.HorizontalKineticBlock; import com.simibubi.create.foundation.utility.Lang; -import com.simibubi.create.modules.contraptions.base.HorizontalKineticBlock; import net.minecraft.block.Block; import net.minecraft.block.BlockState; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/flywheel/FlywheelGenerator.java b/src/main/java/com/simibubi/create/content/contraptions/components/flywheel/FlywheelGenerator.java similarity index 86% rename from src/main/java/com/simibubi/create/modules/contraptions/components/flywheel/FlywheelGenerator.java rename to src/main/java/com/simibubi/create/content/contraptions/components/flywheel/FlywheelGenerator.java index dab1bad94..746e22676 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/flywheel/FlywheelGenerator.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/flywheel/FlywheelGenerator.java @@ -1,6 +1,6 @@ -package com.simibubi.create.modules.contraptions.components.flywheel; +package com.simibubi.create.content.contraptions.components.flywheel; -import com.simibubi.create.foundation.utility.data.SpecialBlockStateGen; +import com.simibubi.create.foundation.data.SpecialBlockStateGen; import com.tterrag.registrate.providers.DataGenContext; import com.tterrag.registrate.providers.RegistrateBlockstateProvider; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/flywheel/FlywheelRenderer.java b/src/main/java/com/simibubi/create/content/contraptions/components/flywheel/FlywheelRenderer.java similarity index 93% rename from src/main/java/com/simibubi/create/modules/contraptions/components/flywheel/FlywheelRenderer.java rename to src/main/java/com/simibubi/create/content/contraptions/components/flywheel/FlywheelRenderer.java index 0dddd0fa5..b7f1ebc77 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/flywheel/FlywheelRenderer.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/flywheel/FlywheelRenderer.java @@ -1,15 +1,15 @@ -package com.simibubi.create.modules.contraptions.components.flywheel; +package com.simibubi.create.content.contraptions.components.flywheel; -import static com.simibubi.create.modules.contraptions.base.HorizontalKineticBlock.HORIZONTAL_FACING; +import static com.simibubi.create.content.contraptions.base.HorizontalKineticBlock.HORIZONTAL_FACING; import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.vertex.IVertexBuilder; import com.simibubi.create.AllBlockPartials; +import com.simibubi.create.content.contraptions.base.KineticTileEntity; +import com.simibubi.create.content.contraptions.base.KineticTileEntityRenderer; +import com.simibubi.create.content.contraptions.components.flywheel.FlywheelBlock.ConnectionState; import com.simibubi.create.foundation.utility.AngleHelper; import com.simibubi.create.foundation.utility.SuperByteBuffer; -import com.simibubi.create.modules.contraptions.base.KineticTileEntity; -import com.simibubi.create.modules.contraptions.base.KineticTileEntityRenderer; -import com.simibubi.create.modules.contraptions.components.flywheel.FlywheelBlock.ConnectionState; import net.minecraft.block.BlockState; import net.minecraft.client.renderer.IRenderTypeBuffer; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/flywheel/FlywheelTileEntity.java b/src/main/java/com/simibubi/create/content/contraptions/components/flywheel/FlywheelTileEntity.java similarity index 94% rename from src/main/java/com/simibubi/create/modules/contraptions/components/flywheel/FlywheelTileEntity.java rename to src/main/java/com/simibubi/create/content/contraptions/components/flywheel/FlywheelTileEntity.java index d7f320305..96cb3ef79 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/flywheel/FlywheelTileEntity.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/flywheel/FlywheelTileEntity.java @@ -1,8 +1,8 @@ -package com.simibubi.create.modules.contraptions.components.flywheel; +package com.simibubi.create.content.contraptions.components.flywheel; import com.simibubi.create.AllTileEntities; +import com.simibubi.create.content.contraptions.base.GeneratingKineticTileEntity; import com.simibubi.create.foundation.gui.widgets.InterpolatedChasingValue; -import com.simibubi.create.modules.contraptions.base.GeneratingKineticTileEntity; import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.math.AxisAlignedBB; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/flywheel/engine/EngineBlock.java b/src/main/java/com/simibubi/create/content/contraptions/components/flywheel/engine/EngineBlock.java similarity index 95% rename from src/main/java/com/simibubi/create/modules/contraptions/components/flywheel/engine/EngineBlock.java rename to src/main/java/com/simibubi/create/content/contraptions/components/flywheel/engine/EngineBlock.java index 688705df4..091b2c8e5 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/flywheel/engine/EngineBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/flywheel/engine/EngineBlock.java @@ -1,9 +1,9 @@ -package com.simibubi.create.modules.contraptions.components.flywheel.engine; +package com.simibubi.create.content.contraptions.components.flywheel.engine; import javax.annotation.Nullable; import com.simibubi.create.AllBlockPartials; -import com.simibubi.create.modules.contraptions.IWrenchable; +import com.simibubi.create.content.contraptions.wrench.IWrenchable; import net.minecraft.block.Block; import net.minecraft.block.BlockState; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/flywheel/engine/EngineRenderer.java b/src/main/java/com/simibubi/create/content/contraptions/components/flywheel/engine/EngineRenderer.java similarity index 90% rename from src/main/java/com/simibubi/create/modules/contraptions/components/flywheel/engine/EngineRenderer.java rename to src/main/java/com/simibubi/create/content/contraptions/components/flywheel/engine/EngineRenderer.java index b48591e9e..d6f932f7a 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/flywheel/engine/EngineRenderer.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/flywheel/engine/EngineRenderer.java @@ -1,8 +1,8 @@ -package com.simibubi.create.modules.contraptions.components.flywheel.engine; +package com.simibubi.create.content.contraptions.components.flywheel.engine; import com.mojang.blaze3d.matrix.MatrixStack; import com.simibubi.create.AllBlockPartials; -import com.simibubi.create.foundation.block.SafeTileEntityRenderer; +import com.simibubi.create.foundation.tileEntity.renderer.SafeTileEntityRenderer; import com.simibubi.create.foundation.utility.AngleHelper; import net.minecraft.block.Block; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/flywheel/engine/EngineTileEntity.java b/src/main/java/com/simibubi/create/content/contraptions/components/flywheel/engine/EngineTileEntity.java similarity index 88% rename from src/main/java/com/simibubi/create/modules/contraptions/components/flywheel/engine/EngineTileEntity.java rename to src/main/java/com/simibubi/create/content/contraptions/components/flywheel/engine/EngineTileEntity.java index 9c23ce63c..a0869af09 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/flywheel/engine/EngineTileEntity.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/flywheel/engine/EngineTileEntity.java @@ -1,12 +1,12 @@ -package com.simibubi.create.modules.contraptions.components.flywheel.engine; +package com.simibubi.create.content.contraptions.components.flywheel.engine; import java.util.List; import com.simibubi.create.AllBlocks; -import com.simibubi.create.foundation.behaviour.base.SmartTileEntity; -import com.simibubi.create.foundation.behaviour.base.TileEntityBehaviour; -import com.simibubi.create.modules.contraptions.components.flywheel.FlywheelBlock; -import com.simibubi.create.modules.contraptions.components.flywheel.FlywheelTileEntity; +import com.simibubi.create.content.contraptions.components.flywheel.FlywheelBlock; +import com.simibubi.create.content.contraptions.components.flywheel.FlywheelTileEntity; +import com.simibubi.create.foundation.tileEntity.SmartTileEntity; +import com.simibubi.create.foundation.tileEntity.TileEntityBehaviour; import net.minecraft.block.BlockState; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/flywheel/engine/FurnaceEngineBlock.java b/src/main/java/com/simibubi/create/content/contraptions/components/flywheel/engine/FurnaceEngineBlock.java similarity index 93% rename from src/main/java/com/simibubi/create/modules/contraptions/components/flywheel/engine/FurnaceEngineBlock.java rename to src/main/java/com/simibubi/create/content/contraptions/components/flywheel/engine/FurnaceEngineBlock.java index 5c9e84380..a35c1d04f 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/flywheel/engine/FurnaceEngineBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/flywheel/engine/FurnaceEngineBlock.java @@ -1,10 +1,10 @@ -package com.simibubi.create.modules.contraptions.components.flywheel.engine; +package com.simibubi.create.content.contraptions.components.flywheel.engine; import com.simibubi.create.AllBlockPartials; import com.simibubi.create.AllBlocks; +import com.simibubi.create.AllShapes; import com.simibubi.create.foundation.block.ITE; -import com.simibubi.create.foundation.utility.AllShapes; -import com.simibubi.create.foundation.utility.WrappedWorld; +import com.simibubi.create.foundation.utility.worldWrappers.WrappedWorld; import net.minecraft.block.AbstractFurnaceBlock; import net.minecraft.block.Block; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/flywheel/engine/FurnaceEngineTileEntity.java b/src/main/java/com/simibubi/create/content/contraptions/components/flywheel/engine/FurnaceEngineTileEntity.java similarity index 89% rename from src/main/java/com/simibubi/create/modules/contraptions/components/flywheel/engine/FurnaceEngineTileEntity.java rename to src/main/java/com/simibubi/create/content/contraptions/components/flywheel/engine/FurnaceEngineTileEntity.java index dbd073c5b..007258fa7 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/flywheel/engine/FurnaceEngineTileEntity.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/flywheel/engine/FurnaceEngineTileEntity.java @@ -1,8 +1,8 @@ -package com.simibubi.create.modules.contraptions.components.flywheel.engine; +package com.simibubi.create.content.contraptions.components.flywheel.engine; import com.simibubi.create.AllBlocks; import com.simibubi.create.AllTileEntities; -import com.simibubi.create.config.AllConfigs; +import com.simibubi.create.foundation.config.AllConfigs; import net.minecraft.block.AbstractFurnaceBlock; import net.minecraft.block.BlockState; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/millstone/MillingRecipe.java b/src/main/java/com/simibubi/create/content/contraptions/components/millstone/MillingRecipe.java similarity index 63% rename from src/main/java/com/simibubi/create/modules/contraptions/components/millstone/MillingRecipe.java rename to src/main/java/com/simibubi/create/content/contraptions/components/millstone/MillingRecipe.java index be6c6cd56..15dd0a9f9 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/millstone/MillingRecipe.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/millstone/MillingRecipe.java @@ -1,11 +1,11 @@ -package com.simibubi.create.modules.contraptions.components.millstone; +package com.simibubi.create.content.contraptions.components.millstone; import java.util.List; -import com.simibubi.create.AllRecipes; -import com.simibubi.create.modules.contraptions.components.crusher.AbstractCrushingRecipe; -import com.simibubi.create.modules.contraptions.processing.ProcessingIngredient; -import com.simibubi.create.modules.contraptions.processing.ProcessingOutput; +import com.simibubi.create.AllRecipeTypes; +import com.simibubi.create.content.contraptions.components.crusher.AbstractCrushingRecipe; +import com.simibubi.create.content.contraptions.processing.ProcessingIngredient; +import com.simibubi.create.content.contraptions.processing.ProcessingOutput; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; @@ -15,7 +15,7 @@ public class MillingRecipe extends AbstractCrushingRecipe { public MillingRecipe(ResourceLocation id, String group, List ingredients, List results, int processingDuration) { - super(AllRecipes.MILLING, id, group, ingredients, results, processingDuration); + super(AllRecipeTypes.MILLING, id, group, ingredients, results, processingDuration); } @Override diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/millstone/MillstoneBlock.java b/src/main/java/com/simibubi/create/content/contraptions/components/millstone/MillstoneBlock.java similarity index 96% rename from src/main/java/com/simibubi/create/modules/contraptions/components/millstone/MillstoneBlock.java rename to src/main/java/com/simibubi/create/content/contraptions/components/millstone/MillstoneBlock.java index 64d8a1163..17189f4bd 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/millstone/MillstoneBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/millstone/MillstoneBlock.java @@ -1,10 +1,10 @@ -package com.simibubi.create.modules.contraptions.components.millstone; +package com.simibubi.create.content.contraptions.components.millstone; +import com.simibubi.create.AllShapes; +import com.simibubi.create.content.contraptions.base.KineticBlock; import com.simibubi.create.foundation.block.ITE; import com.simibubi.create.foundation.item.ItemHelper; -import com.simibubi.create.foundation.utility.AllShapes; import com.simibubi.create.foundation.utility.Iterate; -import com.simibubi.create.modules.contraptions.base.KineticBlock; import net.minecraft.block.BlockState; import net.minecraft.entity.Entity; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/millstone/MillstoneRenderer.java b/src/main/java/com/simibubi/create/content/contraptions/components/millstone/MillstoneRenderer.java similarity index 76% rename from src/main/java/com/simibubi/create/modules/contraptions/components/millstone/MillstoneRenderer.java rename to src/main/java/com/simibubi/create/content/contraptions/components/millstone/MillstoneRenderer.java index 0efc49005..2890f16d3 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/millstone/MillstoneRenderer.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/millstone/MillstoneRenderer.java @@ -1,10 +1,10 @@ -package com.simibubi.create.modules.contraptions.components.millstone; +package com.simibubi.create.content.contraptions.components.millstone; import com.simibubi.create.AllBlockPartials; import com.simibubi.create.CreateClient; +import com.simibubi.create.content.contraptions.base.KineticTileEntity; +import com.simibubi.create.content.contraptions.base.KineticTileEntityRenderer; import com.simibubi.create.foundation.utility.SuperByteBuffer; -import com.simibubi.create.modules.contraptions.base.KineticTileEntity; -import com.simibubi.create.modules.contraptions.base.KineticTileEntityRenderer; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/millstone/MillstoneTileEntity.java b/src/main/java/com/simibubi/create/content/contraptions/components/millstone/MillstoneTileEntity.java similarity index 91% rename from src/main/java/com/simibubi/create/modules/contraptions/components/millstone/MillstoneTileEntity.java rename to src/main/java/com/simibubi/create/content/contraptions/components/millstone/MillstoneTileEntity.java index ac11ac58d..898ff8c73 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/millstone/MillstoneTileEntity.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/millstone/MillstoneTileEntity.java @@ -1,11 +1,11 @@ -package com.simibubi.create.modules.contraptions.components.millstone; +package com.simibubi.create.content.contraptions.components.millstone; import java.util.Optional; -import com.simibubi.create.AllRecipes; +import com.simibubi.create.AllRecipeTypes; import com.simibubi.create.AllTileEntities; +import com.simibubi.create.content.contraptions.base.KineticTileEntity; import com.simibubi.create.foundation.utility.VecHelper; -import com.simibubi.create.modules.contraptions.base.KineticTileEntity; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; @@ -64,7 +64,7 @@ public class MillstoneTileEntity extends KineticTileEntity { RecipeWrapper inventoryIn = new RecipeWrapper(inputInv); if (lastRecipe == null || !lastRecipe.matches(inventoryIn, world)) { Optional recipe = - world.getRecipeManager().getRecipe(AllRecipes.MILLING.getType(), inventoryIn, world); + world.getRecipeManager().getRecipe(AllRecipeTypes.MILLING.getType(), inventoryIn, world); if (!recipe.isPresent()) { timer = 100; sendData(); @@ -85,7 +85,7 @@ public class MillstoneTileEntity extends KineticTileEntity { if (lastRecipe == null || !lastRecipe.matches(inventoryIn, world)) { Optional recipe = - world.getRecipeManager().getRecipe(AllRecipes.MILLING.getType(), inventoryIn, world); + world.getRecipeManager().getRecipe(AllRecipeTypes.MILLING.getType(), inventoryIn, world); if (!recipe.isPresent()) return; lastRecipe = recipe.get(); @@ -149,7 +149,7 @@ public class MillstoneTileEntity extends KineticTileEntity { if (lastRecipe != null && lastRecipe.matches(inventoryIn, world)) return true; - return world.getRecipeManager().getRecipe(AllRecipes.MILLING.getType(), inventoryIn, world).isPresent(); + return world.getRecipeManager().getRecipe(AllRecipeTypes.MILLING.getType(), inventoryIn, world).isPresent(); } private class MillstoneInventoryHandler extends CombinedInvWrapper { diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/mixer/BasinOperatorBlockItem.java b/src/main/java/com/simibubi/create/content/contraptions/components/mixer/BasinOperatorBlockItem.java similarity index 94% rename from src/main/java/com/simibubi/create/modules/contraptions/components/mixer/BasinOperatorBlockItem.java rename to src/main/java/com/simibubi/create/content/contraptions/components/mixer/BasinOperatorBlockItem.java index a0d9dfe90..4604140d2 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/mixer/BasinOperatorBlockItem.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/mixer/BasinOperatorBlockItem.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.contraptions.components.mixer; +package com.simibubi.create.content.contraptions.components.mixer; import com.simibubi.create.AllBlocks; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/mixer/MechanicalMixerBlock.java b/src/main/java/com/simibubi/create/content/contraptions/components/mixer/MechanicalMixerBlock.java similarity index 92% rename from src/main/java/com/simibubi/create/modules/contraptions/components/mixer/MechanicalMixerBlock.java rename to src/main/java/com/simibubi/create/content/contraptions/components/mixer/MechanicalMixerBlock.java index 9d61641a0..8d4f40a0c 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/mixer/MechanicalMixerBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/mixer/MechanicalMixerBlock.java @@ -1,9 +1,9 @@ -package com.simibubi.create.modules.contraptions.components.mixer; +package com.simibubi.create.content.contraptions.components.mixer; import com.simibubi.create.AllBlocks; +import com.simibubi.create.AllShapes; +import com.simibubi.create.content.contraptions.base.KineticBlock; import com.simibubi.create.foundation.block.ITE; -import com.simibubi.create.foundation.utility.AllShapes; -import com.simibubi.create.modules.contraptions.base.KineticBlock; import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/mixer/MechanicalMixerTileEntity.java b/src/main/java/com/simibubi/create/content/contraptions/components/mixer/MechanicalMixerTileEntity.java similarity index 91% rename from src/main/java/com/simibubi/create/modules/contraptions/components/mixer/MechanicalMixerTileEntity.java rename to src/main/java/com/simibubi/create/content/contraptions/components/mixer/MechanicalMixerTileEntity.java index c580f4f88..6f1aee276 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/mixer/MechanicalMixerTileEntity.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/mixer/MechanicalMixerTileEntity.java @@ -1,19 +1,19 @@ -package com.simibubi.create.modules.contraptions.components.mixer; +package com.simibubi.create.content.contraptions.components.mixer; import java.util.ArrayList; import java.util.LinkedList; import java.util.List; -import com.simibubi.create.AllRecipes; +import com.simibubi.create.AllRecipeTypes; import com.simibubi.create.AllTileEntities; -import com.simibubi.create.foundation.behaviour.CenteredSideValueBoxTransform; -import com.simibubi.create.foundation.behaviour.base.TileEntityBehaviour; -import com.simibubi.create.foundation.behaviour.scrollvalue.ScrollValueBehaviour; +import com.simibubi.create.content.contraptions.components.press.MechanicalPressTileEntity; +import com.simibubi.create.content.contraptions.processing.BasinOperatingTileEntity; +import com.simibubi.create.content.contraptions.processing.BasinTileEntity.BasinInventory; +import com.simibubi.create.foundation.tileEntity.TileEntityBehaviour; +import com.simibubi.create.foundation.tileEntity.behaviour.CenteredSideValueBoxTransform; +import com.simibubi.create.foundation.tileEntity.behaviour.scrollvalue.ScrollValueBehaviour; import com.simibubi.create.foundation.utility.Lang; import com.simibubi.create.foundation.utility.VecHelper; -import com.simibubi.create.modules.contraptions.components.press.MechanicalPressTileEntity; -import com.simibubi.create.modules.contraptions.processing.BasinOperatingTileEntity; -import com.simibubi.create.modules.contraptions.processing.BasinTileEntity.BasinInventory; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; @@ -179,7 +179,7 @@ public class MechanicalMixerTileEntity extends BasinOperatingTileEntity { @Override protected boolean matchStaticFilters(IRecipe r) { - return (r.getSerializer() == IRecipeSerializer.CRAFTING_SHAPELESS || r.getType() == AllRecipes.MIXING.type) + return (r.getSerializer() == IRecipeSerializer.CRAFTING_SHAPELESS || r.getType() == AllRecipeTypes.MIXING.type) && !MechanicalPressTileEntity.canCompress(r.getIngredients()); } diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/mixer/MechanicalMixerTileEntityRenderer.java b/src/main/java/com/simibubi/create/content/contraptions/components/mixer/MechanicalMixerTileEntityRenderer.java similarity index 91% rename from src/main/java/com/simibubi/create/modules/contraptions/components/mixer/MechanicalMixerTileEntityRenderer.java rename to src/main/java/com/simibubi/create/content/contraptions/components/mixer/MechanicalMixerTileEntityRenderer.java index 80bfc4419..591140c3d 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/mixer/MechanicalMixerTileEntityRenderer.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/mixer/MechanicalMixerTileEntityRenderer.java @@ -1,12 +1,12 @@ -package com.simibubi.create.modules.contraptions.components.mixer; +package com.simibubi.create.content.contraptions.components.mixer; import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.vertex.IVertexBuilder; import com.simibubi.create.AllBlockPartials; +import com.simibubi.create.content.contraptions.base.KineticTileEntity; +import com.simibubi.create.content.contraptions.base.KineticTileEntityRenderer; import com.simibubi.create.foundation.utility.AnimationTickHolder; import com.simibubi.create.foundation.utility.SuperByteBuffer; -import com.simibubi.create.modules.contraptions.base.KineticTileEntity; -import com.simibubi.create.modules.contraptions.base.KineticTileEntityRenderer; import net.minecraft.block.BlockState; import net.minecraft.client.renderer.IRenderTypeBuffer; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/mixer/MixingRecipe.java b/src/main/java/com/simibubi/create/content/contraptions/components/mixer/MixingRecipe.java similarity index 82% rename from src/main/java/com/simibubi/create/modules/contraptions/components/mixer/MixingRecipe.java rename to src/main/java/com/simibubi/create/content/contraptions/components/mixer/MixingRecipe.java index 37ef05933..0cb559e1d 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/mixer/MixingRecipe.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/mixer/MixingRecipe.java @@ -1,15 +1,15 @@ -package com.simibubi.create.modules.contraptions.components.mixer; +package com.simibubi.create.content.contraptions.components.mixer; import java.util.ArrayList; import java.util.Arrays; import java.util.LinkedList; import java.util.List; -import com.simibubi.create.AllRecipes; -import com.simibubi.create.modules.contraptions.processing.BasinTileEntity.BasinInputInventory; -import com.simibubi.create.modules.contraptions.processing.ProcessingIngredient; -import com.simibubi.create.modules.contraptions.processing.ProcessingOutput; -import com.simibubi.create.modules.contraptions.processing.ProcessingRecipe; +import com.simibubi.create.AllRecipeTypes; +import com.simibubi.create.content.contraptions.processing.ProcessingIngredient; +import com.simibubi.create.content.contraptions.processing.ProcessingOutput; +import com.simibubi.create.content.contraptions.processing.ProcessingRecipe; +import com.simibubi.create.content.contraptions.processing.BasinTileEntity.BasinInputInventory; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; @@ -22,7 +22,7 @@ public class MixingRecipe extends ProcessingRecipe { public MixingRecipe(ResourceLocation id, String group, List ingredients, List results, int processingDuration) { - super(AllRecipes.MIXING, id, group, ingredients, results, processingDuration); + super(AllRecipeTypes.MIXING, id, group, ingredients, results, processingDuration); } @Override diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/motor/MotorBlock.java b/src/main/java/com/simibubi/create/content/contraptions/components/motor/MotorBlock.java similarity index 89% rename from src/main/java/com/simibubi/create/modules/contraptions/components/motor/MotorBlock.java rename to src/main/java/com/simibubi/create/content/contraptions/components/motor/MotorBlock.java index e64dd9922..34b14f5a5 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/motor/MotorBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/motor/MotorBlock.java @@ -1,7 +1,7 @@ -package com.simibubi.create.modules.contraptions.components.motor; +package com.simibubi.create.content.contraptions.components.motor; -import com.simibubi.create.foundation.utility.AllShapes; -import com.simibubi.create.modules.contraptions.base.DirectionalKineticBlock; +import com.simibubi.create.AllShapes; +import com.simibubi.create.content.contraptions.base.DirectionalKineticBlock; import net.minecraft.block.BlockState; import net.minecraft.item.BlockItemUseContext; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/motor/MotorGenerator.java b/src/main/java/com/simibubi/create/content/contraptions/components/motor/MotorGenerator.java similarity index 83% rename from src/main/java/com/simibubi/create/modules/contraptions/components/motor/MotorGenerator.java rename to src/main/java/com/simibubi/create/content/contraptions/components/motor/MotorGenerator.java index 5dcd43ad1..a7c196bec 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/motor/MotorGenerator.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/motor/MotorGenerator.java @@ -1,7 +1,7 @@ -package com.simibubi.create.modules.contraptions.components.motor; +package com.simibubi.create.content.contraptions.components.motor; -import com.simibubi.create.foundation.utility.data.AssetLookup; -import com.simibubi.create.foundation.utility.data.SpecialBlockStateGen; +import com.simibubi.create.foundation.data.AssetLookup; +import com.simibubi.create.foundation.data.SpecialBlockStateGen; import com.tterrag.registrate.providers.DataGenContext; import com.tterrag.registrate.providers.RegistrateBlockstateProvider; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/motor/MotorTileEntity.java b/src/main/java/com/simibubi/create/content/contraptions/components/motor/MotorTileEntity.java similarity index 76% rename from src/main/java/com/simibubi/create/modules/contraptions/components/motor/MotorTileEntity.java rename to src/main/java/com/simibubi/create/content/contraptions/components/motor/MotorTileEntity.java index b7b682c9e..bac057005 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/motor/MotorTileEntity.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/motor/MotorTileEntity.java @@ -1,15 +1,15 @@ -package com.simibubi.create.modules.contraptions.components.motor; +package com.simibubi.create.content.contraptions.components.motor; import java.util.List; import com.simibubi.create.AllTileEntities; -import com.simibubi.create.config.AllConfigs; -import com.simibubi.create.foundation.behaviour.CenteredSideValueBoxTransform; -import com.simibubi.create.foundation.behaviour.base.TileEntityBehaviour; -import com.simibubi.create.foundation.behaviour.scrollvalue.ScrollValueBehaviour; -import com.simibubi.create.foundation.behaviour.scrollvalue.ScrollValueBehaviour.StepContext; +import com.simibubi.create.content.contraptions.base.GeneratingKineticTileEntity; +import com.simibubi.create.foundation.config.AllConfigs; +import com.simibubi.create.foundation.tileEntity.TileEntityBehaviour; +import com.simibubi.create.foundation.tileEntity.behaviour.CenteredSideValueBoxTransform; +import com.simibubi.create.foundation.tileEntity.behaviour.scrollvalue.ScrollValueBehaviour; +import com.simibubi.create.foundation.tileEntity.behaviour.scrollvalue.ScrollValueBehaviour.StepContext; import com.simibubi.create.foundation.utility.Lang; -import com.simibubi.create.modules.contraptions.base.GeneratingKineticTileEntity; public class MotorTileEntity extends GeneratingKineticTileEntity { diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/motor/MotorTileEntityRenderer.java b/src/main/java/com/simibubi/create/content/contraptions/components/motor/MotorTileEntityRenderer.java similarity index 74% rename from src/main/java/com/simibubi/create/modules/contraptions/components/motor/MotorTileEntityRenderer.java rename to src/main/java/com/simibubi/create/content/contraptions/components/motor/MotorTileEntityRenderer.java index 7ae4c5e88..f0a73a192 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/motor/MotorTileEntityRenderer.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/motor/MotorTileEntityRenderer.java @@ -1,9 +1,9 @@ -package com.simibubi.create.modules.contraptions.components.motor; +package com.simibubi.create.content.contraptions.components.motor; import com.simibubi.create.AllBlockPartials; +import com.simibubi.create.content.contraptions.base.KineticTileEntity; +import com.simibubi.create.content.contraptions.base.KineticTileEntityRenderer; import com.simibubi.create.foundation.utility.SuperByteBuffer; -import com.simibubi.create.modules.contraptions.base.KineticTileEntity; -import com.simibubi.create.modules.contraptions.base.KineticTileEntityRenderer; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/press/MechanicalPressBlock.java b/src/main/java/com/simibubi/create/content/contraptions/components/press/MechanicalPressBlock.java similarity index 89% rename from src/main/java/com/simibubi/create/modules/contraptions/components/press/MechanicalPressBlock.java rename to src/main/java/com/simibubi/create/content/contraptions/components/press/MechanicalPressBlock.java index 75541dd21..7968cd609 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/press/MechanicalPressBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/press/MechanicalPressBlock.java @@ -1,21 +1,21 @@ -package com.simibubi.create.modules.contraptions.components.press; +package com.simibubi.create.content.contraptions.components.press; import java.util.Arrays; import java.util.List; import java.util.Optional; import com.simibubi.create.AllBlocks; +import com.simibubi.create.AllShapes; +import com.simibubi.create.content.contraptions.base.HorizontalKineticBlock; +import com.simibubi.create.content.contraptions.components.press.MechanicalPressTileEntity.Mode; +import com.simibubi.create.content.contraptions.relays.belt.BeltBlock; +import com.simibubi.create.content.contraptions.relays.belt.BeltTileEntity; +import com.simibubi.create.content.contraptions.relays.belt.AllBeltAttachments.BeltAttachmentState; +import com.simibubi.create.content.contraptions.relays.belt.AllBeltAttachments.IBeltAttachment; +import com.simibubi.create.content.contraptions.relays.belt.BeltBlock.Slope; +import com.simibubi.create.content.contraptions.relays.belt.transport.TransportedItemStack; import com.simibubi.create.foundation.block.ITE; import com.simibubi.create.foundation.item.ItemHelper; -import com.simibubi.create.foundation.utility.AllShapes; -import com.simibubi.create.modules.contraptions.base.HorizontalKineticBlock; -import com.simibubi.create.modules.contraptions.components.press.MechanicalPressTileEntity.Mode; -import com.simibubi.create.modules.contraptions.relays.belt.AllBeltAttachments.BeltAttachmentState; -import com.simibubi.create.modules.contraptions.relays.belt.AllBeltAttachments.IBeltAttachment; -import com.simibubi.create.modules.contraptions.relays.belt.BeltBlock; -import com.simibubi.create.modules.contraptions.relays.belt.BeltBlock.Slope; -import com.simibubi.create.modules.contraptions.relays.belt.BeltTileEntity; -import com.simibubi.create.modules.contraptions.relays.belt.transport.TransportedItemStack; import net.minecraft.block.Block; import net.minecraft.block.BlockState; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/press/MechanicalPressTileEntity.java b/src/main/java/com/simibubi/create/content/contraptions/components/press/MechanicalPressTileEntity.java similarity index 95% rename from src/main/java/com/simibubi/create/modules/contraptions/components/press/MechanicalPressTileEntity.java rename to src/main/java/com/simibubi/create/content/contraptions/components/press/MechanicalPressTileEntity.java index 5f7e5529b..1329061c9 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/press/MechanicalPressTileEntity.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/press/MechanicalPressTileEntity.java @@ -1,18 +1,18 @@ -package com.simibubi.create.modules.contraptions.components.press; +package com.simibubi.create.content.contraptions.components.press; import java.util.ArrayList; import java.util.List; import java.util.Optional; -import com.simibubi.create.AllRecipes; +import com.simibubi.create.AllRecipeTypes; import com.simibubi.create.AllSoundEvents; import com.simibubi.create.AllTileEntities; +import com.simibubi.create.content.contraptions.processing.BasinOperatingTileEntity; +import com.simibubi.create.content.contraptions.processing.BasinTileEntity.BasinInventory; +import com.simibubi.create.content.logistics.InWorldProcessing; import com.simibubi.create.foundation.advancement.AllTriggers; import com.simibubi.create.foundation.item.ItemHelper; import com.simibubi.create.foundation.utility.VecHelper; -import com.simibubi.create.modules.contraptions.processing.BasinOperatingTileEntity; -import com.simibubi.create.modules.contraptions.processing.BasinTileEntity.BasinInventory; -import com.simibubi.create.modules.logistics.InWorldProcessing; import net.minecraft.entity.Entity; import net.minecraft.entity.item.ItemEntity; @@ -263,7 +263,7 @@ public class MechanicalPressTileEntity extends BasinOperatingTileEntity { public Optional getRecipe(ItemStack item) { pressingInv.setInventorySlotContents(0, item); Optional recipe = - world.getRecipeManager().getRecipe(AllRecipes.PRESSING.getType(), pressingInv, world); + world.getRecipeManager().getRecipe(AllRecipeTypes.PRESSING.getType(), pressingInv, world); return recipe; } diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/press/MechanicalPressTileEntityRenderer.java b/src/main/java/com/simibubi/create/content/contraptions/components/press/MechanicalPressTileEntityRenderer.java similarity index 88% rename from src/main/java/com/simibubi/create/modules/contraptions/components/press/MechanicalPressTileEntityRenderer.java rename to src/main/java/com/simibubi/create/content/contraptions/components/press/MechanicalPressTileEntityRenderer.java index 8db619cc8..db0371d7d 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/press/MechanicalPressTileEntityRenderer.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/press/MechanicalPressTileEntityRenderer.java @@ -1,10 +1,10 @@ -package com.simibubi.create.modules.contraptions.components.press; +package com.simibubi.create.content.contraptions.components.press; import com.mojang.blaze3d.matrix.MatrixStack; import com.simibubi.create.AllBlockPartials; +import com.simibubi.create.content.contraptions.base.KineticTileEntity; +import com.simibubi.create.content.contraptions.base.KineticTileEntityRenderer; import com.simibubi.create.foundation.utility.SuperByteBuffer; -import com.simibubi.create.modules.contraptions.base.KineticTileEntity; -import com.simibubi.create.modules.contraptions.base.KineticTileEntityRenderer; import net.minecraft.block.BlockState; import net.minecraft.client.renderer.IRenderTypeBuffer; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/press/PressingRecipe.java b/src/main/java/com/simibubi/create/content/contraptions/components/press/PressingRecipe.java similarity index 60% rename from src/main/java/com/simibubi/create/modules/contraptions/components/press/PressingRecipe.java rename to src/main/java/com/simibubi/create/content/contraptions/components/press/PressingRecipe.java index ea39a50c3..c8efe3b34 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/press/PressingRecipe.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/press/PressingRecipe.java @@ -1,12 +1,12 @@ -package com.simibubi.create.modules.contraptions.components.press; +package com.simibubi.create.content.contraptions.components.press; import java.util.List; -import com.simibubi.create.AllRecipes; -import com.simibubi.create.modules.contraptions.components.press.MechanicalPressTileEntity.PressingInv; -import com.simibubi.create.modules.contraptions.processing.ProcessingIngredient; -import com.simibubi.create.modules.contraptions.processing.ProcessingOutput; -import com.simibubi.create.modules.contraptions.processing.ProcessingRecipe; +import com.simibubi.create.AllRecipeTypes; +import com.simibubi.create.content.contraptions.components.press.MechanicalPressTileEntity.PressingInv; +import com.simibubi.create.content.contraptions.processing.ProcessingIngredient; +import com.simibubi.create.content.contraptions.processing.ProcessingOutput; +import com.simibubi.create.content.contraptions.processing.ProcessingRecipe; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; @@ -15,7 +15,7 @@ public class PressingRecipe extends ProcessingRecipe ingredients, List results, int processingDuration) { - super(AllRecipes.PRESSING, id, group, ingredients, results, processingDuration); + super(AllRecipeTypes.PRESSING, id, group, ingredients, results, processingDuration); } @Override diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/saw/CuttingRecipe.java b/src/main/java/com/simibubi/create/content/contraptions/components/saw/CuttingRecipe.java similarity index 63% rename from src/main/java/com/simibubi/create/modules/contraptions/components/saw/CuttingRecipe.java rename to src/main/java/com/simibubi/create/content/contraptions/components/saw/CuttingRecipe.java index d769e5a77..e6ebc69e8 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/saw/CuttingRecipe.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/saw/CuttingRecipe.java @@ -1,11 +1,11 @@ -package com.simibubi.create.modules.contraptions.components.saw; +package com.simibubi.create.content.contraptions.components.saw; import java.util.List; -import com.simibubi.create.AllRecipes; -import com.simibubi.create.modules.contraptions.processing.ProcessingIngredient; -import com.simibubi.create.modules.contraptions.processing.ProcessingOutput; -import com.simibubi.create.modules.contraptions.processing.ProcessingRecipe; +import com.simibubi.create.AllRecipeTypes; +import com.simibubi.create.content.contraptions.processing.ProcessingIngredient; +import com.simibubi.create.content.contraptions.processing.ProcessingOutput; +import com.simibubi.create.content.contraptions.processing.ProcessingRecipe; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; @@ -15,7 +15,7 @@ public class CuttingRecipe extends ProcessingRecipe { public CuttingRecipe(ResourceLocation id, String group, List ingredients, List results, int processingDuration) { - super(AllRecipes.CUTTING, id, group, ingredients, results, processingDuration); + super(AllRecipeTypes.CUTTING, id, group, ingredients, results, processingDuration); } @Override diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/saw/SawBlock.java b/src/main/java/com/simibubi/create/content/contraptions/components/saw/SawBlock.java similarity index 88% rename from src/main/java/com/simibubi/create/modules/contraptions/components/saw/SawBlock.java rename to src/main/java/com/simibubi/create/content/contraptions/components/saw/SawBlock.java index 3eef2c62f..ece9e6f1d 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/saw/SawBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/saw/SawBlock.java @@ -1,14 +1,14 @@ -package com.simibubi.create.modules.contraptions.components.saw; +package com.simibubi.create.content.contraptions.components.saw; -import com.simibubi.create.foundation.behaviour.base.TileEntityBehaviour; -import com.simibubi.create.foundation.behaviour.filtering.FilteringBehaviour; +import com.simibubi.create.AllShapes; +import com.simibubi.create.content.contraptions.base.DirectionalAxisKineticBlock; +import com.simibubi.create.content.contraptions.components.actors.SawMovementBehaviour; +import com.simibubi.create.content.contraptions.components.structureMovement.IPortableBlock; +import com.simibubi.create.content.contraptions.components.structureMovement.MovementBehaviour; import com.simibubi.create.foundation.block.ITE; import com.simibubi.create.foundation.item.ItemHelper; -import com.simibubi.create.foundation.utility.AllShapes; -import com.simibubi.create.modules.contraptions.base.DirectionalAxisKineticBlock; -import com.simibubi.create.modules.contraptions.components.actors.SawMovementBehaviour; -import com.simibubi.create.modules.contraptions.components.contraptions.IPortableBlock; -import com.simibubi.create.modules.contraptions.components.contraptions.MovementBehaviour; +import com.simibubi.create.foundation.tileEntity.TileEntityBehaviour; +import com.simibubi.create.foundation.tileEntity.behaviour.filtering.FilteringBehaviour; import net.minecraft.block.Block; import net.minecraft.block.BlockState; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/saw/SawFilterSlot.java b/src/main/java/com/simibubi/create/content/contraptions/components/saw/SawFilterSlot.java similarity index 84% rename from src/main/java/com/simibubi/create/modules/contraptions/components/saw/SawFilterSlot.java rename to src/main/java/com/simibubi/create/content/contraptions/components/saw/SawFilterSlot.java index 16db6095c..bfef3be6b 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/saw/SawFilterSlot.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/saw/SawFilterSlot.java @@ -1,7 +1,7 @@ -package com.simibubi.create.modules.contraptions.components.saw; +package com.simibubi.create.content.contraptions.components.saw; import com.mojang.blaze3d.matrix.MatrixStack; -import com.simibubi.create.foundation.behaviour.ValueBoxTransform; +import com.simibubi.create.foundation.tileEntity.behaviour.ValueBoxTransform; import com.simibubi.create.foundation.utility.VecHelper; import net.minecraft.block.BlockState; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/saw/SawGenerator.java b/src/main/java/com/simibubi/create/content/contraptions/components/saw/SawGenerator.java similarity index 89% rename from src/main/java/com/simibubi/create/modules/contraptions/components/saw/SawGenerator.java rename to src/main/java/com/simibubi/create/content/contraptions/components/saw/SawGenerator.java index 2beeb5ca8..af03a78c4 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/saw/SawGenerator.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/saw/SawGenerator.java @@ -1,6 +1,6 @@ -package com.simibubi.create.modules.contraptions.components.saw; +package com.simibubi.create.content.contraptions.components.saw; -import com.simibubi.create.foundation.utility.data.SpecialBlockStateGen; +import com.simibubi.create.foundation.data.SpecialBlockStateGen; import com.tterrag.registrate.providers.DataGenContext; import com.tterrag.registrate.providers.RegistrateBlockstateProvider; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/saw/SawTileEntity.java b/src/main/java/com/simibubi/create/content/contraptions/components/saw/SawTileEntity.java similarity index 95% rename from src/main/java/com/simibubi/create/modules/contraptions/components/saw/SawTileEntity.java rename to src/main/java/com/simibubi/create/content/contraptions/components/saw/SawTileEntity.java index 7f78c2776..aa60a7f9e 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/saw/SawTileEntity.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/saw/SawTileEntity.java @@ -1,6 +1,6 @@ -package com.simibubi.create.modules.contraptions.components.saw; +package com.simibubi.create.content.contraptions.components.saw; -import static com.simibubi.create.modules.contraptions.components.saw.SawBlock.RUNNING; +import static com.simibubi.create.content.contraptions.components.saw.SawBlock.RUNNING; import java.util.ArrayList; import java.util.LinkedList; @@ -9,20 +9,20 @@ import java.util.Random; import java.util.stream.Collectors; import com.simibubi.create.AllBlocks; -import com.simibubi.create.AllRecipes; +import com.simibubi.create.AllRecipeTypes; import com.simibubi.create.AllTileEntities; -import com.simibubi.create.foundation.behaviour.base.TileEntityBehaviour; -import com.simibubi.create.foundation.behaviour.filtering.FilteringBehaviour; +import com.simibubi.create.content.contraptions.components.actors.BlockBreakingKineticTileEntity; +import com.simibubi.create.content.contraptions.processing.ProcessingInventory; +import com.simibubi.create.content.contraptions.relays.belt.BeltTileEntity; import com.simibubi.create.foundation.item.ItemHelper; +import com.simibubi.create.foundation.tileEntity.TileEntityBehaviour; +import com.simibubi.create.foundation.tileEntity.behaviour.filtering.FilteringBehaviour; import com.simibubi.create.foundation.utility.BlockHelper; import com.simibubi.create.foundation.utility.TreeCutter; import com.simibubi.create.foundation.utility.TreeCutter.Tree; 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.components.actors.BlockBreakingKineticTileEntity; -import com.simibubi.create.modules.contraptions.processing.ProcessingInventory; -import com.simibubi.create.modules.contraptions.relays.belt.BeltTileEntity; import net.minecraft.block.BambooBlock; import net.minecraft.block.Block; @@ -294,7 +294,7 @@ public class SawTileEntity extends BlockBreakingKineticTileEntity { private List> getRecipes() { List> startedSearch = RecipeFinder.get(cuttingRecipesKey, world, - RecipeConditions.isOfType(IRecipeType.STONECUTTING, AllRecipes.CUTTING.getType())); + RecipeConditions.isOfType(IRecipeType.STONECUTTING, AllRecipeTypes.CUTTING.getType())); return startedSearch.stream().filter(RecipeConditions.outputMatchesFilter(filtering)) .filter(RecipeConditions.firstIngredientMatches(inventory.getStackInSlot(0))) .collect(Collectors.toList()); diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/saw/SawTileEntityRenderer.java b/src/main/java/com/simibubi/create/content/contraptions/components/saw/SawTileEntityRenderer.java similarity index 91% rename from src/main/java/com/simibubi/create/modules/contraptions/components/saw/SawTileEntityRenderer.java rename to src/main/java/com/simibubi/create/content/contraptions/components/saw/SawTileEntityRenderer.java index 66efc8034..23a6416fa 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/saw/SawTileEntityRenderer.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/saw/SawTileEntityRenderer.java @@ -1,15 +1,15 @@ -package com.simibubi.create.modules.contraptions.components.saw; +package com.simibubi.create.content.contraptions.components.saw; import static net.minecraft.state.properties.BlockStateProperties.FACING; import com.mojang.blaze3d.matrix.MatrixStack; import com.simibubi.create.AllBlockPartials; import com.simibubi.create.CreateClient; -import com.simibubi.create.foundation.behaviour.filtering.FilteringRenderer; -import com.simibubi.create.foundation.block.SafeTileEntityRenderer; +import com.simibubi.create.content.contraptions.base.KineticTileEntity; +import com.simibubi.create.content.contraptions.base.KineticTileEntityRenderer; +import com.simibubi.create.foundation.tileEntity.behaviour.filtering.FilteringRenderer; +import com.simibubi.create.foundation.tileEntity.renderer.SafeTileEntityRenderer; import com.simibubi.create.foundation.utility.SuperByteBuffer; -import com.simibubi.create.modules.contraptions.base.KineticTileEntity; -import com.simibubi.create.modules.contraptions.base.KineticTileEntityRenderer; import net.minecraft.block.BlockState; import net.minecraft.client.Minecraft; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/AllContraptionTypes.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/AllContraptionTypes.java similarity index 54% rename from src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/AllContraptionTypes.java rename to src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/AllContraptionTypes.java index 70ebec4c6..ba213a14d 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/AllContraptionTypes.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/AllContraptionTypes.java @@ -1,13 +1,13 @@ -package com.simibubi.create.modules.contraptions.components.contraptions; +package com.simibubi.create.content.contraptions.components.structureMovement; import java.util.function.Supplier; +import com.simibubi.create.content.contraptions.components.structureMovement.bearing.BearingContraption; +import com.simibubi.create.content.contraptions.components.structureMovement.bearing.ClockworkContraption; +import com.simibubi.create.content.contraptions.components.structureMovement.mounted.MountedContraption; +import com.simibubi.create.content.contraptions.components.structureMovement.piston.PistonContraption; +import com.simibubi.create.content.contraptions.components.structureMovement.pulley.PulleyContraption; import com.simibubi.create.foundation.utility.Lang; -import com.simibubi.create.modules.contraptions.components.contraptions.bearing.BearingContraption; -import com.simibubi.create.modules.contraptions.components.contraptions.bearing.ClockworkContraption; -import com.simibubi.create.modules.contraptions.components.contraptions.mounted.MountedContraption; -import com.simibubi.create.modules.contraptions.components.contraptions.piston.PistonContraption; -import com.simibubi.create.modules.contraptions.components.contraptions.pulley.PulleyContraption; public enum AllContraptionTypes { diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/BlockMovementTraits.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/BlockMovementTraits.java similarity index 80% rename from src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/BlockMovementTraits.java rename to src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/BlockMovementTraits.java index 98871af6c..7c0c6e6f2 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/BlockMovementTraits.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/BlockMovementTraits.java @@ -1,28 +1,28 @@ -package com.simibubi.create.modules.contraptions.components.contraptions; +package com.simibubi.create.content.contraptions.components.structureMovement; import com.simibubi.create.AllBlocks; -import com.simibubi.create.modules.contraptions.components.actors.AttachedActorBlock; -import com.simibubi.create.modules.contraptions.components.actors.HarvesterBlock; -import com.simibubi.create.modules.contraptions.components.actors.PortableStorageInterfaceBlock; -import com.simibubi.create.modules.contraptions.components.contraptions.bearing.ClockworkBearingBlock; -import com.simibubi.create.modules.contraptions.components.contraptions.bearing.ClockworkBearingTileEntity; -import com.simibubi.create.modules.contraptions.components.contraptions.bearing.MechanicalBearingBlock; -import com.simibubi.create.modules.contraptions.components.contraptions.bearing.MechanicalBearingTileEntity; -import com.simibubi.create.modules.contraptions.components.contraptions.chassis.AbstractChassisBlock; -import com.simibubi.create.modules.contraptions.components.contraptions.piston.MechanicalPistonBlock; -import com.simibubi.create.modules.contraptions.components.contraptions.piston.MechanicalPistonBlock.PistonState; -import com.simibubi.create.modules.contraptions.components.contraptions.pulley.PulleyBlock; -import com.simibubi.create.modules.contraptions.components.contraptions.pulley.PulleyBlock.MagnetBlock; -import com.simibubi.create.modules.contraptions.components.contraptions.pulley.PulleyBlock.RopeBlock; -import com.simibubi.create.modules.contraptions.components.contraptions.pulley.PulleyTileEntity; -import com.simibubi.create.modules.contraptions.components.crank.HandCrankBlock; -import com.simibubi.create.modules.contraptions.components.fan.NozzleBlock; -import com.simibubi.create.modules.contraptions.components.flywheel.engine.EngineBlock; -import com.simibubi.create.modules.logistics.block.AttachedLogisticalBlock; -import com.simibubi.create.modules.logistics.block.RedstoneLinkBlock; -import com.simibubi.create.modules.logistics.block.extractor.ExtractorBlock; -import com.simibubi.create.modules.logistics.block.funnel.FunnelBlock; -import com.simibubi.create.modules.logistics.block.transposer.TransposerBlock; +import com.simibubi.create.content.contraptions.components.actors.AttachedActorBlock; +import com.simibubi.create.content.contraptions.components.actors.HarvesterBlock; +import com.simibubi.create.content.contraptions.components.actors.PortableStorageInterfaceBlock; +import com.simibubi.create.content.contraptions.components.crank.HandCrankBlock; +import com.simibubi.create.content.contraptions.components.fan.NozzleBlock; +import com.simibubi.create.content.contraptions.components.flywheel.engine.EngineBlock; +import com.simibubi.create.content.contraptions.components.structureMovement.bearing.ClockworkBearingBlock; +import com.simibubi.create.content.contraptions.components.structureMovement.bearing.ClockworkBearingTileEntity; +import com.simibubi.create.content.contraptions.components.structureMovement.bearing.MechanicalBearingBlock; +import com.simibubi.create.content.contraptions.components.structureMovement.bearing.MechanicalBearingTileEntity; +import com.simibubi.create.content.contraptions.components.structureMovement.chassis.AbstractChassisBlock; +import com.simibubi.create.content.contraptions.components.structureMovement.piston.MechanicalPistonBlock; +import com.simibubi.create.content.contraptions.components.structureMovement.piston.MechanicalPistonBlock.PistonState; +import com.simibubi.create.content.contraptions.components.structureMovement.pulley.PulleyBlock; +import com.simibubi.create.content.contraptions.components.structureMovement.pulley.PulleyTileEntity; +import com.simibubi.create.content.contraptions.components.structureMovement.pulley.PulleyBlock.MagnetBlock; +import com.simibubi.create.content.contraptions.components.structureMovement.pulley.PulleyBlock.RopeBlock; +import com.simibubi.create.content.logistics.block.AttachedLogisticalBlock; +import com.simibubi.create.content.logistics.block.extractor.ExtractorBlock; +import com.simibubi.create.content.logistics.block.funnel.FunnelBlock; +import com.simibubi.create.content.logistics.block.redstone.RedstoneLinkBlock; +import com.simibubi.create.content.logistics.block.transposer.TransposerBlock; import net.minecraft.block.AbstractPressurePlateBlock; import net.minecraft.block.AbstractRailBlock; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/CancelPlayerFallPacket.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/CancelPlayerFallPacket.java similarity index 83% rename from src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/CancelPlayerFallPacket.java rename to src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/CancelPlayerFallPacket.java index 3833d0e4a..71cac0863 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/CancelPlayerFallPacket.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/CancelPlayerFallPacket.java @@ -1,8 +1,8 @@ -package com.simibubi.create.modules.contraptions.components.contraptions; +package com.simibubi.create.content.contraptions.components.structureMovement; import java.util.function.Supplier; -import com.simibubi.create.foundation.packet.SimplePacketBase; +import com.simibubi.create.foundation.networking.SimplePacketBase; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.network.PacketBuffer; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/ChassisRangeDisplay.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ChassisRangeDisplay.java similarity index 96% rename from src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/ChassisRangeDisplay.java rename to src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ChassisRangeDisplay.java index 3069a5874..78a31b657 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/ChassisRangeDisplay.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ChassisRangeDisplay.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.contraptions.components.contraptions; +package com.simibubi.create.content.contraptions.components.structureMovement; import java.util.ArrayList; import java.util.Collections; @@ -14,7 +14,7 @@ import com.simibubi.create.AllItems; import com.simibubi.create.AllKeys; import com.simibubi.create.AllSpecialTextures; import com.simibubi.create.CreateClient; -import com.simibubi.create.modules.contraptions.components.contraptions.chassis.ChassisTileEntity; +import com.simibubi.create.content.contraptions.components.structureMovement.chassis.ChassisTileEntity; import net.minecraft.client.Minecraft; import net.minecraft.entity.player.PlayerEntity; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/Contraption.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/Contraption.java similarity index 92% rename from src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/Contraption.java rename to src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/Contraption.java index 9ce8185b7..38b3dc708 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/Contraption.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/Contraption.java @@ -1,7 +1,7 @@ -package com.simibubi.create.modules.contraptions.components.contraptions; +package com.simibubi.create.content.contraptions.components.structureMovement; -import static com.simibubi.create.modules.contraptions.components.contraptions.piston.MechanicalPistonBlock.isExtensionPole; -import static com.simibubi.create.modules.contraptions.components.contraptions.piston.MechanicalPistonBlock.isPistonHead; +import static com.simibubi.create.content.contraptions.components.structureMovement.piston.MechanicalPistonBlock.isExtensionPole; +import static com.simibubi.create.content.contraptions.components.structureMovement.piston.MechanicalPistonBlock.isPistonHead; import java.util.ArrayList; import java.util.Arrays; @@ -21,27 +21,27 @@ import org.apache.commons.lang3.tuple.MutablePair; import org.apache.commons.lang3.tuple.Pair; import com.simibubi.create.AllBlocks; -import com.simibubi.create.config.AllConfigs; +import com.simibubi.create.content.contraptions.base.KineticTileEntity; +import com.simibubi.create.content.contraptions.components.saw.SawBlock; +import com.simibubi.create.content.contraptions.components.structureMovement.chassis.AbstractChassisBlock; +import com.simibubi.create.content.contraptions.components.structureMovement.chassis.ChassisTileEntity; +import com.simibubi.create.content.contraptions.components.structureMovement.glue.SuperGlueEntity; +import com.simibubi.create.content.contraptions.components.structureMovement.glue.SuperGlueHandler; +import com.simibubi.create.content.contraptions.components.structureMovement.piston.MechanicalPistonBlock; +import com.simibubi.create.content.contraptions.components.structureMovement.piston.PistonExtensionPoleBlock; +import com.simibubi.create.content.contraptions.components.structureMovement.piston.MechanicalPistonBlock.PistonState; +import com.simibubi.create.content.contraptions.components.structureMovement.pulley.PulleyBlock; +import com.simibubi.create.content.contraptions.components.structureMovement.pulley.PulleyTileEntity; +import com.simibubi.create.content.contraptions.components.structureMovement.pulley.PulleyBlock.MagnetBlock; +import com.simibubi.create.content.contraptions.components.structureMovement.pulley.PulleyBlock.RopeBlock; +import com.simibubi.create.content.contraptions.relays.belt.BeltBlock; +import com.simibubi.create.content.logistics.block.inventories.AdjustableCrateBlock; +import com.simibubi.create.content.logistics.block.redstone.RedstoneContactBlock; +import com.simibubi.create.foundation.config.AllConfigs; import com.simibubi.create.foundation.utility.Iterate; import com.simibubi.create.foundation.utility.NBTHelper; import com.simibubi.create.foundation.utility.VecHelper; -import com.simibubi.create.foundation.utility.WrappedWorld; -import com.simibubi.create.modules.contraptions.base.KineticTileEntity; -import com.simibubi.create.modules.contraptions.components.contraptions.chassis.AbstractChassisBlock; -import com.simibubi.create.modules.contraptions.components.contraptions.chassis.ChassisTileEntity; -import com.simibubi.create.modules.contraptions.components.contraptions.glue.SuperGlueEntity; -import com.simibubi.create.modules.contraptions.components.contraptions.glue.SuperGlueHandler; -import com.simibubi.create.modules.contraptions.components.contraptions.piston.MechanicalPistonBlock; -import com.simibubi.create.modules.contraptions.components.contraptions.piston.MechanicalPistonBlock.PistonState; -import com.simibubi.create.modules.contraptions.components.contraptions.piston.PistonExtensionPoleBlock; -import com.simibubi.create.modules.contraptions.components.contraptions.pulley.PulleyBlock; -import com.simibubi.create.modules.contraptions.components.contraptions.pulley.PulleyBlock.MagnetBlock; -import com.simibubi.create.modules.contraptions.components.contraptions.pulley.PulleyBlock.RopeBlock; -import com.simibubi.create.modules.contraptions.components.contraptions.pulley.PulleyTileEntity; -import com.simibubi.create.modules.contraptions.components.saw.SawBlock; -import com.simibubi.create.modules.contraptions.redstone.RedstoneContactBlock; -import com.simibubi.create.modules.contraptions.relays.belt.BeltBlock; -import com.simibubi.create.modules.logistics.block.inventories.AdjustableCrateBlock; +import com.simibubi.create.foundation.utility.worldWrappers.WrappedWorld; import net.minecraft.block.AbstractButtonBlock; import net.minecraft.block.Block; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/ContraptionCollider.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ContraptionCollider.java similarity index 98% rename from src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/ContraptionCollider.java rename to src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ContraptionCollider.java index b9bd87e56..768d7a906 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/ContraptionCollider.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ContraptionCollider.java @@ -1,10 +1,10 @@ -package com.simibubi.create.modules.contraptions.components.contraptions; +package com.simibubi.create.content.contraptions.components.structureMovement; import java.util.HashMap; import java.util.Map; import com.simibubi.create.AllBlocks; -import com.simibubi.create.modules.contraptions.components.actors.BlockBreakingMovementBehaviour; +import com.simibubi.create.content.contraptions.components.actors.BlockBreakingMovementBehaviour; import net.minecraft.block.BlockState; import net.minecraft.block.CocoaBlock; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/ContraptionEntity.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ContraptionEntity.java similarity index 95% rename from src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/ContraptionEntity.java rename to src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ContraptionEntity.java index ad73c40e6..f137d7a5c 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/ContraptionEntity.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ContraptionEntity.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.contraptions.components.contraptions; +package com.simibubi.create.content.contraptions.components.structureMovement; import static com.simibubi.create.foundation.utility.AngleHelper.angleLerp; import static com.simibubi.create.foundation.utility.AngleHelper.getShortestAngleDiff; @@ -10,15 +10,15 @@ import java.util.stream.Stream; import org.apache.commons.lang3.tuple.MutablePair; import com.google.common.collect.ImmutableSet; -import com.simibubi.create.AllEntities; -import com.simibubi.create.AllPackets; +import com.simibubi.create.AllEntityTypes; +import com.simibubi.create.content.contraptions.components.structureMovement.bearing.BearingContraption; +import com.simibubi.create.content.contraptions.components.structureMovement.mounted.MountedContraption; +import com.simibubi.create.content.contraptions.components.structureMovement.mounted.CartAssemblerTileEntity.CartMovementMode; +import com.simibubi.create.content.contraptions.components.structureMovement.piston.LinearActuatorTileEntity; import com.simibubi.create.foundation.item.ItemHelper; +import com.simibubi.create.foundation.networking.AllPackets; import com.simibubi.create.foundation.utility.AngleHelper; import com.simibubi.create.foundation.utility.VecHelper; -import com.simibubi.create.modules.contraptions.components.contraptions.bearing.BearingContraption; -import com.simibubi.create.modules.contraptions.components.contraptions.mounted.CartAssemblerTileEntity.CartMovementMode; -import com.simibubi.create.modules.contraptions.components.contraptions.mounted.MountedContraption; -import com.simibubi.create.modules.contraptions.components.contraptions.piston.LinearActuatorTileEntity; import net.minecraft.block.BlockState; import net.minecraft.block.material.PushReaction; @@ -89,12 +89,12 @@ public class ContraptionEntity extends Entity implements IEntityAdditionalSpawnD public ContraptionEntity(EntityType entityTypeIn, World worldIn) { super(entityTypeIn, worldIn); motionBeforeStall = Vec3d.ZERO; - stationary = entityTypeIn == AllEntities.STATIONARY_CONTRAPTION.type; + stationary = entityTypeIn == AllEntityTypes.STATIONARY_CONTRAPTION.type; forcedAngle = -1; } public static ContraptionEntity createMounted(World world, Contraption contraption, float initialAngle) { - ContraptionEntity entity = new ContraptionEntity(AllEntities.CONTRAPTION.type, world); + ContraptionEntity entity = new ContraptionEntity(AllEntityTypes.CONTRAPTION.type, world); entity.contraption = contraption; entity.initialAngle = initialAngle; entity.forceYaw(initialAngle); @@ -112,7 +112,7 @@ public class ContraptionEntity extends Entity implements IEntityAdditionalSpawnD } public static ContraptionEntity createStationary(World world, Contraption contraption) { - ContraptionEntity entity = new ContraptionEntity(AllEntities.STATIONARY_CONTRAPTION.type, world); + ContraptionEntity entity = new ContraptionEntity(AllEntityTypes.STATIONARY_CONTRAPTION.type, world); entity.contraption = contraption; if (contraption != null) contraption.gatherStoredItems(); diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/ContraptionEntityRenderer.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ContraptionEntityRenderer.java similarity index 98% rename from src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/ContraptionEntityRenderer.java rename to src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ContraptionEntityRenderer.java index 9b062e6c1..af6d84792 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/ContraptionEntityRenderer.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ContraptionEntityRenderer.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.contraptions.components.contraptions; +package com.simibubi.create.content.contraptions.components.structureMovement; import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.platform.GlStateManager; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/ContraptionRenderer.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ContraptionRenderer.java similarity index 93% rename from src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/ContraptionRenderer.java rename to src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ContraptionRenderer.java index 8fab0d322..cf7742bbc 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/ContraptionRenderer.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ContraptionRenderer.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.contraptions.components.contraptions; +package com.simibubi.create.content.contraptions.components.structureMovement; import java.util.Random; import java.util.function.Consumer; @@ -8,10 +8,10 @@ import org.lwjgl.opengl.GL11; import com.mojang.blaze3d.matrix.MatrixStack; 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.foundation.utility.render.StructureRenderer; +import com.simibubi.create.foundation.utility.TileEntityRenderHelper; +import com.simibubi.create.foundation.utility.worldWrappers.PlacementSimulationWorld; import net.minecraft.block.BlockRenderType; import net.minecraft.block.BlockState; @@ -46,7 +46,7 @@ public class ContraptionRenderer { public static void renderTEsWithGL(World world, Contraption c, Vec3d position, Vec3d rotation, MatrixStack ms, IRenderTypeBuffer buffer) { - StructureRenderer.renderTileEntities(world, position, rotation, c.customRenderTEs, ms, buffer); + TileEntityRenderHelper.renderTileEntities(world, position, rotation, c.customRenderTEs, ms, buffer); } private static SuperByteBuffer renderContraption(Contraption c, MatrixStack ms) { diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/ContraptionStallPacket.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ContraptionStallPacket.java similarity index 90% rename from src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/ContraptionStallPacket.java rename to src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ContraptionStallPacket.java index ac397422d..4564236c2 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/ContraptionStallPacket.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ContraptionStallPacket.java @@ -1,8 +1,8 @@ -package com.simibubi.create.modules.contraptions.components.contraptions; +package com.simibubi.create.content.contraptions.components.structureMovement; import java.util.function.Supplier; -import com.simibubi.create.foundation.packet.SimplePacketBase; +import com.simibubi.create.foundation.networking.SimplePacketBase; import net.minecraft.network.PacketBuffer; import net.minecraftforge.api.distmarker.Dist; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/DirectionalExtenderScrollOptionSlot.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/DirectionalExtenderScrollOptionSlot.java similarity index 86% rename from src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/DirectionalExtenderScrollOptionSlot.java rename to src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/DirectionalExtenderScrollOptionSlot.java index d09cb8bfe..3077cda11 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/DirectionalExtenderScrollOptionSlot.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/DirectionalExtenderScrollOptionSlot.java @@ -1,9 +1,9 @@ -package com.simibubi.create.modules.contraptions.components.contraptions; +package com.simibubi.create.content.contraptions.components.structureMovement; import java.util.function.BiPredicate; import com.mojang.blaze3d.matrix.MatrixStack; -import com.simibubi.create.foundation.behaviour.CenteredSideValueBoxTransform; +import com.simibubi.create.foundation.tileEntity.behaviour.CenteredSideValueBoxTransform; import com.simibubi.create.foundation.utility.AngleHelper; import com.simibubi.create.foundation.utility.VecHelper; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/IControlContraption.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/IControlContraption.java similarity index 54% rename from src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/IControlContraption.java rename to src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/IControlContraption.java index 1af2b453f..07a7fde89 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/IControlContraption.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/IControlContraption.java @@ -1,7 +1,7 @@ -package com.simibubi.create.modules.contraptions.components.contraptions; +package com.simibubi.create.content.contraptions.components.structureMovement; -import com.simibubi.create.ScreenResources; -import com.simibubi.create.foundation.behaviour.scrollvalue.INamedIconOptions; +import com.simibubi.create.foundation.gui.AllIcons; +import com.simibubi.create.foundation.tileEntity.behaviour.scrollvalue.INamedIconOptions; import com.simibubi.create.foundation.utility.Lang; public interface IControlContraption { @@ -16,22 +16,22 @@ public interface IControlContraption { static enum MovementMode implements INamedIconOptions { - MOVE_PLACE(ScreenResources.I_MOVE_PLACE), - MOVE_PLACE_RETURNED(ScreenResources.I_MOVE_PLACE_RETURNED), - MOVE_NEVER_PLACE(ScreenResources.I_MOVE_NEVER_PLACE), + MOVE_PLACE(AllIcons.I_MOVE_PLACE), + MOVE_PLACE_RETURNED(AllIcons.I_MOVE_PLACE_RETURNED), + MOVE_NEVER_PLACE(AllIcons.I_MOVE_NEVER_PLACE), ; private String translationKey; - private ScreenResources icon; + private AllIcons icon; - private MovementMode(ScreenResources icon) { + private MovementMode(AllIcons icon) { this.icon = icon; translationKey = "contraptions.movement_mode." + Lang.asId(name()); } @Override - public ScreenResources getIcon() { + public AllIcons getIcon() { return icon; } @@ -44,22 +44,22 @@ public interface IControlContraption { static enum RotationMode implements INamedIconOptions { - ROTATE_PLACE(ScreenResources.I_ROTATE_PLACE), - ROTATE_PLACE_RETURNED(ScreenResources.I_ROTATE_PLACE_RETURNED), - ROTATE_NEVER_PLACE(ScreenResources.I_ROTATE_NEVER_PLACE), + ROTATE_PLACE(AllIcons.I_ROTATE_PLACE), + ROTATE_PLACE_RETURNED(AllIcons.I_ROTATE_PLACE_RETURNED), + ROTATE_NEVER_PLACE(AllIcons.I_ROTATE_NEVER_PLACE), ; private String translationKey; - private ScreenResources icon; + private AllIcons icon; - private RotationMode(ScreenResources icon) { + private RotationMode(AllIcons icon) { this.icon = icon; translationKey = "contraptions.movement_mode." + Lang.asId(name()); } @Override - public ScreenResources getIcon() { + public AllIcons getIcon() { return icon; } diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/IPortableBlock.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/IPortableBlock.java similarity index 53% rename from src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/IPortableBlock.java rename to src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/IPortableBlock.java index e564c3052..8c889fb12 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/IPortableBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/IPortableBlock.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.contraptions.components.contraptions; +package com.simibubi.create.content.contraptions.components.structureMovement; public interface IPortableBlock { diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/MountedStorage.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/MountedStorage.java similarity index 96% rename from src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/MountedStorage.java rename to src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/MountedStorage.java index 1432695f3..11cf6dbcb 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/MountedStorage.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/MountedStorage.java @@ -1,7 +1,7 @@ -package com.simibubi.create.modules.contraptions.components.contraptions; +package com.simibubi.create.content.contraptions.components.structureMovement; import com.simibubi.create.AllTileEntities; -import com.simibubi.create.modules.logistics.block.inventories.AdjustableCrateBlock; +import com.simibubi.create.content.logistics.block.inventories.AdjustableCrateBlock; import net.minecraft.block.ChestBlock; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/MovementBehaviour.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/MovementBehaviour.java similarity index 95% rename from src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/MovementBehaviour.java rename to src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/MovementBehaviour.java index 72c55bd2e..1664bec63 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/MovementBehaviour.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/MovementBehaviour.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.contraptions.components.contraptions; +package com.simibubi.create.content.contraptions.components.structureMovement; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/MovementContext.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/MovementContext.java similarity index 96% rename from src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/MovementContext.java rename to src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/MovementContext.java index ae8bbe420..8b1ad911f 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/MovementContext.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/MovementContext.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.contraptions.components.contraptions; +package com.simibubi.create.content.contraptions.components.structureMovement; import com.simibubi.create.foundation.utility.VecHelper; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/StructureTransform.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/StructureTransform.java similarity index 95% rename from src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/StructureTransform.java rename to src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/StructureTransform.java index 4484ebcb8..2f8e8311f 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/StructureTransform.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/StructureTransform.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.contraptions.components.contraptions; +package com.simibubi.create.content.contraptions.components.structureMovement; import static net.minecraft.block.HorizontalFaceBlock.FACE; import static net.minecraft.state.properties.BlockStateProperties.AXIS; @@ -6,12 +6,12 @@ import static net.minecraft.state.properties.BlockStateProperties.FACING; import static net.minecraft.state.properties.BlockStateProperties.HORIZONTAL_FACING; import com.simibubi.create.AllBlocks; +import com.simibubi.create.content.contraptions.base.DirectionalAxisKineticBlock; +import com.simibubi.create.content.contraptions.components.structureMovement.chassis.AbstractChassisBlock; +import com.simibubi.create.content.contraptions.relays.belt.BeltBlock; +import com.simibubi.create.content.contraptions.relays.belt.BeltBlock.Slope; import com.simibubi.create.foundation.utility.DirectionHelper; import com.simibubi.create.foundation.utility.VecHelper; -import com.simibubi.create.modules.contraptions.base.DirectionalAxisKineticBlock; -import com.simibubi.create.modules.contraptions.components.contraptions.chassis.AbstractChassisBlock; -import com.simibubi.create.modules.contraptions.relays.belt.BeltBlock; -import com.simibubi.create.modules.contraptions.relays.belt.BeltBlock.Slope; import net.minecraft.block.BellBlock; import net.minecraft.block.Block; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/bearing/BearingBlock.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/BearingBlock.java similarity index 83% rename from src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/bearing/BearingBlock.java rename to src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/BearingBlock.java index e47b51152..c6490ae2c 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/bearing/BearingBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/BearingBlock.java @@ -1,6 +1,6 @@ -package com.simibubi.create.modules.contraptions.components.contraptions.bearing; +package com.simibubi.create.content.contraptions.components.structureMovement.bearing; -import com.simibubi.create.modules.contraptions.base.DirectionalKineticBlock; +import com.simibubi.create.content.contraptions.base.DirectionalKineticBlock; import net.minecraft.block.BlockState; import net.minecraft.util.Direction; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/bearing/BearingContraption.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/BearingContraption.java similarity index 87% rename from src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/bearing/BearingContraption.java rename to src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/BearingContraption.java index d32d89010..e77880345 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/bearing/BearingContraption.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/BearingContraption.java @@ -1,10 +1,10 @@ -package com.simibubi.create.modules.contraptions.components.contraptions.bearing; +package com.simibubi.create.content.contraptions.components.structureMovement.bearing; import org.apache.commons.lang3.tuple.Pair; import com.simibubi.create.AllBlockTags; -import com.simibubi.create.modules.contraptions.components.contraptions.AllContraptionTypes; -import com.simibubi.create.modules.contraptions.components.contraptions.Contraption; +import com.simibubi.create.content.contraptions.components.structureMovement.AllContraptionTypes; +import com.simibubi.create.content.contraptions.components.structureMovement.Contraption; import net.minecraft.nbt.CompoundNBT; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/bearing/BearingTileEntityRenderer.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/BearingTileEntityRenderer.java similarity index 89% rename from src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/bearing/BearingTileEntityRenderer.java rename to src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/BearingTileEntityRenderer.java index f111b64b7..222a7ec14 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/bearing/BearingTileEntityRenderer.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/BearingTileEntityRenderer.java @@ -1,11 +1,11 @@ -package com.simibubi.create.modules.contraptions.components.contraptions.bearing; +package com.simibubi.create.content.contraptions.components.structureMovement.bearing; import com.mojang.blaze3d.matrix.MatrixStack; import com.simibubi.create.AllBlockPartials; +import com.simibubi.create.content.contraptions.base.KineticTileEntity; +import com.simibubi.create.content.contraptions.base.KineticTileEntityRenderer; import com.simibubi.create.foundation.utility.AngleHelper; import com.simibubi.create.foundation.utility.SuperByteBuffer; -import com.simibubi.create.modules.contraptions.base.KineticTileEntity; -import com.simibubi.create.modules.contraptions.base.KineticTileEntityRenderer; import net.minecraft.client.renderer.IRenderTypeBuffer; import net.minecraft.client.renderer.RenderType; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/bearing/ClockworkBearingBlock.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/ClockworkBearingBlock.java similarity index 94% rename from src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/bearing/ClockworkBearingBlock.java rename to src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/ClockworkBearingBlock.java index 170710fc8..6456c3a44 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/bearing/ClockworkBearingBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/ClockworkBearingBlock.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.contraptions.components.contraptions.bearing; +package com.simibubi.create.content.contraptions.components.structureMovement.bearing; import com.simibubi.create.foundation.block.ITE; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/bearing/ClockworkBearingTileEntity.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/ClockworkBearingTileEntity.java similarity index 94% rename from src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/bearing/ClockworkBearingTileEntity.java rename to src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/ClockworkBearingTileEntity.java index 1f73f7449..3980a82f3 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/bearing/ClockworkBearingTileEntity.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/ClockworkBearingTileEntity.java @@ -1,14 +1,14 @@ -package com.simibubi.create.modules.contraptions.components.contraptions.bearing; +package com.simibubi.create.content.contraptions.components.structureMovement.bearing; import org.apache.commons.lang3.tuple.Pair; import com.simibubi.create.AllTileEntities; +import com.simibubi.create.content.contraptions.base.KineticTileEntity; +import com.simibubi.create.content.contraptions.components.structureMovement.Contraption; +import com.simibubi.create.content.contraptions.components.structureMovement.ContraptionEntity; +import com.simibubi.create.content.contraptions.components.structureMovement.bearing.ClockworkContraption.HandType; import com.simibubi.create.foundation.utility.AngleHelper; import com.simibubi.create.foundation.utility.ServerSpeedProvider; -import com.simibubi.create.modules.contraptions.base.KineticTileEntity; -import com.simibubi.create.modules.contraptions.components.contraptions.Contraption; -import com.simibubi.create.modules.contraptions.components.contraptions.ContraptionEntity; -import com.simibubi.create.modules.contraptions.components.contraptions.bearing.ClockworkContraption.HandType; import net.minecraft.nbt.CompoundNBT; import net.minecraft.state.properties.BlockStateProperties; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/bearing/ClockworkContraption.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/ClockworkContraption.java similarity index 92% rename from src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/bearing/ClockworkContraption.java rename to src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/ClockworkContraption.java index e31759ed6..833a51d42 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/bearing/ClockworkContraption.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/ClockworkContraption.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.contraptions.components.contraptions.bearing; +package com.simibubi.create.content.contraptions.components.structureMovement.bearing; import java.util.HashSet; import java.util.List; @@ -6,9 +6,9 @@ import java.util.Set; import org.apache.commons.lang3.tuple.Pair; +import com.simibubi.create.content.contraptions.components.structureMovement.AllContraptionTypes; +import com.simibubi.create.content.contraptions.components.structureMovement.Contraption; import com.simibubi.create.foundation.utility.NBTHelper; -import com.simibubi.create.modules.contraptions.components.contraptions.AllContraptionTypes; -import com.simibubi.create.modules.contraptions.components.contraptions.Contraption; import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.Direction; diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/IBearingTileEntity.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/IBearingTileEntity.java new file mode 100644 index 000000000..efaad9ead --- /dev/null +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/IBearingTileEntity.java @@ -0,0 +1,9 @@ +package com.simibubi.create.content.contraptions.components.structureMovement.bearing; + +import com.simibubi.create.content.contraptions.components.structureMovement.IControlContraption; + +public interface IBearingTileEntity extends IControlContraption { + + float getInterpolatedAngle(float partialTicks); + +} diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/bearing/MechanicalBearingBlock.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/MechanicalBearingBlock.java similarity index 92% rename from src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/bearing/MechanicalBearingBlock.java rename to src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/MechanicalBearingBlock.java index a7034436d..59b46461f 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/bearing/MechanicalBearingBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/MechanicalBearingBlock.java @@ -1,7 +1,7 @@ -package com.simibubi.create.modules.contraptions.components.contraptions.bearing; +package com.simibubi.create.content.contraptions.components.structureMovement.bearing; import com.simibubi.create.foundation.block.ITE; -import com.simibubi.create.foundation.utility.WrappedWorld; +import com.simibubi.create.foundation.utility.worldWrappers.WrappedWorld; import net.minecraft.block.Block; import net.minecraft.block.BlockState; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/bearing/MechanicalBearingTileEntity.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/MechanicalBearingTileEntity.java similarity index 91% rename from src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/bearing/MechanicalBearingTileEntity.java rename to src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/MechanicalBearingTileEntity.java index 53e79e884..18a463fea 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/bearing/MechanicalBearingTileEntity.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/MechanicalBearingTileEntity.java @@ -1,20 +1,20 @@ -package com.simibubi.create.modules.contraptions.components.contraptions.bearing; +package com.simibubi.create.content.contraptions.components.structureMovement.bearing; import static net.minecraft.state.properties.BlockStateProperties.FACING; import java.util.List; import com.simibubi.create.AllTileEntities; -import com.simibubi.create.foundation.behaviour.ValueBoxTransform; -import com.simibubi.create.foundation.behaviour.base.TileEntityBehaviour; -import com.simibubi.create.foundation.behaviour.scrollvalue.ScrollOptionBehaviour; +import com.simibubi.create.content.contraptions.base.GeneratingKineticTileEntity; +import com.simibubi.create.content.contraptions.components.structureMovement.Contraption; +import com.simibubi.create.content.contraptions.components.structureMovement.ContraptionEntity; +import com.simibubi.create.content.contraptions.components.structureMovement.DirectionalExtenderScrollOptionSlot; +import com.simibubi.create.foundation.tileEntity.TileEntityBehaviour; +import com.simibubi.create.foundation.tileEntity.behaviour.ValueBoxTransform; +import com.simibubi.create.foundation.tileEntity.behaviour.scrollvalue.ScrollOptionBehaviour; import com.simibubi.create.foundation.utility.AngleHelper; import com.simibubi.create.foundation.utility.Lang; import com.simibubi.create.foundation.utility.ServerSpeedProvider; -import com.simibubi.create.modules.contraptions.base.GeneratingKineticTileEntity; -import com.simibubi.create.modules.contraptions.components.contraptions.Contraption; -import com.simibubi.create.modules.contraptions.components.contraptions.ContraptionEntity; -import com.simibubi.create.modules.contraptions.components.contraptions.DirectionalExtenderScrollOptionSlot; import net.minecraft.block.BlockState; import net.minecraft.nbt.CompoundNBT; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/chassis/AbstractChassisBlock.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/chassis/AbstractChassisBlock.java similarity index 96% rename from src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/chassis/AbstractChassisBlock.java rename to src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/chassis/AbstractChassisBlock.java index 5035b88d7..c4c3b8285 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/chassis/AbstractChassisBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/chassis/AbstractChassisBlock.java @@ -1,8 +1,8 @@ -package com.simibubi.create.modules.contraptions.components.contraptions.chassis; +package com.simibubi.create.content.contraptions.components.structureMovement.chassis; import com.simibubi.create.AllItems; import com.simibubi.create.AllSoundEvents; -import com.simibubi.create.modules.contraptions.IWrenchable; +import com.simibubi.create.content.contraptions.wrench.IWrenchable; import net.minecraft.block.BlockState; import net.minecraft.block.RotatedPillarBlock; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/chassis/ChassisTileEntity.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/chassis/ChassisTileEntity.java similarity index 90% rename from src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/chassis/ChassisTileEntity.java rename to src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/chassis/ChassisTileEntity.java index a2bb592cc..a4a37396c 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/chassis/ChassisTileEntity.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/chassis/ChassisTileEntity.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.contraptions.components.contraptions.chassis; +package com.simibubi.create.content.contraptions.components.structureMovement.chassis; import static net.minecraft.state.properties.BlockStateProperties.AXIS; @@ -11,15 +11,15 @@ import java.util.Set; import com.simibubi.create.AllBlocks; import com.simibubi.create.AllTileEntities; -import com.simibubi.create.config.AllConfigs; -import com.simibubi.create.foundation.behaviour.CenteredSideValueBoxTransform; -import com.simibubi.create.foundation.behaviour.base.SmartTileEntity; -import com.simibubi.create.foundation.behaviour.base.TileEntityBehaviour; -import com.simibubi.create.foundation.behaviour.scrollvalue.BulkScrollValueBehaviour; -import com.simibubi.create.foundation.behaviour.scrollvalue.ScrollValueBehaviour; +import com.simibubi.create.content.contraptions.components.structureMovement.BlockMovementTraits; +import com.simibubi.create.content.contraptions.components.structureMovement.ChassisRangeDisplay; +import com.simibubi.create.foundation.config.AllConfigs; +import com.simibubi.create.foundation.tileEntity.SmartTileEntity; +import com.simibubi.create.foundation.tileEntity.TileEntityBehaviour; +import com.simibubi.create.foundation.tileEntity.behaviour.CenteredSideValueBoxTransform; +import com.simibubi.create.foundation.tileEntity.behaviour.scrollvalue.BulkScrollValueBehaviour; +import com.simibubi.create.foundation.tileEntity.behaviour.scrollvalue.ScrollValueBehaviour; import com.simibubi.create.foundation.utility.Lang; -import com.simibubi.create.modules.contraptions.components.contraptions.BlockMovementTraits; -import com.simibubi.create.modules.contraptions.components.contraptions.ChassisRangeDisplay; import net.minecraft.block.BlockState; import net.minecraft.state.properties.BlockStateProperties; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/chassis/LinearChassisBlock.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/chassis/LinearChassisBlock.java similarity index 97% rename from src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/chassis/LinearChassisBlock.java rename to src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/chassis/LinearChassisBlock.java index 6b7c1b3fa..b42285124 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/chassis/LinearChassisBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/chassis/LinearChassisBlock.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.contraptions.components.contraptions.chassis; +package com.simibubi.create.content.contraptions.components.structureMovement.chassis; import com.simibubi.create.AllBlocks; import com.simibubi.create.AllSpriteShifts; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/chassis/RadialChassisBlock.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/chassis/RadialChassisBlock.java similarity index 95% rename from src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/chassis/RadialChassisBlock.java rename to src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/chassis/RadialChassisBlock.java index 7529b113f..852c168bb 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/chassis/RadialChassisBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/chassis/RadialChassisBlock.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.contraptions.components.contraptions.chassis; +package com.simibubi.create.content.contraptions.components.structureMovement.chassis; import net.minecraft.block.Block; import net.minecraft.block.BlockState; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/glue/GlueEffectPacket.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/glue/GlueEffectPacket.java similarity index 90% rename from src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/glue/GlueEffectPacket.java rename to src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/glue/GlueEffectPacket.java index fd15c0be4..d2d6c6917 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/glue/GlueEffectPacket.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/glue/GlueEffectPacket.java @@ -1,8 +1,8 @@ -package com.simibubi.create.modules.contraptions.components.contraptions.glue; +package com.simibubi.create.content.contraptions.components.structureMovement.glue; import java.util.function.Supplier; -import com.simibubi.create.foundation.packet.SimplePacketBase; +import com.simibubi.create.foundation.networking.SimplePacketBase; import net.minecraft.client.Minecraft; import net.minecraft.network.PacketBuffer; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/glue/SuperGlueEntity.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/glue/SuperGlueEntity.java similarity index 95% rename from src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/glue/SuperGlueEntity.java rename to src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/glue/SuperGlueEntity.java index 856ba2244..56199fb23 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/glue/SuperGlueEntity.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/glue/SuperGlueEntity.java @@ -1,17 +1,17 @@ -package com.simibubi.create.modules.contraptions.components.contraptions.glue; +package com.simibubi.create.content.contraptions.components.structureMovement.glue; import javax.annotation.Nullable; import org.apache.commons.lang3.Validate; -import com.simibubi.create.AllEntities; +import com.simibubi.create.AllEntityTypes; import com.simibubi.create.AllItems; -import com.simibubi.create.AllPackets; import com.simibubi.create.AllSoundEvents; -import com.simibubi.create.modules.contraptions.components.contraptions.BlockMovementTraits; -import com.simibubi.create.modules.schematics.ISpecialEntityItemRequirement; -import com.simibubi.create.modules.schematics.ItemRequirement; -import com.simibubi.create.modules.schematics.ItemRequirement.ItemUseType; +import com.simibubi.create.content.contraptions.components.structureMovement.BlockMovementTraits; +import com.simibubi.create.content.schematics.ISpecialEntityItemRequirement; +import com.simibubi.create.content.schematics.ItemRequirement; +import com.simibubi.create.content.schematics.ItemRequirement.ItemUseType; +import com.simibubi.create.foundation.networking.AllPackets; import net.minecraft.block.BlockState; import net.minecraft.client.Minecraft; @@ -62,7 +62,7 @@ public class SuperGlueEntity extends Entity implements IEntityAdditionalSpawnDat } public SuperGlueEntity(World world, BlockPos pos, Direction direction) { - this(AllEntities.SUPER_GLUE.type, world); + this(AllEntityTypes.SUPER_GLUE.type, world); hangingPosition = pos; facingDirection = direction; updateFacingWithBoundingBox(); diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/glue/SuperGlueHandler.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/glue/SuperGlueHandler.java similarity index 94% rename from src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/glue/SuperGlueHandler.java rename to src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/glue/SuperGlueHandler.java index 239240eae..67a6d7be7 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/glue/SuperGlueHandler.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/glue/SuperGlueHandler.java @@ -1,12 +1,12 @@ -package com.simibubi.create.modules.contraptions.components.contraptions.glue; +package com.simibubi.create.content.contraptions.components.structureMovement.glue; import java.util.HashMap; import java.util.List; import java.util.Map; import com.simibubi.create.AllItems; -import com.simibubi.create.AllPackets; -import com.simibubi.create.foundation.utility.RayTraceWorld; +import com.simibubi.create.foundation.networking.AllPackets; +import com.simibubi.create.foundation.utility.worldWrappers.RayTraceWorld; import net.minecraft.block.Blocks; import net.minecraft.entity.Entity; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/glue/SuperGlueItem.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/glue/SuperGlueItem.java similarity index 97% rename from src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/glue/SuperGlueItem.java rename to src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/glue/SuperGlueItem.java index d2668b9be..4d5edc4e2 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/glue/SuperGlueItem.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/glue/SuperGlueItem.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.contraptions.components.contraptions.glue; +package com.simibubi.create.content.contraptions.components.structureMovement.glue; import com.simibubi.create.foundation.utility.VecHelper; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/glue/SuperGlueRenderer.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/glue/SuperGlueRenderer.java similarity index 98% rename from src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/glue/SuperGlueRenderer.java rename to src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/glue/SuperGlueRenderer.java index 98bc0c190..e4f9fef00 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/glue/SuperGlueRenderer.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/glue/SuperGlueRenderer.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.contraptions.components.contraptions.glue; +package com.simibubi.create.content.contraptions.components.structureMovement.glue; import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.matrix.MatrixStack.Entry; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/mounted/CartAssemblerBlock.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/CartAssemblerBlock.java similarity index 93% rename from src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/mounted/CartAssemblerBlock.java rename to src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/CartAssemblerBlock.java index a3c5cdbef..9c73a924a 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/mounted/CartAssemblerBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/CartAssemblerBlock.java @@ -1,11 +1,11 @@ -package com.simibubi.create.modules.contraptions.components.contraptions.mounted; +package com.simibubi.create.content.contraptions.components.structureMovement.mounted; import com.simibubi.create.AllBlocks; +import com.simibubi.create.AllShapes; +import com.simibubi.create.content.contraptions.components.structureMovement.ContraptionEntity; +import com.simibubi.create.content.contraptions.components.structureMovement.mounted.CartAssemblerTileEntity.CartMovementMode; +import com.simibubi.create.content.contraptions.wrench.IWrenchable; import com.simibubi.create.foundation.block.ITE; -import com.simibubi.create.foundation.utility.AllShapes; -import com.simibubi.create.modules.contraptions.IWrenchable; -import com.simibubi.create.modules.contraptions.components.contraptions.ContraptionEntity; -import com.simibubi.create.modules.contraptions.components.contraptions.mounted.CartAssemblerTileEntity.CartMovementMode; import net.minecraft.block.AbstractRailBlock; import net.minecraft.block.Block; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/mounted/CartAssemblerTileEntity.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/CartAssemblerTileEntity.java similarity index 57% rename from src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/mounted/CartAssemblerTileEntity.java rename to src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/CartAssemblerTileEntity.java index 89ae09aa9..02dbe1db6 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/mounted/CartAssemblerTileEntity.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/CartAssemblerTileEntity.java @@ -1,15 +1,15 @@ -package com.simibubi.create.modules.contraptions.components.contraptions.mounted; +package com.simibubi.create.content.contraptions.components.structureMovement.mounted; import java.util.List; import com.simibubi.create.AllTileEntities; -import com.simibubi.create.ScreenResources; -import com.simibubi.create.foundation.behaviour.CenteredSideValueBoxTransform; -import com.simibubi.create.foundation.behaviour.ValueBoxTransform; -import com.simibubi.create.foundation.behaviour.base.SmartTileEntity; -import com.simibubi.create.foundation.behaviour.base.TileEntityBehaviour; -import com.simibubi.create.foundation.behaviour.scrollvalue.INamedIconOptions; -import com.simibubi.create.foundation.behaviour.scrollvalue.ScrollOptionBehaviour; +import com.simibubi.create.foundation.gui.AllIcons; +import com.simibubi.create.foundation.tileEntity.SmartTileEntity; +import com.simibubi.create.foundation.tileEntity.TileEntityBehaviour; +import com.simibubi.create.foundation.tileEntity.behaviour.CenteredSideValueBoxTransform; +import com.simibubi.create.foundation.tileEntity.behaviour.ValueBoxTransform; +import com.simibubi.create.foundation.tileEntity.behaviour.scrollvalue.INamedIconOptions; +import com.simibubi.create.foundation.tileEntity.behaviour.scrollvalue.ScrollOptionBehaviour; import com.simibubi.create.foundation.utility.Lang; import net.minecraft.util.Direction; @@ -36,22 +36,22 @@ public class CartAssemblerTileEntity extends SmartTileEntity { public static enum CartMovementMode implements INamedIconOptions { - ROTATE(ScreenResources.I_CART_ROTATE), - ROTATE_PAUSED(ScreenResources.I_CART_ROTATE_PAUSED), - ROTATION_LOCKED(ScreenResources.I_CART_ROTATE_LOCKED), + ROTATE(AllIcons.I_CART_ROTATE), + ROTATE_PAUSED(AllIcons.I_CART_ROTATE_PAUSED), + ROTATION_LOCKED(AllIcons.I_CART_ROTATE_LOCKED), ; private String translationKey; - private ScreenResources icon; + private AllIcons icon; - private CartMovementMode(ScreenResources icon) { + private CartMovementMode(AllIcons icon) { this.icon = icon; translationKey = "contraptions.cart_movement_mode." + Lang.asId(name()); } @Override - public ScreenResources getIcon() { + public AllIcons getIcon() { return icon; } diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/mounted/MinecartContraptionItem.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/MinecartContraptionItem.java similarity index 96% rename from src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/mounted/MinecartContraptionItem.java rename to src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/MinecartContraptionItem.java index 896c8e9de..7ed6c90f9 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/mounted/MinecartContraptionItem.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/MinecartContraptionItem.java @@ -1,12 +1,12 @@ -package com.simibubi.create.modules.contraptions.components.contraptions.mounted; +package com.simibubi.create.content.contraptions.components.structureMovement.mounted; import java.util.List; import javax.annotation.Nullable; import com.simibubi.create.AllItems; -import com.simibubi.create.modules.contraptions.components.contraptions.Contraption; -import com.simibubi.create.modules.contraptions.components.contraptions.ContraptionEntity; +import com.simibubi.create.content.contraptions.components.structureMovement.Contraption; +import com.simibubi.create.content.contraptions.components.structureMovement.ContraptionEntity; import net.minecraft.block.AbstractRailBlock; import net.minecraft.block.BlockState; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/mounted/MountedContraption.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/MountedContraption.java similarity index 85% rename from src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/mounted/MountedContraption.java rename to src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/MountedContraption.java index 1a5dfcd31..fbe38eeb0 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/mounted/MountedContraption.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/MountedContraption.java @@ -1,17 +1,17 @@ -package com.simibubi.create.modules.contraptions.components.contraptions.mounted; +package com.simibubi.create.content.contraptions.components.structureMovement.mounted; -import static com.simibubi.create.modules.contraptions.components.contraptions.mounted.CartAssemblerBlock.RAIL_SHAPE; +import static com.simibubi.create.content.contraptions.components.structureMovement.mounted.CartAssemblerBlock.RAIL_SHAPE; import java.util.List; import org.apache.commons.lang3.tuple.Pair; import com.simibubi.create.AllBlocks; +import com.simibubi.create.content.contraptions.components.structureMovement.AllContraptionTypes; +import com.simibubi.create.content.contraptions.components.structureMovement.BlockMovementTraits; +import com.simibubi.create.content.contraptions.components.structureMovement.Contraption; +import com.simibubi.create.content.contraptions.components.structureMovement.mounted.CartAssemblerTileEntity.CartMovementMode; import com.simibubi.create.foundation.utility.NBTHelper; -import com.simibubi.create.modules.contraptions.components.contraptions.AllContraptionTypes; -import com.simibubi.create.modules.contraptions.components.contraptions.BlockMovementTraits; -import com.simibubi.create.modules.contraptions.components.contraptions.Contraption; -import com.simibubi.create.modules.contraptions.components.contraptions.mounted.CartAssemblerTileEntity.CartMovementMode; import net.minecraft.block.BlockState; import net.minecraft.nbt.CompoundNBT; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/piston/LinearActuatorTileEntity.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/piston/LinearActuatorTileEntity.java similarity index 89% rename from src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/piston/LinearActuatorTileEntity.java rename to src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/piston/LinearActuatorTileEntity.java index 394fd07af..53211b904 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/piston/LinearActuatorTileEntity.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/piston/LinearActuatorTileEntity.java @@ -1,18 +1,18 @@ -package com.simibubi.create.modules.contraptions.components.contraptions.piston; +package com.simibubi.create.content.contraptions.components.structureMovement.piston; import java.util.List; -import com.simibubi.create.AllPackets; -import com.simibubi.create.foundation.behaviour.ValueBoxTransform; -import com.simibubi.create.foundation.behaviour.base.TileEntityBehaviour; -import com.simibubi.create.foundation.behaviour.scrollvalue.ScrollOptionBehaviour; +import com.simibubi.create.content.contraptions.base.KineticTileEntity; +import com.simibubi.create.content.contraptions.components.structureMovement.CancelPlayerFallPacket; +import com.simibubi.create.content.contraptions.components.structureMovement.ContraptionCollider; +import com.simibubi.create.content.contraptions.components.structureMovement.ContraptionEntity; +import com.simibubi.create.content.contraptions.components.structureMovement.IControlContraption; +import com.simibubi.create.foundation.networking.AllPackets; +import com.simibubi.create.foundation.tileEntity.TileEntityBehaviour; +import com.simibubi.create.foundation.tileEntity.behaviour.ValueBoxTransform; +import com.simibubi.create.foundation.tileEntity.behaviour.scrollvalue.ScrollOptionBehaviour; import com.simibubi.create.foundation.utility.Lang; import com.simibubi.create.foundation.utility.ServerSpeedProvider; -import com.simibubi.create.modules.contraptions.base.KineticTileEntity; -import com.simibubi.create.modules.contraptions.components.contraptions.CancelPlayerFallPacket; -import com.simibubi.create.modules.contraptions.components.contraptions.ContraptionCollider; -import com.simibubi.create.modules.contraptions.components.contraptions.ContraptionEntity; -import com.simibubi.create.modules.contraptions.components.contraptions.IControlContraption; import net.minecraft.nbt.CompoundNBT; import net.minecraft.tileentity.TileEntityType; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/piston/MechanicalPistonBlock.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/piston/MechanicalPistonBlock.java similarity index 96% rename from src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/piston/MechanicalPistonBlock.java rename to src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/piston/MechanicalPistonBlock.java index 6883d15ab..ca502730b 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/piston/MechanicalPistonBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/piston/MechanicalPistonBlock.java @@ -1,12 +1,12 @@ -package com.simibubi.create.modules.contraptions.components.contraptions.piston; +package com.simibubi.create.content.contraptions.components.structureMovement.piston; import com.simibubi.create.AllBlocks; +import com.simibubi.create.AllShapes; import com.simibubi.create.AllSoundEvents; -import com.simibubi.create.config.AllConfigs; +import com.simibubi.create.content.contraptions.base.DirectionalAxisKineticBlock; import com.simibubi.create.foundation.block.ITE; -import com.simibubi.create.foundation.utility.AllShapes; +import com.simibubi.create.foundation.config.AllConfigs; import com.simibubi.create.foundation.utility.Lang; -import com.simibubi.create.modules.contraptions.base.DirectionalAxisKineticBlock; import net.minecraft.block.Block; import net.minecraft.block.BlockState; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/piston/MechanicalPistonGenerator.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/piston/MechanicalPistonGenerator.java similarity index 86% rename from src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/piston/MechanicalPistonGenerator.java rename to src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/piston/MechanicalPistonGenerator.java index 1e97d0a38..888c39119 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/piston/MechanicalPistonGenerator.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/piston/MechanicalPistonGenerator.java @@ -1,7 +1,7 @@ -package com.simibubi.create.modules.contraptions.components.contraptions.piston; +package com.simibubi.create.content.contraptions.components.structureMovement.piston; -import com.simibubi.create.foundation.utility.data.SpecialBlockStateGen; -import com.simibubi.create.modules.contraptions.components.contraptions.piston.MechanicalPistonBlock.PistonState; +import com.simibubi.create.content.contraptions.components.structureMovement.piston.MechanicalPistonBlock.PistonState; +import com.simibubi.create.foundation.data.SpecialBlockStateGen; import com.tterrag.registrate.providers.DataGenContext; import com.tterrag.registrate.providers.RegistrateBlockstateProvider; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/piston/MechanicalPistonHeadBlock.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/piston/MechanicalPistonHeadBlock.java similarity index 88% rename from src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/piston/MechanicalPistonHeadBlock.java rename to src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/piston/MechanicalPistonHeadBlock.java index 8ffe21652..fa3c241f7 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/piston/MechanicalPistonHeadBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/piston/MechanicalPistonHeadBlock.java @@ -1,11 +1,11 @@ -package com.simibubi.create.modules.contraptions.components.contraptions.piston; +package com.simibubi.create.content.contraptions.components.structureMovement.piston; -import static com.simibubi.create.modules.contraptions.components.contraptions.piston.MechanicalPistonBlock.isExtensionPole; +import static com.simibubi.create.content.contraptions.components.structureMovement.piston.MechanicalPistonBlock.isExtensionPole; import com.simibubi.create.AllBlocks; +import com.simibubi.create.AllShapes; +import com.simibubi.create.content.contraptions.components.structureMovement.piston.MechanicalPistonBlock.PistonState; import com.simibubi.create.foundation.block.ProperDirectionalBlock; -import com.simibubi.create.foundation.utility.AllShapes; -import com.simibubi.create.modules.contraptions.components.contraptions.piston.MechanicalPistonBlock.PistonState; import net.minecraft.block.Block; import net.minecraft.block.BlockState; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/piston/MechanicalPistonTileEntity.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/piston/MechanicalPistonTileEntity.java similarity index 88% rename from src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/piston/MechanicalPistonTileEntity.java rename to src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/piston/MechanicalPistonTileEntity.java index b71d5cdc2..92e756df4 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/piston/MechanicalPistonTileEntity.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/piston/MechanicalPistonTileEntity.java @@ -1,14 +1,14 @@ -package com.simibubi.create.modules.contraptions.components.contraptions.piston; +package com.simibubi.create.content.contraptions.components.structureMovement.piston; import com.simibubi.create.AllBlocks; import com.simibubi.create.AllTileEntities; -import com.simibubi.create.foundation.behaviour.ValueBoxTransform; +import com.simibubi.create.content.contraptions.base.IRotate; +import com.simibubi.create.content.contraptions.components.structureMovement.ContraptionCollider; +import com.simibubi.create.content.contraptions.components.structureMovement.ContraptionEntity; +import com.simibubi.create.content.contraptions.components.structureMovement.DirectionalExtenderScrollOptionSlot; +import com.simibubi.create.content.contraptions.components.structureMovement.piston.MechanicalPistonBlock.PistonState; +import com.simibubi.create.foundation.tileEntity.behaviour.ValueBoxTransform; import com.simibubi.create.foundation.utility.ServerSpeedProvider; -import com.simibubi.create.modules.contraptions.base.IRotate; -import com.simibubi.create.modules.contraptions.components.contraptions.ContraptionCollider; -import com.simibubi.create.modules.contraptions.components.contraptions.ContraptionEntity; -import com.simibubi.create.modules.contraptions.components.contraptions.DirectionalExtenderScrollOptionSlot; -import com.simibubi.create.modules.contraptions.components.contraptions.piston.MechanicalPistonBlock.PistonState; import net.minecraft.nbt.CompoundNBT; import net.minecraft.state.properties.BlockStateProperties; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/piston/MechanicalPistonTileEntityRenderer.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/piston/MechanicalPistonTileEntityRenderer.java similarity index 68% rename from src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/piston/MechanicalPistonTileEntityRenderer.java rename to src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/piston/MechanicalPistonTileEntityRenderer.java index f0b4b1a79..e93fadd01 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/piston/MechanicalPistonTileEntityRenderer.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/piston/MechanicalPistonTileEntityRenderer.java @@ -1,7 +1,7 @@ -package com.simibubi.create.modules.contraptions.components.contraptions.piston; +package com.simibubi.create.content.contraptions.components.structureMovement.piston; -import com.simibubi.create.modules.contraptions.base.KineticTileEntity; -import com.simibubi.create.modules.contraptions.base.KineticTileEntityRenderer; +import com.simibubi.create.content.contraptions.base.KineticTileEntity; +import com.simibubi.create.content.contraptions.base.KineticTileEntityRenderer; import net.minecraft.block.BlockState; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/piston/PistonContraption.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/piston/PistonContraption.java similarity index 87% rename from src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/piston/PistonContraption.java rename to src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/piston/PistonContraption.java index 881e700b3..cff0e3afc 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/piston/PistonContraption.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/piston/PistonContraption.java @@ -1,11 +1,11 @@ -package com.simibubi.create.modules.contraptions.components.contraptions.piston; +package com.simibubi.create.content.contraptions.components.structureMovement.piston; import static com.simibubi.create.AllBlocks.MECHANICAL_PISTON_HEAD; import static com.simibubi.create.AllBlocks.PISTON_EXTENSION_POLE; -import static com.simibubi.create.modules.contraptions.components.contraptions.piston.MechanicalPistonBlock.isExtensionPole; -import static com.simibubi.create.modules.contraptions.components.contraptions.piston.MechanicalPistonBlock.isPiston; -import static com.simibubi.create.modules.contraptions.components.contraptions.piston.MechanicalPistonBlock.isPistonHead; -import static com.simibubi.create.modules.contraptions.components.contraptions.piston.MechanicalPistonBlock.isStickyPiston; +import static com.simibubi.create.content.contraptions.components.structureMovement.piston.MechanicalPistonBlock.isExtensionPole; +import static com.simibubi.create.content.contraptions.components.structureMovement.piston.MechanicalPistonBlock.isPiston; +import static com.simibubi.create.content.contraptions.components.structureMovement.piston.MechanicalPistonBlock.isPistonHead; +import static com.simibubi.create.content.contraptions.components.structureMovement.piston.MechanicalPistonBlock.isStickyPiston; import static net.minecraft.state.properties.BlockStateProperties.FACING; import java.util.ArrayList; @@ -13,14 +13,14 @@ import java.util.List; import org.apache.commons.lang3.tuple.Pair; -import com.simibubi.create.config.AllConfigs; +import com.simibubi.create.content.contraptions.components.structureMovement.AllContraptionTypes; +import com.simibubi.create.content.contraptions.components.structureMovement.BlockMovementTraits; +import com.simibubi.create.content.contraptions.components.structureMovement.Contraption; +import com.simibubi.create.content.contraptions.components.structureMovement.glue.SuperGlueEntity; +import com.simibubi.create.content.contraptions.components.structureMovement.piston.MechanicalPistonBlock.PistonState; +import com.simibubi.create.foundation.config.AllConfigs; import com.simibubi.create.foundation.utility.NBTHelper; import com.simibubi.create.foundation.utility.VecHelper; -import com.simibubi.create.modules.contraptions.components.contraptions.AllContraptionTypes; -import com.simibubi.create.modules.contraptions.components.contraptions.BlockMovementTraits; -import com.simibubi.create.modules.contraptions.components.contraptions.Contraption; -import com.simibubi.create.modules.contraptions.components.contraptions.glue.SuperGlueEntity; -import com.simibubi.create.modules.contraptions.components.contraptions.piston.MechanicalPistonBlock.PistonState; import net.minecraft.block.BlockState; import net.minecraft.block.CarpetBlock; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/piston/PistonExtensionPoleBlock.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/piston/PistonExtensionPoleBlock.java similarity index 80% rename from src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/piston/PistonExtensionPoleBlock.java rename to src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/piston/PistonExtensionPoleBlock.java index 9f379f575..8c05ac120 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/piston/PistonExtensionPoleBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/piston/PistonExtensionPoleBlock.java @@ -1,13 +1,13 @@ -package com.simibubi.create.modules.contraptions.components.contraptions.piston; +package com.simibubi.create.content.contraptions.components.structureMovement.piston; -import static com.simibubi.create.modules.contraptions.components.contraptions.piston.MechanicalPistonBlock.isExtensionPole; -import static com.simibubi.create.modules.contraptions.components.contraptions.piston.MechanicalPistonBlock.isPiston; -import static com.simibubi.create.modules.contraptions.components.contraptions.piston.MechanicalPistonBlock.isPistonHead; +import static com.simibubi.create.content.contraptions.components.structureMovement.piston.MechanicalPistonBlock.isExtensionPole; +import static com.simibubi.create.content.contraptions.components.structureMovement.piston.MechanicalPistonBlock.isPiston; +import static com.simibubi.create.content.contraptions.components.structureMovement.piston.MechanicalPistonBlock.isPistonHead; +import com.simibubi.create.AllShapes; +import com.simibubi.create.content.contraptions.components.structureMovement.piston.MechanicalPistonBlock.PistonState; +import com.simibubi.create.content.contraptions.wrench.IWrenchable; import com.simibubi.create.foundation.block.ProperDirectionalBlock; -import com.simibubi.create.foundation.utility.AllShapes; -import com.simibubi.create.modules.contraptions.IWrenchable; -import com.simibubi.create.modules.contraptions.components.contraptions.piston.MechanicalPistonBlock.PistonState; import net.minecraft.block.BlockState; import net.minecraft.block.material.PushReaction; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/pulley/PulleyBlock.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/pulley/PulleyBlock.java similarity index 95% rename from src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/pulley/PulleyBlock.java rename to src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/pulley/PulleyBlock.java index 5265f7201..1c80d317e 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/pulley/PulleyBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/pulley/PulleyBlock.java @@ -1,9 +1,9 @@ -package com.simibubi.create.modules.contraptions.components.contraptions.pulley; +package com.simibubi.create.content.contraptions.components.structureMovement.pulley; import com.simibubi.create.AllBlocks; +import com.simibubi.create.AllShapes; +import com.simibubi.create.content.contraptions.base.HorizontalAxisKineticBlock; import com.simibubi.create.foundation.block.ITE; -import com.simibubi.create.foundation.utility.AllShapes; -import com.simibubi.create.modules.contraptions.base.HorizontalAxisKineticBlock; import net.minecraft.block.Block; import net.minecraft.block.BlockState; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/pulley/PulleyContraption.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/pulley/PulleyContraption.java similarity index 81% rename from src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/pulley/PulleyContraption.java rename to src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/pulley/PulleyContraption.java index a2678a64b..68a21a1f0 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/pulley/PulleyContraption.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/pulley/PulleyContraption.java @@ -1,7 +1,7 @@ -package com.simibubi.create.modules.contraptions.components.contraptions.pulley; +package com.simibubi.create.content.contraptions.components.structureMovement.pulley; -import com.simibubi.create.modules.contraptions.components.contraptions.AllContraptionTypes; -import com.simibubi.create.modules.contraptions.components.contraptions.Contraption; +import com.simibubi.create.content.contraptions.components.structureMovement.AllContraptionTypes; +import com.simibubi.create.content.contraptions.components.structureMovement.Contraption; import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/pulley/PulleyRenderer.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/pulley/PulleyRenderer.java similarity index 91% rename from src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/pulley/PulleyRenderer.java rename to src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/pulley/PulleyRenderer.java index dd355c13c..bc1de8681 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/pulley/PulleyRenderer.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/pulley/PulleyRenderer.java @@ -1,14 +1,14 @@ -package com.simibubi.create.modules.contraptions.components.contraptions.pulley; +package com.simibubi.create.content.contraptions.components.structureMovement.pulley; import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.vertex.IVertexBuilder; import com.simibubi.create.AllBlockPartials; import com.simibubi.create.AllBlocks; import com.simibubi.create.CreateClient; +import com.simibubi.create.content.contraptions.base.KineticTileEntity; +import com.simibubi.create.content.contraptions.base.KineticTileEntityRenderer; +import com.simibubi.create.content.contraptions.components.structureMovement.ContraptionEntity; import com.simibubi.create.foundation.utility.SuperByteBuffer; -import com.simibubi.create.modules.contraptions.base.KineticTileEntity; -import com.simibubi.create.modules.contraptions.base.KineticTileEntityRenderer; -import com.simibubi.create.modules.contraptions.components.contraptions.ContraptionEntity; import net.minecraft.block.BlockState; import net.minecraft.client.renderer.IRenderTypeBuffer; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/pulley/PulleyTileEntity.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/pulley/PulleyTileEntity.java similarity index 86% rename from src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/pulley/PulleyTileEntity.java rename to src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/pulley/PulleyTileEntity.java index 31204f5d9..33d7be127 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/pulley/PulleyTileEntity.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/pulley/PulleyTileEntity.java @@ -1,14 +1,14 @@ -package com.simibubi.create.modules.contraptions.components.contraptions.pulley; +package com.simibubi.create.content.contraptions.components.structureMovement.pulley; import com.simibubi.create.AllBlocks; import com.simibubi.create.AllTileEntities; -import com.simibubi.create.config.AllConfigs; -import com.simibubi.create.foundation.behaviour.CenteredSideValueBoxTransform; -import com.simibubi.create.foundation.behaviour.ValueBoxTransform; -import com.simibubi.create.modules.contraptions.components.contraptions.BlockMovementTraits; -import com.simibubi.create.modules.contraptions.components.contraptions.ContraptionCollider; -import com.simibubi.create.modules.contraptions.components.contraptions.ContraptionEntity; -import com.simibubi.create.modules.contraptions.components.contraptions.piston.LinearActuatorTileEntity; +import com.simibubi.create.content.contraptions.components.structureMovement.BlockMovementTraits; +import com.simibubi.create.content.contraptions.components.structureMovement.ContraptionCollider; +import com.simibubi.create.content.contraptions.components.structureMovement.ContraptionEntity; +import com.simibubi.create.content.contraptions.components.structureMovement.piston.LinearActuatorTileEntity; +import com.simibubi.create.foundation.config.AllConfigs; +import com.simibubi.create.foundation.tileEntity.behaviour.CenteredSideValueBoxTransform; +import com.simibubi.create.foundation.tileEntity.behaviour.ValueBoxTransform; import net.minecraft.block.Blocks; import net.minecraft.nbt.CompoundNBT; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/turntable/TurntableBlock.java b/src/main/java/com/simibubi/create/content/contraptions/components/turntable/TurntableBlock.java similarity index 92% rename from src/main/java/com/simibubi/create/modules/contraptions/components/turntable/TurntableBlock.java rename to src/main/java/com/simibubi/create/content/contraptions/components/turntable/TurntableBlock.java index cea7de2ef..ea800df11 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/turntable/TurntableBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/turntable/TurntableBlock.java @@ -1,10 +1,10 @@ -package com.simibubi.create.modules.contraptions.components.turntable; +package com.simibubi.create.content.contraptions.components.turntable; +import com.simibubi.create.AllShapes; +import com.simibubi.create.content.contraptions.base.KineticBlock; +import com.simibubi.create.content.contraptions.base.KineticTileEntity; import com.simibubi.create.foundation.block.ITE; -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.BlockRenderType; import net.minecraft.block.BlockState; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/turntable/TurntableHandler.java b/src/main/java/com/simibubi/create/content/contraptions/components/turntable/TurntableHandler.java similarity index 95% rename from src/main/java/com/simibubi/create/modules/contraptions/components/turntable/TurntableHandler.java rename to src/main/java/com/simibubi/create/content/contraptions/components/turntable/TurntableHandler.java index 66ee67452..a3ba8aaf9 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/turntable/TurntableHandler.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/turntable/TurntableHandler.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.contraptions.components.turntable; +package com.simibubi.create.content.contraptions.components.turntable; import com.simibubi.create.AllBlocks; import com.simibubi.create.foundation.utility.VecHelper; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/turntable/TurntableTileEntity.java b/src/main/java/com/simibubi/create/content/contraptions/components/turntable/TurntableTileEntity.java similarity index 61% rename from src/main/java/com/simibubi/create/modules/contraptions/components/turntable/TurntableTileEntity.java rename to src/main/java/com/simibubi/create/content/contraptions/components/turntable/TurntableTileEntity.java index 3b83db044..feac3ecef 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/turntable/TurntableTileEntity.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/turntable/TurntableTileEntity.java @@ -1,7 +1,7 @@ -package com.simibubi.create.modules.contraptions.components.turntable; +package com.simibubi.create.content.contraptions.components.turntable; import com.simibubi.create.AllTileEntities; -import com.simibubi.create.modules.contraptions.base.KineticTileEntity; +import com.simibubi.create.content.contraptions.base.KineticTileEntity; public class TurntableTileEntity extends KineticTileEntity { diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/waterwheel/WaterWheelBlock.java b/src/main/java/com/simibubi/create/content/contraptions/components/waterwheel/WaterWheelBlock.java similarity index 95% rename from src/main/java/com/simibubi/create/modules/contraptions/components/waterwheel/WaterWheelBlock.java rename to src/main/java/com/simibubi/create/content/contraptions/components/waterwheel/WaterWheelBlock.java index 1509e307e..27b35b459 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/waterwheel/WaterWheelBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/waterwheel/WaterWheelBlock.java @@ -1,11 +1,11 @@ -package com.simibubi.create.modules.contraptions.components.waterwheel; +package com.simibubi.create.content.contraptions.components.waterwheel; import com.simibubi.create.AllBlocks; -import com.simibubi.create.config.AllConfigs; +import com.simibubi.create.content.contraptions.base.HorizontalKineticBlock; import com.simibubi.create.foundation.advancement.AllTriggers; import com.simibubi.create.foundation.block.ITE; -import com.simibubi.create.foundation.utility.WrappedWorld; -import com.simibubi.create.modules.contraptions.base.HorizontalKineticBlock; +import com.simibubi.create.foundation.config.AllConfigs; +import com.simibubi.create.foundation.utility.worldWrappers.WrappedWorld; import net.minecraft.block.BlockRenderType; import net.minecraft.block.BlockState; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/waterwheel/WaterWheelTileEntity.java b/src/main/java/com/simibubi/create/content/contraptions/components/waterwheel/WaterWheelTileEntity.java similarity index 92% rename from src/main/java/com/simibubi/create/modules/contraptions/components/waterwheel/WaterWheelTileEntity.java rename to src/main/java/com/simibubi/create/content/contraptions/components/waterwheel/WaterWheelTileEntity.java index 8fd97930e..8e7266940 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/waterwheel/WaterWheelTileEntity.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/waterwheel/WaterWheelTileEntity.java @@ -1,11 +1,11 @@ -package com.simibubi.create.modules.contraptions.components.waterwheel; +package com.simibubi.create.content.contraptions.components.waterwheel; import java.util.HashMap; import java.util.Map; import com.simibubi.create.AllBlocks; import com.simibubi.create.AllTileEntities; -import com.simibubi.create.modules.contraptions.base.GeneratingKineticTileEntity; +import com.simibubi.create.content.contraptions.base.GeneratingKineticTileEntity; import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.Direction; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/goggle/GoggleOverlayRenderer.java b/src/main/java/com/simibubi/create/content/contraptions/goggles/GoggleOverlayRenderer.java similarity index 98% rename from src/main/java/com/simibubi/create/modules/contraptions/goggle/GoggleOverlayRenderer.java rename to src/main/java/com/simibubi/create/content/contraptions/goggles/GoggleOverlayRenderer.java index c7b62f9a1..87821818f 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/goggle/GoggleOverlayRenderer.java +++ b/src/main/java/com/simibubi/create/content/contraptions/goggles/GoggleOverlayRenderer.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.contraptions.goggle; +package com.simibubi.create.content.contraptions.goggles; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/GogglesItem.java b/src/main/java/com/simibubi/create/content/contraptions/goggles/GogglesItem.java similarity index 96% rename from src/main/java/com/simibubi/create/modules/contraptions/GogglesItem.java rename to src/main/java/com/simibubi/create/content/contraptions/goggles/GogglesItem.java index bb7835fed..831e93244 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/GogglesItem.java +++ b/src/main/java/com/simibubi/create/content/contraptions/goggles/GogglesItem.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.contraptions; +package com.simibubi.create.content.contraptions.goggles; import com.simibubi.create.AllItems; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/goggle/IHaveGoggleInformation.java b/src/main/java/com/simibubi/create/content/contraptions/goggles/IHaveGoggleInformation.java similarity index 92% rename from src/main/java/com/simibubi/create/modules/contraptions/goggle/IHaveGoggleInformation.java rename to src/main/java/com/simibubi/create/content/contraptions/goggles/IHaveGoggleInformation.java index 10b0810e7..f41753606 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/goggle/IHaveGoggleInformation.java +++ b/src/main/java/com/simibubi/create/content/contraptions/goggles/IHaveGoggleInformation.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.contraptions.goggle; +package com.simibubi.create.content.contraptions.goggles; import java.text.DecimalFormat; import java.util.List; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/goggle/IHaveHoveringInformation.java b/src/main/java/com/simibubi/create/content/contraptions/goggles/IHaveHoveringInformation.java similarity index 82% rename from src/main/java/com/simibubi/create/modules/contraptions/goggle/IHaveHoveringInformation.java rename to src/main/java/com/simibubi/create/content/contraptions/goggles/IHaveHoveringInformation.java index d830babf0..eca6f0afe 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/goggle/IHaveHoveringInformation.java +++ b/src/main/java/com/simibubi/create/content/contraptions/goggles/IHaveHoveringInformation.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.contraptions.goggle; +package com.simibubi.create.content.contraptions.goggles; import java.util.List; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/particle/AirFlowParticle.java b/src/main/java/com/simibubi/create/content/contraptions/particle/AirFlowParticle.java similarity index 96% rename from src/main/java/com/simibubi/create/modules/contraptions/particle/AirFlowParticle.java rename to src/main/java/com/simibubi/create/content/contraptions/particle/AirFlowParticle.java index de34586f3..c0710a4f2 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/particle/AirFlowParticle.java +++ b/src/main/java/com/simibubi/create/content/contraptions/particle/AirFlowParticle.java @@ -1,9 +1,9 @@ -package com.simibubi.create.modules.contraptions.particle; +package com.simibubi.create.content.contraptions.particle; +import com.simibubi.create.content.contraptions.components.fan.EncasedFanTileEntity; +import com.simibubi.create.content.logistics.InWorldProcessing; import com.simibubi.create.foundation.utility.ColorHelper; import com.simibubi.create.foundation.utility.VecHelper; -import com.simibubi.create.modules.contraptions.components.fan.EncasedFanTileEntity; -import com.simibubi.create.modules.logistics.InWorldProcessing; import net.minecraft.block.Blocks; import net.minecraft.client.particle.IAnimatedSprite; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/particle/AirFlowParticleData.java b/src/main/java/com/simibubi/create/content/contraptions/particle/AirFlowParticleData.java similarity index 89% rename from src/main/java/com/simibubi/create/modules/contraptions/particle/AirFlowParticleData.java rename to src/main/java/com/simibubi/create/content/contraptions/particle/AirFlowParticleData.java index cf6eb288e..db604f367 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/particle/AirFlowParticleData.java +++ b/src/main/java/com/simibubi/create/content/contraptions/particle/AirFlowParticleData.java @@ -1,10 +1,10 @@ -package com.simibubi.create.modules.contraptions.particle; +package com.simibubi.create.content.contraptions.particle; import java.util.Locale; import com.mojang.brigadier.StringReader; import com.mojang.brigadier.exceptions.CommandSyntaxException; -import com.simibubi.create.AllParticles; +import com.simibubi.create.AllParticleTypes; import net.minecraft.client.particle.ParticleManager.IParticleMetaFactory; import net.minecraft.network.PacketBuffer; @@ -53,7 +53,7 @@ public class AirFlowParticleData implements IParticleData, ICustomParticle getType() { - return AllParticles.AIR_FLOW.get(); + return AllParticleTypes.AIR_FLOW.get(); } @Override @@ -65,7 +65,7 @@ public class AirFlowParticleData implements IParticleData, ICustomParticle getType() { - return AllParticles.ROTATION_INDICATOR.get(); + return AllParticleTypes.ROTATION_INDICATOR.get(); } public Axis getAxis() { @@ -83,7 +83,7 @@ public class RotationIndicatorParticleData implements IParticleData, ICustomPart @Override public String getParameters() { - return String.format(Locale.ROOT, "%s %d %.2f %.2f %.2f %d %c", AllParticles.ROTATION_INDICATOR.parameter(), + return String.format(Locale.ROOT, "%s %d %.2f %.2f %.2f %d %c", AllParticleTypes.ROTATION_INDICATOR.parameter(), color, speed, radius1, radius2, lifeSpan, axis); } diff --git a/src/main/java/com/simibubi/create/modules/contraptions/processing/BasinBlock.java b/src/main/java/com/simibubi/create/content/contraptions/processing/BasinBlock.java similarity index 95% rename from src/main/java/com/simibubi/create/modules/contraptions/processing/BasinBlock.java rename to src/main/java/com/simibubi/create/content/contraptions/processing/BasinBlock.java index 88f96d99c..b4daafc37 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/processing/BasinBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/processing/BasinBlock.java @@ -1,11 +1,11 @@ -package com.simibubi.create.modules.contraptions.processing; +package com.simibubi.create.content.contraptions.processing; import com.simibubi.create.AllBlocks; +import com.simibubi.create.AllShapes; +import com.simibubi.create.content.contraptions.wrench.IWrenchable; import com.simibubi.create.foundation.advancement.AllTriggers; import com.simibubi.create.foundation.block.ITE; import com.simibubi.create.foundation.item.ItemHelper; -import com.simibubi.create.foundation.utility.AllShapes; -import com.simibubi.create.modules.contraptions.IWrenchable; import net.minecraft.block.Block; import net.minecraft.block.BlockState; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/processing/BasinOperatingTileEntity.java b/src/main/java/com/simibubi/create/content/contraptions/processing/BasinOperatingTileEntity.java similarity index 94% rename from src/main/java/com/simibubi/create/modules/contraptions/processing/BasinOperatingTileEntity.java rename to src/main/java/com/simibubi/create/content/contraptions/processing/BasinOperatingTileEntity.java index e09fa863b..915311ed4 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/processing/BasinOperatingTileEntity.java +++ b/src/main/java/com/simibubi/create/content/contraptions/processing/BasinOperatingTileEntity.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.contraptions.processing; +package com.simibubi.create.content.contraptions.processing; import java.util.ArrayList; import java.util.List; @@ -6,13 +6,13 @@ import java.util.Optional; import java.util.stream.Collectors; import com.simibubi.create.AllTileEntities; +import com.simibubi.create.content.contraptions.base.KineticTileEntity; +import com.simibubi.create.content.contraptions.processing.BasinTileEntity.BasinInventory; import com.simibubi.create.foundation.advancement.AllTriggers; import com.simibubi.create.foundation.advancement.SimpleTrigger; -import com.simibubi.create.foundation.behaviour.base.TileEntityBehaviour; -import com.simibubi.create.foundation.behaviour.simple.DeferralBehaviour; +import com.simibubi.create.foundation.tileEntity.TileEntityBehaviour; +import com.simibubi.create.foundation.tileEntity.behaviour.simple.DeferralBehaviour; import com.simibubi.create.foundation.utility.recipe.RecipeFinder; -import com.simibubi.create.modules.contraptions.base.KineticTileEntity; -import com.simibubi.create.modules.contraptions.processing.BasinTileEntity.BasinInventory; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/processing/BasinTileEntity.java b/src/main/java/com/simibubi/create/content/contraptions/processing/BasinTileEntity.java similarity index 96% rename from src/main/java/com/simibubi/create/modules/contraptions/processing/BasinTileEntity.java rename to src/main/java/com/simibubi/create/content/contraptions/processing/BasinTileEntity.java index 377e70692..0301bb18b 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/processing/BasinTileEntity.java +++ b/src/main/java/com/simibubi/create/content/contraptions/processing/BasinTileEntity.java @@ -1,9 +1,9 @@ -package com.simibubi.create.modules.contraptions.processing; +package com.simibubi.create.content.contraptions.processing; import java.util.Optional; import com.simibubi.create.AllTileEntities; -import com.simibubi.create.foundation.block.SyncedTileEntity; +import com.simibubi.create.foundation.tileEntity.SyncedTileEntity; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/processing/BasinTileEntityRenderer.java b/src/main/java/com/simibubi/create/content/contraptions/processing/BasinTileEntityRenderer.java similarity index 92% rename from src/main/java/com/simibubi/create/modules/contraptions/processing/BasinTileEntityRenderer.java rename to src/main/java/com/simibubi/create/content/contraptions/processing/BasinTileEntityRenderer.java index 1700c3d70..01baf51c9 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/processing/BasinTileEntityRenderer.java +++ b/src/main/java/com/simibubi/create/content/contraptions/processing/BasinTileEntityRenderer.java @@ -1,9 +1,9 @@ -package com.simibubi.create.modules.contraptions.processing; +package com.simibubi.create.content.contraptions.processing; import java.util.Random; import com.mojang.blaze3d.matrix.MatrixStack; -import com.simibubi.create.foundation.block.SafeTileEntityRenderer; +import com.simibubi.create.foundation.tileEntity.renderer.SafeTileEntityRenderer; import com.simibubi.create.foundation.utility.VecHelper; import net.minecraft.client.Minecraft; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/processing/ProcessingIngredient.java b/src/main/java/com/simibubi/create/content/contraptions/processing/ProcessingIngredient.java similarity index 96% rename from src/main/java/com/simibubi/create/modules/contraptions/processing/ProcessingIngredient.java rename to src/main/java/com/simibubi/create/content/contraptions/processing/ProcessingIngredient.java index 56a72f20c..a25d9fcc2 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/processing/ProcessingIngredient.java +++ b/src/main/java/com/simibubi/create/content/contraptions/processing/ProcessingIngredient.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.contraptions.processing; +package com.simibubi.create.content.contraptions.processing; import java.util.List; import java.util.Random; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/processing/ProcessingInventory.java b/src/main/java/com/simibubi/create/content/contraptions/processing/ProcessingInventory.java similarity index 96% rename from src/main/java/com/simibubi/create/modules/contraptions/processing/ProcessingInventory.java rename to src/main/java/com/simibubi/create/content/contraptions/processing/ProcessingInventory.java index 706ecb5ab..4e2a4d77f 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/processing/ProcessingInventory.java +++ b/src/main/java/com/simibubi/create/content/contraptions/processing/ProcessingInventory.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.contraptions.processing; +package com.simibubi.create.content.contraptions.processing; import java.util.function.Consumer; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/processing/ProcessingOutput.java b/src/main/java/com/simibubi/create/content/contraptions/processing/ProcessingOutput.java similarity index 93% rename from src/main/java/com/simibubi/create/modules/contraptions/processing/ProcessingOutput.java rename to src/main/java/com/simibubi/create/content/contraptions/processing/ProcessingOutput.java index 9127a5ee5..aacc6d39c 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/processing/ProcessingOutput.java +++ b/src/main/java/com/simibubi/create/content/contraptions/processing/ProcessingOutput.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.contraptions.processing; +package com.simibubi.create.content.contraptions.processing; import java.util.Random; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/processing/ProcessingRecipe.java b/src/main/java/com/simibubi/create/content/contraptions/processing/ProcessingRecipe.java similarity index 93% rename from src/main/java/com/simibubi/create/modules/contraptions/processing/ProcessingRecipe.java rename to src/main/java/com/simibubi/create/content/contraptions/processing/ProcessingRecipe.java index faee5d689..ae665072a 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/processing/ProcessingRecipe.java +++ b/src/main/java/com/simibubi/create/content/contraptions/processing/ProcessingRecipe.java @@ -1,10 +1,10 @@ -package com.simibubi.create.modules.contraptions.processing; +package com.simibubi.create.content.contraptions.processing; import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; -import com.simibubi.create.AllRecipes; +import com.simibubi.create.AllRecipeTypes; import com.simibubi.create.Create; import net.minecraft.inventory.IInventory; @@ -25,7 +25,7 @@ public abstract class ProcessingRecipe implements IRecipe< protected final String group; protected final int processingDuration; - public ProcessingRecipe(AllRecipes recipeType, ResourceLocation id, String group, + public ProcessingRecipe(AllRecipeTypes recipeType, ResourceLocation id, String group, List ingredients, List results, int processingDuration) { this.type = recipeType.type; this.serializer = recipeType.serializer; @@ -37,7 +37,7 @@ public abstract class ProcessingRecipe implements IRecipe< validate(recipeType); } - private void validate(AllRecipes recipeType) { + private void validate(AllRecipeTypes recipeType) { if (ingredients.size() > getMaxInputCount()) Create.logger.warn("Your custom " + recipeType.name() + " recipe (" + id.toString() + ") has more inputs (" + ingredients.size() + ") than supported (" + getMaxInputCount() + ")."); diff --git a/src/main/java/com/simibubi/create/modules/contraptions/processing/ProcessingRecipeSerializer.java b/src/main/java/com/simibubi/create/content/contraptions/processing/ProcessingRecipeSerializer.java similarity index 98% rename from src/main/java/com/simibubi/create/modules/contraptions/processing/ProcessingRecipeSerializer.java rename to src/main/java/com/simibubi/create/content/contraptions/processing/ProcessingRecipeSerializer.java index 1bde1bd31..aff3b800f 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/processing/ProcessingRecipeSerializer.java +++ b/src/main/java/com/simibubi/create/content/contraptions/processing/ProcessingRecipeSerializer.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.contraptions.processing; +package com.simibubi.create.content.contraptions.processing; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/relays/advanced/SpeedControllerBlock.java b/src/main/java/com/simibubi/create/content/contraptions/relays/advanced/SpeedControllerBlock.java similarity index 84% rename from src/main/java/com/simibubi/create/modules/contraptions/relays/advanced/SpeedControllerBlock.java rename to src/main/java/com/simibubi/create/content/contraptions/relays/advanced/SpeedControllerBlock.java index 2fb086769..83a6d203f 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/relays/advanced/SpeedControllerBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/relays/advanced/SpeedControllerBlock.java @@ -1,8 +1,8 @@ -package com.simibubi.create.modules.contraptions.relays.advanced; +package com.simibubi.create.content.contraptions.relays.advanced; -import com.simibubi.create.foundation.utility.AllShapes; -import com.simibubi.create.modules.contraptions.base.HorizontalAxisKineticBlock; -import com.simibubi.create.modules.contraptions.relays.elementary.CogWheelBlock; +import com.simibubi.create.AllShapes; +import com.simibubi.create.content.contraptions.base.HorizontalAxisKineticBlock; +import com.simibubi.create.content.contraptions.relays.elementary.CogWheelBlock; import net.minecraft.block.BlockState; import net.minecraft.item.BlockItemUseContext; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/relays/advanced/SpeedControllerRenderer.java b/src/main/java/com/simibubi/create/content/contraptions/relays/advanced/SpeedControllerRenderer.java similarity index 85% rename from src/main/java/com/simibubi/create/modules/contraptions/relays/advanced/SpeedControllerRenderer.java rename to src/main/java/com/simibubi/create/content/contraptions/relays/advanced/SpeedControllerRenderer.java index 28487ef8e..9e8c302bf 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/relays/advanced/SpeedControllerRenderer.java +++ b/src/main/java/com/simibubi/create/content/contraptions/relays/advanced/SpeedControllerRenderer.java @@ -1,10 +1,10 @@ -package com.simibubi.create.modules.contraptions.relays.advanced; +package com.simibubi.create.content.contraptions.relays.advanced; import com.mojang.blaze3d.matrix.MatrixStack; import com.simibubi.create.CreateClient; -import com.simibubi.create.foundation.behaviour.base.SmartTileEntityRenderer; +import com.simibubi.create.content.contraptions.base.KineticTileEntityRenderer; +import com.simibubi.create.foundation.tileEntity.renderer.SmartTileEntityRenderer; import com.simibubi.create.foundation.utility.SuperByteBuffer; -import com.simibubi.create.modules.contraptions.base.KineticTileEntityRenderer; import net.minecraft.client.renderer.IRenderTypeBuffer; import net.minecraft.client.renderer.RenderType; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/relays/advanced/SpeedControllerTileEntity.java b/src/main/java/com/simibubi/create/content/contraptions/relays/advanced/SpeedControllerTileEntity.java similarity index 86% rename from src/main/java/com/simibubi/create/modules/contraptions/relays/advanced/SpeedControllerTileEntity.java rename to src/main/java/com/simibubi/create/content/contraptions/relays/advanced/SpeedControllerTileEntity.java index fbccb83d3..36b3d9fe5 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/relays/advanced/SpeedControllerTileEntity.java +++ b/src/main/java/com/simibubi/create/content/contraptions/relays/advanced/SpeedControllerTileEntity.java @@ -1,17 +1,17 @@ -package com.simibubi.create.modules.contraptions.relays.advanced; +package com.simibubi.create.content.contraptions.relays.advanced; import java.util.List; import com.simibubi.create.AllTileEntities; -import com.simibubi.create.config.AllConfigs; -import com.simibubi.create.foundation.behaviour.ValueBoxTransform; -import com.simibubi.create.foundation.behaviour.base.TileEntityBehaviour; -import com.simibubi.create.foundation.behaviour.scrollvalue.ScrollValueBehaviour; +import com.simibubi.create.content.contraptions.RotationPropagator; +import com.simibubi.create.content.contraptions.base.KineticTileEntity; +import com.simibubi.create.content.contraptions.components.motor.MotorTileEntity; +import com.simibubi.create.foundation.config.AllConfigs; +import com.simibubi.create.foundation.tileEntity.TileEntityBehaviour; +import com.simibubi.create.foundation.tileEntity.behaviour.ValueBoxTransform; +import com.simibubi.create.foundation.tileEntity.behaviour.scrollvalue.ScrollValueBehaviour; import com.simibubi.create.foundation.utility.Lang; import com.simibubi.create.foundation.utility.VecHelper; -import com.simibubi.create.modules.contraptions.RotationPropagator; -import com.simibubi.create.modules.contraptions.base.KineticTileEntity; -import com.simibubi.create.modules.contraptions.components.motor.MotorTileEntity; import net.minecraft.block.BlockState; import net.minecraft.util.Direction; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/relays/advanced/sequencer/ConfigureSequencedGearshiftPacket.java b/src/main/java/com/simibubi/create/content/contraptions/relays/advanced/sequencer/ConfigureSequencedGearshiftPacket.java similarity index 88% rename from src/main/java/com/simibubi/create/modules/contraptions/relays/advanced/sequencer/ConfigureSequencedGearshiftPacket.java rename to src/main/java/com/simibubi/create/content/contraptions/relays/advanced/sequencer/ConfigureSequencedGearshiftPacket.java index 7c5311bbc..d47fd8a9e 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/relays/advanced/sequencer/ConfigureSequencedGearshiftPacket.java +++ b/src/main/java/com/simibubi/create/content/contraptions/relays/advanced/sequencer/ConfigureSequencedGearshiftPacket.java @@ -1,6 +1,6 @@ -package com.simibubi.create.modules.contraptions.relays.advanced.sequencer; +package com.simibubi.create.content.contraptions.relays.advanced.sequencer; -import com.simibubi.create.foundation.packet.TileEntityConfigurationPacket; +import com.simibubi.create.foundation.networking.TileEntityConfigurationPacket; import net.minecraft.nbt.CompoundNBT; import net.minecraft.nbt.ListNBT; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/relays/advanced/sequencer/Instruction.java b/src/main/java/com/simibubi/create/content/contraptions/relays/advanced/sequencer/Instruction.java similarity index 97% rename from src/main/java/com/simibubi/create/modules/contraptions/relays/advanced/sequencer/Instruction.java rename to src/main/java/com/simibubi/create/content/contraptions/relays/advanced/sequencer/Instruction.java index 1335ac686..5a50fffc1 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/relays/advanced/sequencer/Instruction.java +++ b/src/main/java/com/simibubi/create/content/contraptions/relays/advanced/sequencer/Instruction.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.contraptions.relays.advanced.sequencer; +package com.simibubi.create.content.contraptions.relays.advanced.sequencer; import java.util.Vector; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/relays/advanced/sequencer/InstructionSpeedModifiers.java b/src/main/java/com/simibubi/create/content/contraptions/relays/advanced/sequencer/InstructionSpeedModifiers.java similarity index 91% rename from src/main/java/com/simibubi/create/modules/contraptions/relays/advanced/sequencer/InstructionSpeedModifiers.java rename to src/main/java/com/simibubi/create/content/contraptions/relays/advanced/sequencer/InstructionSpeedModifiers.java index fae6ba089..546404ea9 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/relays/advanced/sequencer/InstructionSpeedModifiers.java +++ b/src/main/java/com/simibubi/create/content/contraptions/relays/advanced/sequencer/InstructionSpeedModifiers.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.contraptions.relays.advanced.sequencer; +package com.simibubi.create.content.contraptions.relays.advanced.sequencer; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/relays/advanced/sequencer/SequencedGearshiftBlock.java b/src/main/java/com/simibubi/create/content/contraptions/relays/advanced/sequencer/SequencedGearshiftBlock.java similarity index 95% rename from src/main/java/com/simibubi/create/modules/contraptions/relays/advanced/sequencer/SequencedGearshiftBlock.java rename to src/main/java/com/simibubi/create/content/contraptions/relays/advanced/sequencer/SequencedGearshiftBlock.java index d01870312..9a46ffa13 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/relays/advanced/sequencer/SequencedGearshiftBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/relays/advanced/sequencer/SequencedGearshiftBlock.java @@ -1,11 +1,11 @@ -package com.simibubi.create.modules.contraptions.relays.advanced.sequencer; +package com.simibubi.create.content.contraptions.relays.advanced.sequencer; import com.simibubi.create.AllItems; +import com.simibubi.create.content.contraptions.base.HorizontalAxisKineticBlock; +import com.simibubi.create.content.contraptions.base.KineticBlock; +import com.simibubi.create.content.contraptions.base.RotatedPillarKineticBlock; import com.simibubi.create.foundation.block.ITE; import com.simibubi.create.foundation.gui.ScreenOpener; -import com.simibubi.create.modules.contraptions.base.HorizontalAxisKineticBlock; -import com.simibubi.create.modules.contraptions.base.KineticBlock; -import com.simibubi.create.modules.contraptions.base.RotatedPillarKineticBlock; import net.minecraft.block.Block; import net.minecraft.block.BlockState; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/relays/advanced/sequencer/SequencedGearshiftGenerator.java b/src/main/java/com/simibubi/create/content/contraptions/relays/advanced/sequencer/SequencedGearshiftGenerator.java similarity index 88% rename from src/main/java/com/simibubi/create/modules/contraptions/relays/advanced/sequencer/SequencedGearshiftGenerator.java rename to src/main/java/com/simibubi/create/content/contraptions/relays/advanced/sequencer/SequencedGearshiftGenerator.java index d56b8fc0f..86b5f5b59 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/relays/advanced/sequencer/SequencedGearshiftGenerator.java +++ b/src/main/java/com/simibubi/create/content/contraptions/relays/advanced/sequencer/SequencedGearshiftGenerator.java @@ -1,6 +1,6 @@ -package com.simibubi.create.modules.contraptions.relays.advanced.sequencer; +package com.simibubi.create.content.contraptions.relays.advanced.sequencer; -import com.simibubi.create.foundation.utility.data.SpecialBlockStateGen; +import com.simibubi.create.foundation.data.SpecialBlockStateGen; import com.tterrag.registrate.providers.DataGenContext; import com.tterrag.registrate.providers.RegistrateBlockstateProvider; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/relays/advanced/sequencer/SequencedGearshiftScreen.java b/src/main/java/com/simibubi/create/content/contraptions/relays/advanced/sequencer/SequencedGearshiftScreen.java similarity index 95% rename from src/main/java/com/simibubi/create/modules/contraptions/relays/advanced/sequencer/SequencedGearshiftScreen.java rename to src/main/java/com/simibubi/create/content/contraptions/relays/advanced/sequencer/SequencedGearshiftScreen.java index a5be9d539..eeabcbd29 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/relays/advanced/sequencer/SequencedGearshiftScreen.java +++ b/src/main/java/com/simibubi/create/content/contraptions/relays/advanced/sequencer/SequencedGearshiftScreen.java @@ -1,15 +1,15 @@ -package com.simibubi.create.modules.contraptions.relays.advanced.sequencer; +package com.simibubi.create.content.contraptions.relays.advanced.sequencer; import java.util.Vector; import com.mojang.blaze3d.systems.RenderSystem; import com.simibubi.create.AllBlocks; -import com.simibubi.create.AllPackets; -import com.simibubi.create.ScreenResources; import com.simibubi.create.foundation.gui.AbstractSimiScreen; +import com.simibubi.create.foundation.gui.AllGuiTextures; import com.simibubi.create.foundation.gui.GuiGameElement; import com.simibubi.create.foundation.gui.widgets.ScrollInput; import com.simibubi.create.foundation.gui.widgets.SelectionScrollInput; +import com.simibubi.create.foundation.networking.AllPackets; import com.simibubi.create.foundation.utility.Lang; import net.minecraft.item.ItemStack; @@ -19,7 +19,7 @@ import net.minecraft.util.math.BlockPos; public class SequencedGearshiftScreen extends AbstractSimiScreen { private final ItemStack renderedItem = new ItemStack(AllBlocks.SEQUENCED_GEARSHIFT.get()); - private final ScreenResources background = ScreenResources.SEQUENCER; + private final AllGuiTextures background = AllGuiTextures.SEQUENCER; private final String title = Lang.translate("gui.sequenced_gearshift.title"); private ListNBT compareTag; @@ -118,7 +118,7 @@ public class SequencedGearshiftScreen extends AbstractSimiScreen { background.draw(this, guiLeft, guiTop); for (int row = 0; row < instructions.capacity(); row++) { - ScreenResources toDraw = ScreenResources.SEQUENCER_EMPTY; + AllGuiTextures toDraw = AllGuiTextures.SEQUENCER_EMPTY; int yOffset = toDraw.height * row; if (row < instructions.size()) { diff --git a/src/main/java/com/simibubi/create/modules/contraptions/relays/advanced/sequencer/SequencedGearshiftTileEntity.java b/src/main/java/com/simibubi/create/content/contraptions/relays/advanced/sequencer/SequencedGearshiftTileEntity.java similarity index 96% rename from src/main/java/com/simibubi/create/modules/contraptions/relays/advanced/sequencer/SequencedGearshiftTileEntity.java rename to src/main/java/com/simibubi/create/content/contraptions/relays/advanced/sequencer/SequencedGearshiftTileEntity.java index 26453997c..2252d195e 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/relays/advanced/sequencer/SequencedGearshiftTileEntity.java +++ b/src/main/java/com/simibubi/create/content/contraptions/relays/advanced/sequencer/SequencedGearshiftTileEntity.java @@ -1,9 +1,9 @@ -package com.simibubi.create.modules.contraptions.relays.advanced.sequencer; +package com.simibubi.create.content.contraptions.relays.advanced.sequencer; import java.util.Vector; import com.simibubi.create.AllTileEntities; -import com.simibubi.create.modules.contraptions.relays.encased.SplitShaftTileEntity; +import com.simibubi.create.content.contraptions.relays.encased.SplitShaftTileEntity; import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.Direction; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/relays/advanced/sequencer/SequencerInstructions.java b/src/main/java/com/simibubi/create/content/contraptions/relays/advanced/sequencer/SequencerInstructions.java similarity index 67% rename from src/main/java/com/simibubi/create/modules/contraptions/relays/advanced/sequencer/SequencerInstructions.java rename to src/main/java/com/simibubi/create/content/contraptions/relays/advanced/sequencer/SequencerInstructions.java index e80f44f02..e4b397bc7 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/relays/advanced/sequencer/SequencerInstructions.java +++ b/src/main/java/com/simibubi/create/content/contraptions/relays/advanced/sequencer/SequencerInstructions.java @@ -1,17 +1,17 @@ -package com.simibubi.create.modules.contraptions.relays.advanced.sequencer; +package com.simibubi.create.content.contraptions.relays.advanced.sequencer; import java.util.ArrayList; import java.util.List; -import com.simibubi.create.ScreenResources; +import com.simibubi.create.foundation.gui.AllGuiTextures; import com.simibubi.create.foundation.utility.Lang; public enum SequencerInstructions { - TURN_ANGLE("angle", ScreenResources.SEQUENCER_INSTRUCTION, true, true, 360, 45, 90), - TURN_DISTANCE("distance", ScreenResources.SEQUENCER_INSTRUCTION, true, true, 50, 5, 5), - WAIT("duration", ScreenResources.SEQUENCER_WAIT, true, false, 600, 20, 10), - END("", ScreenResources.SEQUENCER_END), + TURN_ANGLE("angle", AllGuiTextures.SEQUENCER_INSTRUCTION, true, true, 360, 45, 90), + TURN_DISTANCE("distance", AllGuiTextures.SEQUENCER_INSTRUCTION, true, true, 50, 5, 5), + WAIT("duration", AllGuiTextures.SEQUENCER_WAIT, true, false, 600, 20, 10), + END("", AllGuiTextures.SEQUENCER_END), ; @@ -19,16 +19,16 @@ public enum SequencerInstructions { String parameterKey; boolean hasValueParameter; boolean hasSpeedParameter; - ScreenResources background; + AllGuiTextures background; int maxValue; int shiftStep; int defaultValue; - private SequencerInstructions(String parameterName, ScreenResources background) { + private SequencerInstructions(String parameterName, AllGuiTextures background) { this(parameterName, background, false, false, -1, -1, -1); } - private SequencerInstructions(String parameterName, ScreenResources background, boolean hasValueParameter, + private SequencerInstructions(String parameterName, AllGuiTextures background, boolean hasValueParameter, boolean hasSpeedParameter, int maxValue, int shiftStep, int defaultValue) { this.hasValueParameter = hasValueParameter; this.hasSpeedParameter = hasSpeedParameter; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/relays/belt/AllBeltAttachments.java b/src/main/java/com/simibubi/create/content/contraptions/relays/belt/AllBeltAttachments.java similarity index 98% rename from src/main/java/com/simibubi/create/modules/contraptions/relays/belt/AllBeltAttachments.java rename to src/main/java/com/simibubi/create/content/contraptions/relays/belt/AllBeltAttachments.java index bbbab1b93..7f01d12e6 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/relays/belt/AllBeltAttachments.java +++ b/src/main/java/com/simibubi/create/content/contraptions/relays/belt/AllBeltAttachments.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.contraptions.relays.belt; +package com.simibubi.create.content.contraptions.relays.belt; import java.util.LinkedList; import java.util.List; @@ -6,7 +6,7 @@ import java.util.function.Consumer; import com.simibubi.create.AllBlocks; import com.simibubi.create.Create; -import com.simibubi.create.modules.contraptions.relays.belt.transport.TransportedItemStack; +import com.simibubi.create.content.contraptions.relays.belt.transport.TransportedItemStack; import net.minecraft.block.Block; import net.minecraft.block.BlockState; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/relays/belt/BeltBlock.java b/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltBlock.java similarity index 97% rename from src/main/java/com/simibubi/create/modules/contraptions/relays/belt/BeltBlock.java rename to src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltBlock.java index 5adbb4de8..3ddf932d9 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/relays/belt/BeltBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltBlock.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.contraptions.relays.belt; +package com.simibubi.create.content.contraptions.relays.belt; import java.util.ArrayList; import java.util.Collections; @@ -9,16 +9,16 @@ import org.apache.commons.lang3.mutable.MutableInt; import com.simibubi.create.AllBlocks; import com.simibubi.create.AllItems; +import com.simibubi.create.content.contraptions.base.HorizontalKineticBlock; +import com.simibubi.create.content.contraptions.relays.belt.transport.BeltMovementHandler.TransportedEntityInfo; +import com.simibubi.create.content.logistics.block.belts.tunnel.BeltTunnelBlock; +import com.simibubi.create.content.schematics.ISpecialBlockItemRequirement; +import com.simibubi.create.content.schematics.ItemRequirement; +import com.simibubi.create.content.schematics.ItemRequirement.ItemUseType; import com.simibubi.create.foundation.block.IHaveColorHandler; import com.simibubi.create.foundation.block.ITE; import com.simibubi.create.foundation.utility.Iterate; import com.simibubi.create.foundation.utility.Lang; -import com.simibubi.create.modules.contraptions.base.HorizontalKineticBlock; -import com.simibubi.create.modules.contraptions.relays.belt.transport.BeltMovementHandler.TransportedEntityInfo; -import com.simibubi.create.modules.logistics.block.belts.tunnel.BeltTunnelBlock; -import com.simibubi.create.modules.schematics.ISpecialBlockItemRequirement; -import com.simibubi.create.modules.schematics.ItemRequirement; -import com.simibubi.create.modules.schematics.ItemRequirement.ItemUseType; import net.minecraft.block.Block; import net.minecraft.block.BlockRenderType; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/relays/belt/BeltColor.java b/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltColor.java similarity index 92% rename from src/main/java/com/simibubi/create/modules/contraptions/relays/belt/BeltColor.java rename to src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltColor.java index f52051351..d3be41a99 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/relays/belt/BeltColor.java +++ b/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltColor.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.contraptions.relays.belt; +package com.simibubi.create.content.contraptions.relays.belt; import net.minecraft.block.BlockState; import net.minecraft.client.renderer.color.IBlockColor; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/relays/belt/BeltGenerator.java b/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltGenerator.java similarity index 89% rename from src/main/java/com/simibubi/create/modules/contraptions/relays/belt/BeltGenerator.java rename to src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltGenerator.java index 55b48bc91..8258334f2 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/relays/belt/BeltGenerator.java +++ b/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltGenerator.java @@ -1,8 +1,8 @@ -package com.simibubi.create.modules.contraptions.relays.belt; +package com.simibubi.create.content.contraptions.relays.belt; -import com.simibubi.create.foundation.utility.data.SpecialBlockStateGen; -import com.simibubi.create.modules.contraptions.relays.belt.BeltBlock.Part; -import com.simibubi.create.modules.contraptions.relays.belt.BeltBlock.Slope; +import com.simibubi.create.content.contraptions.relays.belt.BeltBlock.Part; +import com.simibubi.create.content.contraptions.relays.belt.BeltBlock.Slope; +import com.simibubi.create.foundation.data.SpecialBlockStateGen; import com.tterrag.registrate.providers.DataGenContext; import com.tterrag.registrate.providers.RegistrateBlockstateProvider; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/relays/belt/BeltHelper.java b/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltHelper.java similarity index 95% rename from src/main/java/com/simibubi/create/modules/contraptions/relays/belt/BeltHelper.java rename to src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltHelper.java index 9adbcb5be..226f2b026 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/relays/belt/BeltHelper.java +++ b/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltHelper.java @@ -1,7 +1,7 @@ -package com.simibubi.create.modules.contraptions.relays.belt; +package com.simibubi.create.content.contraptions.relays.belt; +import com.simibubi.create.content.contraptions.relays.belt.BeltBlock.Slope; import com.simibubi.create.foundation.utility.VecHelper; -import com.simibubi.create.modules.contraptions.relays.belt.BeltBlock.Slope; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/relays/belt/BeltShapes.java b/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltShapes.java similarity index 98% rename from src/main/java/com/simibubi/create/modules/contraptions/relays/belt/BeltShapes.java rename to src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltShapes.java index eb5d0291e..b43c3cc10 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/relays/belt/BeltShapes.java +++ b/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltShapes.java @@ -1,14 +1,14 @@ -package com.simibubi.create.modules.contraptions.relays.belt; +package com.simibubi.create.content.contraptions.relays.belt; import static net.minecraft.block.Block.makeCuboidShape; import java.util.HashMap; import java.util.Map; -import com.simibubi.create.foundation.utility.AllShapes; +import com.simibubi.create.AllShapes; +import com.simibubi.create.content.contraptions.relays.belt.BeltBlock.Part; +import com.simibubi.create.content.contraptions.relays.belt.BeltBlock.Slope; import com.simibubi.create.foundation.utility.VoxelShaper; -import com.simibubi.create.modules.contraptions.relays.belt.BeltBlock.Part; -import com.simibubi.create.modules.contraptions.relays.belt.BeltBlock.Slope; import net.minecraft.block.BlockState; import net.minecraft.util.Direction; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/relays/belt/BeltTileEntity.java b/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltTileEntity.java similarity index 92% rename from src/main/java/com/simibubi/create/modules/contraptions/relays/belt/BeltTileEntity.java rename to src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltTileEntity.java index 51246ca40..e9c730280 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/relays/belt/BeltTileEntity.java +++ b/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltTileEntity.java @@ -1,10 +1,10 @@ -package com.simibubi.create.modules.contraptions.relays.belt; +package com.simibubi.create.content.contraptions.relays.belt; -import static com.simibubi.create.modules.contraptions.relays.belt.BeltBlock.Part.END; -import static com.simibubi.create.modules.contraptions.relays.belt.BeltBlock.Part.MIDDLE; -import static com.simibubi.create.modules.contraptions.relays.belt.BeltBlock.Slope.DOWNWARD; -import static com.simibubi.create.modules.contraptions.relays.belt.BeltBlock.Slope.HORIZONTAL; -import static com.simibubi.create.modules.contraptions.relays.belt.BeltBlock.Slope.UPWARD; +import static com.simibubi.create.content.contraptions.relays.belt.BeltBlock.Part.END; +import static com.simibubi.create.content.contraptions.relays.belt.BeltBlock.Part.MIDDLE; +import static com.simibubi.create.content.contraptions.relays.belt.BeltBlock.Slope.DOWNWARD; +import static com.simibubi.create.content.contraptions.relays.belt.BeltBlock.Slope.HORIZONTAL; +import static com.simibubi.create.content.contraptions.relays.belt.BeltBlock.Slope.UPWARD; import static net.minecraft.util.Direction.AxisDirection.NEGATIVE; import static net.minecraft.util.Direction.AxisDirection.POSITIVE; @@ -15,15 +15,15 @@ import java.util.Map; import com.simibubi.create.AllBlocks; import com.simibubi.create.AllTileEntities; +import com.simibubi.create.content.contraptions.base.KineticTileEntity; +import com.simibubi.create.content.contraptions.relays.belt.AllBeltAttachments.Tracker; +import com.simibubi.create.content.contraptions.relays.belt.BeltBlock.Part; +import com.simibubi.create.content.contraptions.relays.belt.BeltBlock.Slope; +import com.simibubi.create.content.contraptions.relays.belt.transport.BeltInventory; +import com.simibubi.create.content.contraptions.relays.belt.transport.BeltMovementHandler; +import com.simibubi.create.content.contraptions.relays.belt.transport.TransportedItemStack; +import com.simibubi.create.content.contraptions.relays.belt.transport.BeltMovementHandler.TransportedEntityInfo; import com.simibubi.create.foundation.utility.ColorHelper; -import com.simibubi.create.modules.contraptions.base.KineticTileEntity; -import com.simibubi.create.modules.contraptions.relays.belt.AllBeltAttachments.Tracker; -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.belt.transport.BeltInventory; -import com.simibubi.create.modules.contraptions.relays.belt.transport.BeltMovementHandler; -import com.simibubi.create.modules.contraptions.relays.belt.transport.BeltMovementHandler.TransportedEntityInfo; -import com.simibubi.create.modules.contraptions.relays.belt.transport.TransportedItemStack; import net.minecraft.block.BlockState; import net.minecraft.entity.Entity; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/relays/belt/BeltTileEntityRenderer.java b/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltTileEntityRenderer.java similarity index 92% rename from src/main/java/com/simibubi/create/modules/contraptions/relays/belt/BeltTileEntityRenderer.java rename to src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltTileEntityRenderer.java index 11314d18c..d5d534a25 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/relays/belt/BeltTileEntityRenderer.java +++ b/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltTileEntityRenderer.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.contraptions.relays.belt; +package com.simibubi.create.content.contraptions.relays.belt; import static net.minecraft.state.properties.BlockStateProperties.HORIZONTAL_FACING; @@ -10,15 +10,15 @@ import com.simibubi.create.AllBlockPartials; import com.simibubi.create.AllBlocks; import com.simibubi.create.AllSpriteShifts; import com.simibubi.create.CreateClient; -import com.simibubi.create.foundation.block.SafeTileEntityRenderer; +import com.simibubi.create.content.contraptions.base.KineticTileEntity; +import com.simibubi.create.content.contraptions.base.KineticTileEntityRenderer; +import com.simibubi.create.content.contraptions.relays.belt.BeltBlock.Slope; +import com.simibubi.create.content.contraptions.relays.belt.transport.TransportedItemStack; +import com.simibubi.create.foundation.tileEntity.renderer.SafeTileEntityRenderer; import com.simibubi.create.foundation.utility.AnimationTickHolder; -import com.simibubi.create.foundation.utility.IndependentShadowRenderer; +import com.simibubi.create.foundation.utility.ShadowRenderHelper; import com.simibubi.create.foundation.utility.SuperByteBuffer; import com.simibubi.create.foundation.utility.TessellatorHelper; -import com.simibubi.create.modules.contraptions.base.KineticTileEntity; -import com.simibubi.create.modules.contraptions.base.KineticTileEntityRenderer; -import com.simibubi.create.modules.contraptions.relays.belt.BeltBlock.Slope; -import com.simibubi.create.modules.contraptions.relays.belt.transport.TransportedItemStack; import net.minecraft.block.BlockState; import net.minecraft.client.Minecraft; @@ -144,7 +144,7 @@ public class BeltTileEntityRenderer extends SafeTileEntityRenderer { public SandPaperPolishingRecipe(ResourceLocation id, String group, List ingredients, List results, int processingDuration) { - super(AllRecipes.SANDPAPER_POLISHING, id, group, ingredients, results, processingDuration); + super(AllRecipeTypes.SANDPAPER_POLISHING, id, group, ingredients, results, processingDuration); } public static boolean canPolish(World world, ItemStack stack) { @@ -43,7 +43,7 @@ public class SandPaperPolishingRecipe extends ProcessingRecipe { } public static List> getMatchingRecipes(World world, ItemStack stack) { - return world.getRecipeManager().getRecipes(AllRecipes.SANDPAPER_POLISHING.getType(), new SandPaperInv(stack), + return world.getRecipeManager().getRecipes(AllRecipeTypes.SANDPAPER_POLISHING.getType(), new SandPaperInv(stack), world); } diff --git a/src/main/java/com/simibubi/create/modules/curiosities/zapper/PlacementPatterns.java b/src/main/java/com/simibubi/create/content/curiosities/zapper/PlacementPatterns.java similarity index 72% rename from src/main/java/com/simibubi/create/modules/curiosities/zapper/PlacementPatterns.java rename to src/main/java/com/simibubi/create/content/curiosities/zapper/PlacementPatterns.java index 4709afa3f..416400af0 100644 --- a/src/main/java/com/simibubi/create/modules/curiosities/zapper/PlacementPatterns.java +++ b/src/main/java/com/simibubi/create/content/curiosities/zapper/PlacementPatterns.java @@ -1,11 +1,11 @@ -package com.simibubi.create.modules.curiosities.zapper; +package com.simibubi.create.content.curiosities.zapper; import java.util.List; import java.util.Random; import java.util.function.Predicate; import com.google.common.base.Predicates; -import com.simibubi.create.ScreenResources; +import com.simibubi.create.foundation.gui.AllIcons; import com.simibubi.create.foundation.utility.Lang; import net.minecraft.item.ItemStack; @@ -14,17 +14,17 @@ import net.minecraft.util.math.BlockPos; public enum PlacementPatterns { - Solid(ScreenResources.I_PATTERN_SOLID), - Checkered(ScreenResources.I_PATTERN_CHECKERED), - InverseCheckered(ScreenResources.I_PATTERN_CHECKERED_INVERSED), - Chance25(ScreenResources.I_PATTERN_CHANCE_25), - Chance50(ScreenResources.I_PATTERN_CHANCE_50), - Chance75(ScreenResources.I_PATTERN_CHANCE_75); + Solid(AllIcons.I_PATTERN_SOLID), + Checkered(AllIcons.I_PATTERN_CHECKERED), + InverseCheckered(AllIcons.I_PATTERN_CHECKERED_INVERSED), + Chance25(AllIcons.I_PATTERN_CHANCE_25), + Chance50(AllIcons.I_PATTERN_CHANCE_50), + Chance75(AllIcons.I_PATTERN_CHANCE_75); public String translationKey; - public ScreenResources icon; + public AllIcons icon; - private PlacementPatterns(ScreenResources icon) { + private PlacementPatterns(AllIcons icon) { this.translationKey = Lang.asId(name()); this.icon = icon; } diff --git a/src/main/java/com/simibubi/create/modules/curiosities/zapper/ZapperBeamPacket.java b/src/main/java/com/simibubi/create/content/curiosities/zapper/ZapperBeamPacket.java similarity index 90% rename from src/main/java/com/simibubi/create/modules/curiosities/zapper/ZapperBeamPacket.java rename to src/main/java/com/simibubi/create/content/curiosities/zapper/ZapperBeamPacket.java index db434fdb5..3fc30e373 100644 --- a/src/main/java/com/simibubi/create/modules/curiosities/zapper/ZapperBeamPacket.java +++ b/src/main/java/com/simibubi/create/content/curiosities/zapper/ZapperBeamPacket.java @@ -1,9 +1,9 @@ -package com.simibubi.create.modules.curiosities.zapper; +package com.simibubi.create.content.curiosities.zapper; import java.util.function.Supplier; -import com.simibubi.create.foundation.packet.SimplePacketBase; -import com.simibubi.create.modules.curiosities.zapper.ZapperRenderHandler.LaserBeam; +import com.simibubi.create.content.curiosities.zapper.ZapperRenderHandler.LaserBeam; +import com.simibubi.create.foundation.networking.SimplePacketBase; import net.minecraft.client.Minecraft; import net.minecraft.network.PacketBuffer; diff --git a/src/main/java/com/simibubi/create/modules/curiosities/zapper/ZapperItem.java b/src/main/java/com/simibubi/create/content/curiosities/zapper/ZapperItem.java similarity index 98% rename from src/main/java/com/simibubi/create/modules/curiosities/zapper/ZapperItem.java rename to src/main/java/com/simibubi/create/content/curiosities/zapper/ZapperItem.java index e0b0b4b51..c84d8246a 100644 --- a/src/main/java/com/simibubi/create/modules/curiosities/zapper/ZapperItem.java +++ b/src/main/java/com/simibubi/create/content/curiosities/zapper/ZapperItem.java @@ -1,10 +1,10 @@ -package com.simibubi.create.modules.curiosities.zapper; +package com.simibubi.create.content.curiosities.zapper; import java.util.List; -import com.simibubi.create.AllPackets; import com.simibubi.create.AllSoundEvents; import com.simibubi.create.foundation.item.ItemDescription; +import com.simibubi.create.foundation.networking.AllPackets; import com.simibubi.create.foundation.utility.BlockHelper; import com.simibubi.create.foundation.utility.Lang; diff --git a/src/main/java/com/simibubi/create/modules/curiosities/zapper/ZapperItemRenderer.java b/src/main/java/com/simibubi/create/content/curiosities/zapper/ZapperItemRenderer.java similarity index 96% rename from src/main/java/com/simibubi/create/modules/curiosities/zapper/ZapperItemRenderer.java rename to src/main/java/com/simibubi/create/content/curiosities/zapper/ZapperItemRenderer.java index 5f2ffcc33..c4eefc0a7 100644 --- a/src/main/java/com/simibubi/create/modules/curiosities/zapper/ZapperItemRenderer.java +++ b/src/main/java/com/simibubi/create/content/curiosities/zapper/ZapperItemRenderer.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.curiosities.zapper; +package com.simibubi.create.content.curiosities.zapper; import com.mojang.blaze3d.matrix.MatrixStack; diff --git a/src/main/java/com/simibubi/create/modules/curiosities/zapper/ZapperLog.java b/src/main/java/com/simibubi/create/content/curiosities/zapper/ZapperLog.java similarity index 92% rename from src/main/java/com/simibubi/create/modules/curiosities/zapper/ZapperLog.java rename to src/main/java/com/simibubi/create/content/curiosities/zapper/ZapperLog.java index 1813a1d3c..13d826bb4 100644 --- a/src/main/java/com/simibubi/create/modules/curiosities/zapper/ZapperLog.java +++ b/src/main/java/com/simibubi/create/content/curiosities/zapper/ZapperLog.java @@ -1,10 +1,10 @@ -package com.simibubi.create.modules.curiosities.zapper; +package com.simibubi.create.content.curiosities.zapper; import java.util.LinkedList; import java.util.List; import java.util.stream.Collectors; -import com.simibubi.create.config.AllConfigs; +import com.simibubi.create.foundation.config.AllConfigs; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/com/simibubi/create/modules/curiosities/zapper/ZapperRenderHandler.java b/src/main/java/com/simibubi/create/content/curiosities/zapper/ZapperRenderHandler.java similarity index 99% rename from src/main/java/com/simibubi/create/modules/curiosities/zapper/ZapperRenderHandler.java rename to src/main/java/com/simibubi/create/content/curiosities/zapper/ZapperRenderHandler.java index 3e4c53243..31eedbb19 100644 --- a/src/main/java/com/simibubi/create/modules/curiosities/zapper/ZapperRenderHandler.java +++ b/src/main/java/com/simibubi/create/content/curiosities/zapper/ZapperRenderHandler.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.curiosities.zapper; +package com.simibubi.create.content.curiosities.zapper; import java.util.LinkedList; import java.util.List; diff --git a/src/main/java/com/simibubi/create/modules/curiosities/zapper/ZapperScreen.java b/src/main/java/com/simibubi/create/content/curiosities/zapper/ZapperScreen.java similarity index 93% rename from src/main/java/com/simibubi/create/modules/curiosities/zapper/ZapperScreen.java rename to src/main/java/com/simibubi/create/content/curiosities/zapper/ZapperScreen.java index ee7dd25de..e593f5e59 100644 --- a/src/main/java/com/simibubi/create/modules/curiosities/zapper/ZapperScreen.java +++ b/src/main/java/com/simibubi/create/content/curiosities/zapper/ZapperScreen.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.curiosities.zapper; +package com.simibubi.create.content.curiosities.zapper; import java.util.Vector; @@ -6,11 +6,11 @@ import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.platform.GlStateManager.DestFactor; import com.mojang.blaze3d.platform.GlStateManager.SourceFactor; import com.mojang.blaze3d.systems.RenderSystem; -import com.simibubi.create.AllPackets; -import com.simibubi.create.ScreenResources; import com.simibubi.create.foundation.gui.AbstractSimiScreen; +import com.simibubi.create.foundation.gui.AllGuiTextures; import com.simibubi.create.foundation.gui.widgets.IconButton; -import com.simibubi.create.foundation.packet.NbtPacket; +import com.simibubi.create.foundation.networking.AllPackets; +import com.simibubi.create.foundation.networking.NbtPacket; import com.simibubi.create.foundation.utility.Lang; import net.minecraft.block.BlockState; @@ -32,7 +32,7 @@ public class ZapperScreen extends AbstractSimiScreen { protected ItemStack zapper; protected boolean offhand; protected float animationProgress; - protected ScreenResources background; + protected AllGuiTextures background; protected final String patternSection = Lang.translate("gui.blockzapper.patternSection"); @@ -41,14 +41,14 @@ public class ZapperScreen extends AbstractSimiScreen { protected int brightColor; protected int fontColor; - public ZapperScreen(ScreenResources background, ItemStack zapper, boolean offhand) { + public ZapperScreen(AllGuiTextures background, ItemStack zapper, boolean offhand) { super(); this.background = background; this.zapper = zapper; this.offhand = offhand; title = ""; brightColor = 0xCCDDFF; - fontColor = ScreenResources.FONT_COLOR; + fontColor = AllGuiTextures.FONT_COLOR; } @Override diff --git a/src/main/java/com/simibubi/create/modules/curiosities/zapper/blockzapper/BlockzapperItem.java b/src/main/java/com/simibubi/create/content/curiosities/zapper/blockzapper/BlockzapperItem.java similarity index 98% rename from src/main/java/com/simibubi/create/modules/curiosities/zapper/blockzapper/BlockzapperItem.java rename to src/main/java/com/simibubi/create/content/curiosities/zapper/blockzapper/BlockzapperItem.java index 585d473ce..8075b73fb 100644 --- a/src/main/java/com/simibubi/create/modules/curiosities/zapper/blockzapper/BlockzapperItem.java +++ b/src/main/java/com/simibubi/create/content/curiosities/zapper/blockzapper/BlockzapperItem.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.curiosities.zapper.blockzapper; +package com.simibubi.create.content.curiosities.zapper.blockzapper; import java.util.HashSet; import java.util.LinkedList; @@ -7,6 +7,8 @@ import java.util.Set; import com.simibubi.create.AllItems; import com.simibubi.create.Create; +import com.simibubi.create.content.curiosities.zapper.PlacementPatterns; +import com.simibubi.create.content.curiosities.zapper.ZapperItem; import com.simibubi.create.foundation.advancement.AllTriggers; import com.simibubi.create.foundation.block.render.CustomRenderedItemModel; import com.simibubi.create.foundation.gui.ScreenOpener; @@ -16,8 +18,6 @@ import com.simibubi.create.foundation.item.ItemDescription.Palette; import com.simibubi.create.foundation.utility.BlockHelper; import com.simibubi.create.foundation.utility.Lang; import com.simibubi.create.foundation.utility.NBTHelper; -import com.simibubi.create.modules.curiosities.zapper.PlacementPatterns; -import com.simibubi.create.modules.curiosities.zapper.ZapperItem; import net.minecraft.advancements.CriteriaTriggers; import net.minecraft.block.Block; diff --git a/src/main/java/com/simibubi/create/modules/curiosities/zapper/blockzapper/BlockzapperItemRenderer.java b/src/main/java/com/simibubi/create/content/curiosities/zapper/blockzapper/BlockzapperItemRenderer.java similarity index 86% rename from src/main/java/com/simibubi/create/modules/curiosities/zapper/blockzapper/BlockzapperItemRenderer.java rename to src/main/java/com/simibubi/create/content/curiosities/zapper/blockzapper/BlockzapperItemRenderer.java index ea2fe2f31..163509651 100644 --- a/src/main/java/com/simibubi/create/modules/curiosities/zapper/blockzapper/BlockzapperItemRenderer.java +++ b/src/main/java/com/simibubi/create/content/curiosities/zapper/blockzapper/BlockzapperItemRenderer.java @@ -1,17 +1,17 @@ -package com.simibubi.create.modules.curiosities.zapper.blockzapper; +package com.simibubi.create.content.curiosities.zapper.blockzapper; -import static com.simibubi.create.modules.curiosities.zapper.blockzapper.BlockzapperItem.Components.Accelerator; -import static com.simibubi.create.modules.curiosities.zapper.blockzapper.BlockzapperItem.Components.Amplifier; -import static com.simibubi.create.modules.curiosities.zapper.blockzapper.BlockzapperItem.Components.Body; -import static com.simibubi.create.modules.curiosities.zapper.blockzapper.BlockzapperItem.Components.Retriever; -import static com.simibubi.create.modules.curiosities.zapper.blockzapper.BlockzapperItem.Components.Scope; +import static com.simibubi.create.content.curiosities.zapper.blockzapper.BlockzapperItem.Components.Accelerator; +import static com.simibubi.create.content.curiosities.zapper.blockzapper.BlockzapperItem.Components.Amplifier; +import static com.simibubi.create.content.curiosities.zapper.blockzapper.BlockzapperItem.Components.Body; +import static com.simibubi.create.content.curiosities.zapper.blockzapper.BlockzapperItem.Components.Retriever; +import static com.simibubi.create.content.curiosities.zapper.blockzapper.BlockzapperItem.Components.Scope; import com.mojang.blaze3d.matrix.MatrixStack; +import com.simibubi.create.content.curiosities.zapper.ZapperItemRenderer; +import com.simibubi.create.content.curiosities.zapper.ZapperRenderHandler; +import com.simibubi.create.content.curiosities.zapper.blockzapper.BlockzapperItem.ComponentTier; +import com.simibubi.create.content.curiosities.zapper.blockzapper.BlockzapperItem.Components; import com.simibubi.create.foundation.utility.AnimationTickHolder; -import com.simibubi.create.modules.curiosities.zapper.ZapperItemRenderer; -import com.simibubi.create.modules.curiosities.zapper.ZapperRenderHandler; -import com.simibubi.create.modules.curiosities.zapper.blockzapper.BlockzapperItem.ComponentTier; -import com.simibubi.create.modules.curiosities.zapper.blockzapper.BlockzapperItem.Components; import net.minecraft.client.Minecraft; import net.minecraft.client.entity.player.ClientPlayerEntity; diff --git a/src/main/java/com/simibubi/create/modules/curiosities/zapper/blockzapper/BlockzapperModel.java b/src/main/java/com/simibubi/create/content/curiosities/zapper/blockzapper/BlockzapperModel.java similarity index 89% rename from src/main/java/com/simibubi/create/modules/curiosities/zapper/blockzapper/BlockzapperModel.java rename to src/main/java/com/simibubi/create/content/curiosities/zapper/blockzapper/BlockzapperModel.java index 0851e98f0..64b2ae43a 100644 --- a/src/main/java/com/simibubi/create/modules/curiosities/zapper/blockzapper/BlockzapperModel.java +++ b/src/main/java/com/simibubi/create/content/curiosities/zapper/blockzapper/BlockzapperModel.java @@ -1,10 +1,10 @@ -package com.simibubi.create.modules.curiosities.zapper.blockzapper; +package com.simibubi.create.content.curiosities.zapper.blockzapper; import javax.annotation.Nullable; +import com.simibubi.create.content.curiosities.zapper.blockzapper.BlockzapperItem.ComponentTier; import com.simibubi.create.foundation.block.render.CustomRenderedItemModel; import com.simibubi.create.foundation.utility.Lang; -import com.simibubi.create.modules.curiosities.zapper.blockzapper.BlockzapperItem.ComponentTier; import net.minecraft.client.renderer.model.IBakedModel; import net.minecraft.client.renderer.tileentity.ItemStackTileEntityRenderer; diff --git a/src/main/java/com/simibubi/create/modules/curiosities/zapper/blockzapper/BlockzapperScreen.java b/src/main/java/com/simibubi/create/content/curiosities/zapper/blockzapper/BlockzapperScreen.java similarity index 87% rename from src/main/java/com/simibubi/create/modules/curiosities/zapper/blockzapper/BlockzapperScreen.java rename to src/main/java/com/simibubi/create/content/curiosities/zapper/blockzapper/BlockzapperScreen.java index 452ca4d77..d0e5794f9 100644 --- a/src/main/java/com/simibubi/create/modules/curiosities/zapper/blockzapper/BlockzapperScreen.java +++ b/src/main/java/com/simibubi/create/content/curiosities/zapper/blockzapper/BlockzapperScreen.java @@ -1,15 +1,16 @@ -package com.simibubi.create.modules.curiosities.zapper.blockzapper; +package com.simibubi.create.content.curiosities.zapper.blockzapper; import java.util.Collections; -import com.simibubi.create.ScreenResources; +import com.simibubi.create.content.curiosities.zapper.ZapperScreen; +import com.simibubi.create.foundation.gui.AllGuiTextures; +import com.simibubi.create.foundation.gui.AllIcons; import com.simibubi.create.foundation.gui.widgets.IconButton; import com.simibubi.create.foundation.gui.widgets.Indicator; import com.simibubi.create.foundation.gui.widgets.Indicator.State; import com.simibubi.create.foundation.gui.widgets.Label; import com.simibubi.create.foundation.gui.widgets.ScrollInput; import com.simibubi.create.foundation.utility.Lang; -import com.simibubi.create.modules.curiosities.zapper.ZapperScreen; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; @@ -30,7 +31,7 @@ public class BlockzapperScreen extends ZapperScreen { private Label spreadRangeLabel; public BlockzapperScreen(ItemStack zapper, boolean offhand) { - super(ScreenResources.BLOCKZAPPER, zapper, offhand); + super(AllGuiTextures.BLOCKZAPPER, zapper, offhand); title = Lang.translate("gui.blockzapper.title"); } @@ -43,19 +44,19 @@ public class BlockzapperScreen extends ZapperScreen { CompoundNBT nbt = zapper.getOrCreateTag(); replaceModeIndicator = new Indicator(i + 51, j + 36, ""); - replaceModeButton = new IconButton(i + 51, j + 41, ScreenResources.I_REPLACE_SOLID); + replaceModeButton = new IconButton(i + 51, j + 41, AllIcons.I_REPLACE_SOLID); if (nbt.contains("Replace") && nbt.getBoolean("Replace")) replaceModeIndicator.state = State.ON; replaceModeButton.setToolTip(Lang.translate("gui.blockzapper.replaceMode")); spreadDiagonallyIndicator = new Indicator(i + 74, j + 36, ""); - spreadDiagonallyButton = new IconButton(i + 74, j + 41, ScreenResources.I_FOLLOW_DIAGONAL); + spreadDiagonallyButton = new IconButton(i + 74, j + 41, AllIcons.I_FOLLOW_DIAGONAL); if (nbt.contains("SearchDiagonal") && nbt.getBoolean("SearchDiagonal")) spreadDiagonallyIndicator.state = State.ON; spreadDiagonallyButton.setToolTip(Lang.translate("gui.blockzapper.searchDiagonal")); spreadMaterialIndicator = new Indicator(i + 92, j + 36, ""); - spreadMaterialButton = new IconButton(i + 92, j + 41, ScreenResources.I_FOLLOW_MATERIAL); + spreadMaterialButton = new IconButton(i + 92, j + 41, AllIcons.I_FOLLOW_MATERIAL); if (nbt.contains("SearchFuzzy") && nbt.getBoolean("SearchFuzzy")) spreadMaterialIndicator.state = State.ON; spreadMaterialButton.setToolTip(Lang.translate("gui.blockzapper.searchFuzzy")); diff --git a/src/main/java/com/simibubi/create/modules/curiosities/zapper/blockzapper/BlockzapperUpgradeRecipe.java b/src/main/java/com/simibubi/create/content/curiosities/zapper/blockzapper/BlockzapperUpgradeRecipe.java similarity index 92% rename from src/main/java/com/simibubi/create/modules/curiosities/zapper/blockzapper/BlockzapperUpgradeRecipe.java rename to src/main/java/com/simibubi/create/content/curiosities/zapper/blockzapper/BlockzapperUpgradeRecipe.java index 4131c5656..c3a7dbc2d 100644 --- a/src/main/java/com/simibubi/create/modules/curiosities/zapper/blockzapper/BlockzapperUpgradeRecipe.java +++ b/src/main/java/com/simibubi/create/content/curiosities/zapper/blockzapper/BlockzapperUpgradeRecipe.java @@ -1,10 +1,10 @@ -package com.simibubi.create.modules.curiosities.zapper.blockzapper; +package com.simibubi.create.content.curiosities.zapper.blockzapper; import com.google.gson.JsonObject; import com.simibubi.create.AllItems; -import com.simibubi.create.AllRecipes; -import com.simibubi.create.modules.curiosities.zapper.blockzapper.BlockzapperItem.ComponentTier; -import com.simibubi.create.modules.curiosities.zapper.blockzapper.BlockzapperItem.Components; +import com.simibubi.create.AllRecipeTypes; +import com.simibubi.create.content.curiosities.zapper.blockzapper.BlockzapperItem.ComponentTier; +import com.simibubi.create.content.curiosities.zapper.blockzapper.BlockzapperItem.Components; import net.minecraft.inventory.CraftingInventory; import net.minecraft.item.ItemStack; @@ -77,7 +77,7 @@ public class BlockzapperUpgradeRecipe implements ICraftingRecipe { @Override public IRecipeSerializer getSerializer() { - return AllRecipes.BLOCKZAPPER_UPGRADE.serializer; + return AllRecipeTypes.BLOCKZAPPER_UPGRADE.serializer; } public static class Serializer extends ForgeRegistryEntry> implements IRecipeSerializer { diff --git a/src/main/java/com/simibubi/create/modules/curiosities/zapper/terrainzapper/Brush.java b/src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/Brush.java similarity index 94% rename from src/main/java/com/simibubi/create/modules/curiosities/zapper/terrainzapper/Brush.java rename to src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/Brush.java index 1f4ae95e9..4678da19d 100644 --- a/src/main/java/com/simibubi/create/modules/curiosities/zapper/terrainzapper/Brush.java +++ b/src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/Brush.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.curiosities.zapper.terrainzapper; +package com.simibubi.create.content.curiosities.zapper.terrainzapper; import java.util.List; diff --git a/src/main/java/com/simibubi/create/modules/curiosities/zapper/terrainzapper/CuboidBrush.java b/src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/CuboidBrush.java similarity index 97% rename from src/main/java/com/simibubi/create/modules/curiosities/zapper/terrainzapper/CuboidBrush.java rename to src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/CuboidBrush.java index 0bd7c07b9..ade3b459b 100644 --- a/src/main/java/com/simibubi/create/modules/curiosities/zapper/terrainzapper/CuboidBrush.java +++ b/src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/CuboidBrush.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.curiosities.zapper.terrainzapper; +package com.simibubi.create.content.curiosities.zapper.terrainzapper; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/simibubi/create/modules/curiosities/zapper/terrainzapper/CylinderBrush.java b/src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/CylinderBrush.java similarity index 98% rename from src/main/java/com/simibubi/create/modules/curiosities/zapper/terrainzapper/CylinderBrush.java rename to src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/CylinderBrush.java index b1311134a..6555cf9d8 100644 --- a/src/main/java/com/simibubi/create/modules/curiosities/zapper/terrainzapper/CylinderBrush.java +++ b/src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/CylinderBrush.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.curiosities.zapper.terrainzapper; +package com.simibubi.create.content.curiosities.zapper.terrainzapper; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/main/java/com/simibubi/create/modules/curiosities/zapper/terrainzapper/FlattenTool.java b/src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/FlattenTool.java similarity index 98% rename from src/main/java/com/simibubi/create/modules/curiosities/zapper/terrainzapper/FlattenTool.java rename to src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/FlattenTool.java index 88da6c719..eb11bd942 100644 --- a/src/main/java/com/simibubi/create/modules/curiosities/zapper/terrainzapper/FlattenTool.java +++ b/src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/FlattenTool.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.curiosities.zapper.terrainzapper; +package com.simibubi.create.content.curiosities.zapper.terrainzapper; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/PlacementOptions.java b/src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/PlacementOptions.java new file mode 100644 index 000000000..9861b2505 --- /dev/null +++ b/src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/PlacementOptions.java @@ -0,0 +1,20 @@ +package com.simibubi.create.content.curiosities.zapper.terrainzapper; + +import com.simibubi.create.foundation.gui.AllIcons; +import com.simibubi.create.foundation.utility.Lang; + +public enum PlacementOptions { + + Merged(AllIcons.I_CENTERED), + Attached(AllIcons.I_ATTACHED), + Inserted(AllIcons.I_INSERTED); + + public String translationKey; + public AllIcons icon; + + private PlacementOptions(AllIcons icon) { + this.translationKey = Lang.asId(name()); + this.icon = icon; + } + +} diff --git a/src/main/java/com/simibubi/create/modules/curiosities/zapper/terrainzapper/SphereBrush.java b/src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/SphereBrush.java similarity index 97% rename from src/main/java/com/simibubi/create/modules/curiosities/zapper/terrainzapper/SphereBrush.java rename to src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/SphereBrush.java index 27af6a085..c537f306a 100644 --- a/src/main/java/com/simibubi/create/modules/curiosities/zapper/terrainzapper/SphereBrush.java +++ b/src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/SphereBrush.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.curiosities.zapper.terrainzapper; +package com.simibubi.create.content.curiosities.zapper.terrainzapper; import java.util.HashMap; import java.util.List; diff --git a/src/main/java/com/simibubi/create/modules/curiosities/zapper/terrainzapper/TerrainBrushes.java b/src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/TerrainBrushes.java similarity index 85% rename from src/main/java/com/simibubi/create/modules/curiosities/zapper/terrainzapper/TerrainBrushes.java rename to src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/TerrainBrushes.java index a4709b35f..0088d025d 100644 --- a/src/main/java/com/simibubi/create/modules/curiosities/zapper/terrainzapper/TerrainBrushes.java +++ b/src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/TerrainBrushes.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.curiosities.zapper.terrainzapper; +package com.simibubi.create.content.curiosities.zapper.terrainzapper; public enum TerrainBrushes { diff --git a/src/main/java/com/simibubi/create/modules/curiosities/zapper/terrainzapper/TerrainTools.java b/src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/TerrainTools.java similarity index 82% rename from src/main/java/com/simibubi/create/modules/curiosities/zapper/terrainzapper/TerrainTools.java rename to src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/TerrainTools.java index 38c068572..ad9602f1e 100644 --- a/src/main/java/com/simibubi/create/modules/curiosities/zapper/terrainzapper/TerrainTools.java +++ b/src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/TerrainTools.java @@ -1,10 +1,10 @@ -package com.simibubi.create.modules.curiosities.zapper.terrainzapper; +package com.simibubi.create.content.curiosities.zapper.terrainzapper; import java.util.List; import javax.annotation.Nullable; -import com.simibubi.create.ScreenResources; +import com.simibubi.create.foundation.gui.AllIcons; import com.simibubi.create.foundation.utility.Lang; import net.minecraft.block.BlockState; @@ -15,17 +15,17 @@ import net.minecraft.world.World; public enum TerrainTools { - Fill(ScreenResources.I_FILL), - Place(ScreenResources.I_PLACE), - Replace(ScreenResources.I_REPLACE), - Clear(ScreenResources.I_CLEAR), - Overlay(ScreenResources.I_OVERLAY), - Flatten(ScreenResources.I_FLATTEN); + Fill(AllIcons.I_FILL), + Place(AllIcons.I_PLACE), + Replace(AllIcons.I_REPLACE), + Clear(AllIcons.I_CLEAR), + Overlay(AllIcons.I_OVERLAY), + Flatten(AllIcons.I_FLATTEN); public String translationKey; - public ScreenResources icon; + public AllIcons icon; - private TerrainTools(ScreenResources icon) { + private TerrainTools(AllIcons icon) { this.translationKey = Lang.asId(name()); this.icon = icon; } diff --git a/src/main/java/com/simibubi/create/modules/curiosities/zapper/terrainzapper/TerrainZapperRenderHandler.java b/src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/TerrainZapperRenderHandler.java similarity index 98% rename from src/main/java/com/simibubi/create/modules/curiosities/zapper/terrainzapper/TerrainZapperRenderHandler.java rename to src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/TerrainZapperRenderHandler.java index a64711186..676c6ca77 100644 --- a/src/main/java/com/simibubi/create/modules/curiosities/zapper/terrainzapper/TerrainZapperRenderHandler.java +++ b/src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/TerrainZapperRenderHandler.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.curiosities.zapper.terrainzapper; +package com.simibubi.create.content.curiosities.zapper.terrainzapper; import com.mojang.blaze3d.matrix.MatrixStack; import com.simibubi.create.AllItems; diff --git a/src/main/java/com/simibubi/create/modules/curiosities/zapper/terrainzapper/TerrainzapperItem.java b/src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/TerrainzapperItem.java similarity index 93% rename from src/main/java/com/simibubi/create/modules/curiosities/zapper/terrainzapper/TerrainzapperItem.java rename to src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/TerrainzapperItem.java index 6f92d993f..e872c5b38 100644 --- a/src/main/java/com/simibubi/create/modules/curiosities/zapper/terrainzapper/TerrainzapperItem.java +++ b/src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/TerrainzapperItem.java @@ -1,15 +1,15 @@ -package com.simibubi.create.modules.curiosities.zapper.terrainzapper; +package com.simibubi.create.content.curiosities.zapper.terrainzapper; import java.util.ArrayList; import java.util.List; +import com.simibubi.create.content.curiosities.zapper.PlacementPatterns; +import com.simibubi.create.content.curiosities.zapper.ZapperItem; import com.simibubi.create.foundation.block.render.CustomRenderedItemModel; import com.simibubi.create.foundation.gui.ScreenOpener; import com.simibubi.create.foundation.item.IHaveCustomItemModel; import com.simibubi.create.foundation.utility.Lang; import com.simibubi.create.foundation.utility.NBTHelper; -import com.simibubi.create.modules.curiosities.zapper.PlacementPatterns; -import com.simibubi.create.modules.curiosities.zapper.ZapperItem; import net.minecraft.block.BlockState; import net.minecraft.client.renderer.model.IBakedModel; diff --git a/src/main/java/com/simibubi/create/modules/curiosities/zapper/terrainzapper/TerrainzapperItemRenderer.java b/src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/TerrainzapperItemRenderer.java similarity index 94% rename from src/main/java/com/simibubi/create/modules/curiosities/zapper/terrainzapper/TerrainzapperItemRenderer.java rename to src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/TerrainzapperItemRenderer.java index f2a8d2795..53a14f228 100644 --- a/src/main/java/com/simibubi/create/modules/curiosities/zapper/terrainzapper/TerrainzapperItemRenderer.java +++ b/src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/TerrainzapperItemRenderer.java @@ -1,9 +1,9 @@ -package com.simibubi.create.modules.curiosities.zapper.terrainzapper; +package com.simibubi.create.content.curiosities.zapper.terrainzapper; import com.mojang.blaze3d.matrix.MatrixStack; +import com.simibubi.create.content.curiosities.zapper.ZapperItemRenderer; +import com.simibubi.create.content.curiosities.zapper.ZapperRenderHandler; import com.simibubi.create.foundation.utility.AnimationTickHolder; -import com.simibubi.create.modules.curiosities.zapper.ZapperItemRenderer; -import com.simibubi.create.modules.curiosities.zapper.ZapperRenderHandler; import net.minecraft.client.Minecraft; import net.minecraft.client.entity.player.ClientPlayerEntity; diff --git a/src/main/java/com/simibubi/create/modules/curiosities/zapper/terrainzapper/TerrainzapperModel.java b/src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/TerrainzapperModel.java similarity index 89% rename from src/main/java/com/simibubi/create/modules/curiosities/zapper/terrainzapper/TerrainzapperModel.java rename to src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/TerrainzapperModel.java index 1c2cc9428..781b8d7d9 100644 --- a/src/main/java/com/simibubi/create/modules/curiosities/zapper/terrainzapper/TerrainzapperModel.java +++ b/src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/TerrainzapperModel.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.curiosities.zapper.terrainzapper; +package com.simibubi.create.content.curiosities.zapper.terrainzapper; import com.simibubi.create.foundation.block.render.CustomRenderedItemModel; diff --git a/src/main/java/com/simibubi/create/modules/curiosities/zapper/terrainzapper/TerrainzapperScreen.java b/src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/TerrainzapperScreen.java similarity index 95% rename from src/main/java/com/simibubi/create/modules/curiosities/zapper/terrainzapper/TerrainzapperScreen.java rename to src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/TerrainzapperScreen.java index 0937dedea..9bdf6e77b 100644 --- a/src/main/java/com/simibubi/create/modules/curiosities/zapper/terrainzapper/TerrainzapperScreen.java +++ b/src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/TerrainzapperScreen.java @@ -1,16 +1,16 @@ -package com.simibubi.create.modules.curiosities.zapper.terrainzapper; +package com.simibubi.create.content.curiosities.zapper.terrainzapper; import java.util.List; import java.util.Vector; -import com.simibubi.create.ScreenResources; +import com.simibubi.create.content.curiosities.zapper.ZapperScreen; +import com.simibubi.create.foundation.gui.AllGuiTextures; import com.simibubi.create.foundation.gui.widgets.IconButton; import com.simibubi.create.foundation.gui.widgets.Label; import com.simibubi.create.foundation.gui.widgets.ScrollInput; import com.simibubi.create.foundation.gui.widgets.SelectionScrollInput; import com.simibubi.create.foundation.utility.Lang; import com.simibubi.create.foundation.utility.NBTHelper; -import com.simibubi.create.modules.curiosities.zapper.ZapperScreen; import net.minecraft.client.Minecraft; import net.minecraft.item.ItemStack; @@ -37,7 +37,7 @@ public class TerrainzapperScreen extends ZapperScreen { private CompoundNBT nbt; public TerrainzapperScreen(ItemStack zapper, boolean offhand) { - super(ScreenResources.TERRAINZAPPER, zapper, offhand); + super(AllGuiTextures.TERRAINZAPPER, zapper, offhand); brightColor = 0xDFF6FF; fontColor = 0x436B77; title = Lang.translate("gui.terrainzapper.title"); @@ -163,7 +163,7 @@ public class TerrainzapperScreen extends ZapperScreen { Brush currentBrush = TerrainBrushes.values()[brushInput.getState()].get(); for (int index = 2; index >= currentBrush.amtParams; index--) { - ScreenResources.TERRAINZAPPER_INACTIVE_PARAM.draw(i + 55 + index * 18, j + 43); + AllGuiTextures.TERRAINZAPPER_INACTIVE_PARAM.draw(i + 55 + index * 18, j + 43); } font.drawString(toolSection, i + 8, j + 64, fontColor); diff --git a/src/main/java/com/simibubi/create/modules/logistics/InWorldProcessing.java b/src/main/java/com/simibubi/create/content/logistics/InWorldProcessing.java similarity index 94% rename from src/main/java/com/simibubi/create/modules/logistics/InWorldProcessing.java rename to src/main/java/com/simibubi/create/content/logistics/InWorldProcessing.java index 9ce6e403b..88739c43a 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/InWorldProcessing.java +++ b/src/main/java/com/simibubi/create/content/logistics/InWorldProcessing.java @@ -1,18 +1,18 @@ -package com.simibubi.create.modules.logistics; +package com.simibubi.create.content.logistics; import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Optional; -import com.simibubi.create.AllRecipes; -import com.simibubi.create.config.AllConfigs; +import com.simibubi.create.AllRecipeTypes; +import com.simibubi.create.content.contraptions.components.fan.SplashingRecipe; +import com.simibubi.create.content.contraptions.processing.ProcessingRecipe; +import com.simibubi.create.content.contraptions.relays.belt.BeltTileEntity; +import com.simibubi.create.content.contraptions.relays.belt.transport.TransportedItemStack; +import com.simibubi.create.foundation.config.AllConfigs; import com.simibubi.create.foundation.item.ItemHelper; import com.simibubi.create.foundation.utility.ColorHelper; -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.transport.TransportedItemStack; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; @@ -113,7 +113,7 @@ public class InWorldProcessing { public static boolean isWashable(ItemStack stack, World world) { splashingInv.setInventorySlotContents(0, stack); Optional recipe = - world.getRecipeManager().getRecipe(AllRecipes.SPLASHING.getType(), splashingInv, world); + world.getRecipeManager().getRecipe(AllRecipeTypes.SPLASHING.getType(), splashingInv, world); return recipe.isPresent(); } @@ -171,7 +171,7 @@ public class InWorldProcessing { if (type == Type.SPLASHING) { splashingInv.setInventorySlotContents(0, stack); Optional recipe = - world.getRecipeManager().getRecipe(AllRecipes.SPLASHING.getType(), splashingInv, world); + world.getRecipeManager().getRecipe(AllRecipeTypes.SPLASHING.getType(), splashingInv, world); if (recipe.isPresent()) return applyRecipeOn(stack, recipe.get()); return null; diff --git a/src/main/java/com/simibubi/create/modules/logistics/RedstoneLinkNetworkHandler.java b/src/main/java/com/simibubi/create/content/logistics/RedstoneLinkNetworkHandler.java similarity index 95% rename from src/main/java/com/simibubi/create/modules/logistics/RedstoneLinkNetworkHandler.java rename to src/main/java/com/simibubi/create/content/logistics/RedstoneLinkNetworkHandler.java index dd2c5bad7..0467cf4f6 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/RedstoneLinkNetworkHandler.java +++ b/src/main/java/com/simibubi/create/content/logistics/RedstoneLinkNetworkHandler.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.logistics; +package com.simibubi.create.content.logistics; import java.util.HashMap; import java.util.HashSet; @@ -9,8 +9,8 @@ import java.util.Set; import org.apache.commons.lang3.tuple.Pair; import com.simibubi.create.Create; -import com.simibubi.create.config.AllConfigs; -import com.simibubi.create.foundation.behaviour.linked.LinkBehaviour; +import com.simibubi.create.foundation.config.AllConfigs; +import com.simibubi.create.foundation.tileEntity.behaviour.linked.LinkBehaviour; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/simibubi/create/modules/logistics/block/AttachedLogisticalBlock.java b/src/main/java/com/simibubi/create/content/logistics/block/AttachedLogisticalBlock.java similarity index 94% rename from src/main/java/com/simibubi/create/modules/logistics/block/AttachedLogisticalBlock.java rename to src/main/java/com/simibubi/create/content/logistics/block/AttachedLogisticalBlock.java index d5c5d9646..50aae1757 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/block/AttachedLogisticalBlock.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/AttachedLogisticalBlock.java @@ -1,9 +1,9 @@ -package com.simibubi.create.modules.logistics.block; +package com.simibubi.create.content.logistics.block; import com.simibubi.create.AllBlocks; -import com.simibubi.create.modules.contraptions.IWrenchable; -import com.simibubi.create.modules.contraptions.relays.belt.BeltBlock; -import com.simibubi.create.modules.logistics.block.transposer.TransposerBlock; +import com.simibubi.create.content.contraptions.relays.belt.BeltBlock; +import com.simibubi.create.content.contraptions.wrench.IWrenchable; +import com.simibubi.create.content.logistics.block.transposer.TransposerBlock; import net.minecraft.block.Block; import net.minecraft.block.BlockState; diff --git a/src/main/java/com/simibubi/create/modules/logistics/block/belts/BeltAttachableLogisticalBlock.java b/src/main/java/com/simibubi/create/content/logistics/block/belts/BeltAttachableLogisticalBlock.java similarity index 82% rename from src/main/java/com/simibubi/create/modules/logistics/block/belts/BeltAttachableLogisticalBlock.java rename to src/main/java/com/simibubi/create/content/logistics/block/belts/BeltAttachableLogisticalBlock.java index c396f7443..cd6f9a272 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/block/belts/BeltAttachableLogisticalBlock.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/belts/BeltAttachableLogisticalBlock.java @@ -1,17 +1,17 @@ -package com.simibubi.create.modules.logistics.block.belts; +package com.simibubi.create.content.logistics.block.belts; import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; -import com.simibubi.create.foundation.behaviour.base.TileEntityBehaviour; -import com.simibubi.create.foundation.behaviour.filtering.FilteringBehaviour; -import com.simibubi.create.foundation.behaviour.inventory.SingleTargetAutoExtractingBehaviour; -import com.simibubi.create.modules.contraptions.relays.belt.AllBeltAttachments.BeltAttachmentState; -import com.simibubi.create.modules.contraptions.relays.belt.AllBeltAttachments.IBeltAttachment; -import com.simibubi.create.modules.contraptions.relays.belt.BeltTileEntity; -import com.simibubi.create.modules.contraptions.relays.belt.transport.TransportedItemStack; -import com.simibubi.create.modules.logistics.block.AttachedLogisticalBlock; +import com.simibubi.create.content.contraptions.relays.belt.BeltTileEntity; +import com.simibubi.create.content.contraptions.relays.belt.AllBeltAttachments.BeltAttachmentState; +import com.simibubi.create.content.contraptions.relays.belt.AllBeltAttachments.IBeltAttachment; +import com.simibubi.create.content.contraptions.relays.belt.transport.TransportedItemStack; +import com.simibubi.create.content.logistics.block.AttachedLogisticalBlock; +import com.simibubi.create.foundation.tileEntity.TileEntityBehaviour; +import com.simibubi.create.foundation.tileEntity.behaviour.filtering.FilteringBehaviour; +import com.simibubi.create.foundation.tileEntity.behaviour.inventory.SingleTargetAutoExtractingBehaviour; import net.minecraft.block.BlockState; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/simibubi/create/modules/logistics/block/belts/observer/BeltObserverBlock.java b/src/main/java/com/simibubi/create/content/logistics/block/belts/observer/BeltObserverBlock.java similarity index 93% rename from src/main/java/com/simibubi/create/modules/logistics/block/belts/observer/BeltObserverBlock.java rename to src/main/java/com/simibubi/create/content/logistics/block/belts/observer/BeltObserverBlock.java index 3b21e359d..5d8d92e58 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/block/belts/observer/BeltObserverBlock.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/belts/observer/BeltObserverBlock.java @@ -1,23 +1,23 @@ -package com.simibubi.create.modules.logistics.block.belts.observer; +package com.simibubi.create.content.logistics.block.belts.observer; import java.util.Arrays; import java.util.List; import java.util.Random; import com.simibubi.create.AllBlocks; -import com.simibubi.create.foundation.behaviour.base.TileEntityBehaviour; -import com.simibubi.create.foundation.behaviour.filtering.FilteringBehaviour; +import com.simibubi.create.content.contraptions.relays.belt.BeltBlock; +import com.simibubi.create.content.contraptions.relays.belt.BeltTileEntity; +import com.simibubi.create.content.contraptions.relays.belt.AllBeltAttachments.BeltAttachmentState; +import com.simibubi.create.content.contraptions.relays.belt.AllBeltAttachments.IBeltAttachment; +import com.simibubi.create.content.contraptions.relays.belt.BeltBlock.Part; +import com.simibubi.create.content.contraptions.relays.belt.BeltBlock.Slope; +import com.simibubi.create.content.contraptions.relays.belt.transport.TransportedItemStack; +import com.simibubi.create.content.contraptions.wrench.IWrenchable; import com.simibubi.create.foundation.block.ITE; +import com.simibubi.create.foundation.tileEntity.TileEntityBehaviour; +import com.simibubi.create.foundation.tileEntity.behaviour.filtering.FilteringBehaviour; import com.simibubi.create.foundation.utility.Lang; import com.simibubi.create.foundation.utility.VecHelper; -import com.simibubi.create.modules.contraptions.IWrenchable; -import com.simibubi.create.modules.contraptions.relays.belt.AllBeltAttachments.BeltAttachmentState; -import com.simibubi.create.modules.contraptions.relays.belt.AllBeltAttachments.IBeltAttachment; -import com.simibubi.create.modules.contraptions.relays.belt.BeltBlock; -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.belt.BeltTileEntity; -import com.simibubi.create.modules.contraptions.relays.belt.transport.TransportedItemStack; import net.minecraft.block.Block; import net.minecraft.block.BlockState; diff --git a/src/main/java/com/simibubi/create/modules/logistics/block/belts/observer/BeltObserverFilterSlot.java b/src/main/java/com/simibubi/create/content/logistics/block/belts/observer/BeltObserverFilterSlot.java similarity index 84% rename from src/main/java/com/simibubi/create/modules/logistics/block/belts/observer/BeltObserverFilterSlot.java rename to src/main/java/com/simibubi/create/content/logistics/block/belts/observer/BeltObserverFilterSlot.java index a82cb91d9..a94328b0d 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/block/belts/observer/BeltObserverFilterSlot.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/belts/observer/BeltObserverFilterSlot.java @@ -1,7 +1,7 @@ -package com.simibubi.create.modules.logistics.block.belts.observer; +package com.simibubi.create.content.logistics.block.belts.observer; import com.mojang.blaze3d.matrix.MatrixStack; -import com.simibubi.create.foundation.behaviour.ValueBoxTransform; +import com.simibubi.create.foundation.tileEntity.behaviour.ValueBoxTransform; import com.simibubi.create.foundation.utility.AngleHelper; import com.simibubi.create.foundation.utility.VecHelper; diff --git a/src/main/java/com/simibubi/create/modules/logistics/block/belts/observer/BeltObserverTileEntity.java b/src/main/java/com/simibubi/create/content/logistics/block/belts/observer/BeltObserverTileEntity.java similarity index 81% rename from src/main/java/com/simibubi/create/modules/logistics/block/belts/observer/BeltObserverTileEntity.java rename to src/main/java/com/simibubi/create/content/logistics/block/belts/observer/BeltObserverTileEntity.java index ce279d5e2..3e7ad9df1 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/block/belts/observer/BeltObserverTileEntity.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/belts/observer/BeltObserverTileEntity.java @@ -1,14 +1,14 @@ -package com.simibubi.create.modules.logistics.block.belts.observer; +package com.simibubi.create.content.logistics.block.belts.observer; import java.util.List; import com.simibubi.create.AllTileEntities; -import com.simibubi.create.foundation.behaviour.base.SmartTileEntity; -import com.simibubi.create.foundation.behaviour.base.TileEntityBehaviour; -import com.simibubi.create.foundation.behaviour.filtering.FilteringBehaviour; -import com.simibubi.create.modules.contraptions.relays.belt.BeltHelper; -import com.simibubi.create.modules.contraptions.relays.belt.BeltTileEntity; -import com.simibubi.create.modules.logistics.block.belts.observer.BeltObserverBlock.Mode; +import com.simibubi.create.content.contraptions.relays.belt.BeltHelper; +import com.simibubi.create.content.contraptions.relays.belt.BeltTileEntity; +import com.simibubi.create.content.logistics.block.belts.observer.BeltObserverBlock.Mode; +import com.simibubi.create.foundation.tileEntity.SmartTileEntity; +import com.simibubi.create.foundation.tileEntity.TileEntityBehaviour; +import com.simibubi.create.foundation.tileEntity.behaviour.filtering.FilteringBehaviour; import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/com/simibubi/create/modules/logistics/block/belts/observer/BeltObserverTileEntityRenderer.java b/src/main/java/com/simibubi/create/content/logistics/block/belts/observer/BeltObserverTileEntityRenderer.java similarity index 79% rename from src/main/java/com/simibubi/create/modules/logistics/block/belts/observer/BeltObserverTileEntityRenderer.java rename to src/main/java/com/simibubi/create/content/logistics/block/belts/observer/BeltObserverTileEntityRenderer.java index b552e2332..2d8056012 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/block/belts/observer/BeltObserverTileEntityRenderer.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/belts/observer/BeltObserverTileEntityRenderer.java @@ -1,8 +1,8 @@ -package com.simibubi.create.modules.logistics.block.belts.observer; +package com.simibubi.create.content.logistics.block.belts.observer; import com.mojang.blaze3d.matrix.MatrixStack; -import com.simibubi.create.foundation.behaviour.filtering.FilteringRenderer; -import com.simibubi.create.foundation.block.SafeTileEntityRenderer; +import com.simibubi.create.foundation.tileEntity.behaviour.filtering.FilteringRenderer; +import com.simibubi.create.foundation.tileEntity.renderer.SafeTileEntityRenderer; import net.minecraft.client.renderer.IRenderTypeBuffer; import net.minecraft.client.renderer.WorldRenderer; diff --git a/src/main/java/com/simibubi/create/modules/logistics/block/belts/tunnel/BeltTunnelBlock.java b/src/main/java/com/simibubi/create/content/logistics/block/belts/tunnel/BeltTunnelBlock.java similarity index 95% rename from src/main/java/com/simibubi/create/modules/logistics/block/belts/tunnel/BeltTunnelBlock.java rename to src/main/java/com/simibubi/create/content/logistics/block/belts/tunnel/BeltTunnelBlock.java index f35a356b7..d17adfffb 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/block/belts/tunnel/BeltTunnelBlock.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/belts/tunnel/BeltTunnelBlock.java @@ -1,16 +1,16 @@ -package com.simibubi.create.modules.logistics.block.belts.tunnel; +package com.simibubi.create.content.logistics.block.belts.tunnel; import java.util.ArrayList; import java.util.Arrays; import java.util.List; import com.simibubi.create.AllBlocks; +import com.simibubi.create.content.contraptions.relays.belt.BeltBlock; +import com.simibubi.create.content.contraptions.relays.belt.BeltBlock.Slope; +import com.simibubi.create.content.contraptions.wrench.IWrenchable; import com.simibubi.create.foundation.block.ITE; import com.simibubi.create.foundation.utility.Lang; -import com.simibubi.create.foundation.utility.WrappedWorld; -import com.simibubi.create.modules.contraptions.IWrenchable; -import com.simibubi.create.modules.contraptions.relays.belt.BeltBlock; -import com.simibubi.create.modules.contraptions.relays.belt.BeltBlock.Slope; +import com.simibubi.create.foundation.utility.worldWrappers.WrappedWorld; import net.minecraft.block.Block; import net.minecraft.block.BlockState; diff --git a/src/main/java/com/simibubi/create/modules/logistics/block/belts/tunnel/BeltTunnelShapes.java b/src/main/java/com/simibubi/create/content/logistics/block/belts/tunnel/BeltTunnelShapes.java similarity index 96% rename from src/main/java/com/simibubi/create/modules/logistics/block/belts/tunnel/BeltTunnelShapes.java rename to src/main/java/com/simibubi/create/content/logistics/block/belts/tunnel/BeltTunnelShapes.java index 1e6f51f76..201a77b40 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/block/belts/tunnel/BeltTunnelShapes.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/belts/tunnel/BeltTunnelShapes.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.logistics.block.belts.tunnel; +package com.simibubi.create.content.logistics.block.belts.tunnel; import static net.minecraft.block.Block.makeCuboidShape; diff --git a/src/main/java/com/simibubi/create/modules/logistics/block/belts/tunnel/BeltTunnelTileEntity.java b/src/main/java/com/simibubi/create/content/logistics/block/belts/tunnel/BeltTunnelTileEntity.java similarity index 96% rename from src/main/java/com/simibubi/create/modules/logistics/block/belts/tunnel/BeltTunnelTileEntity.java rename to src/main/java/com/simibubi/create/content/logistics/block/belts/tunnel/BeltTunnelTileEntity.java index 56d54c5a9..4c7429f74 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/block/belts/tunnel/BeltTunnelTileEntity.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/belts/tunnel/BeltTunnelTileEntity.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.logistics.block.belts.tunnel; +package com.simibubi.create.content.logistics.block.belts.tunnel; import java.util.HashMap; import java.util.LinkedList; @@ -8,9 +8,9 @@ import org.apache.commons.lang3.tuple.Pair; import com.simibubi.create.AllBlocks; import com.simibubi.create.AllTileEntities; -import com.simibubi.create.foundation.block.SyncedTileEntity; +import com.simibubi.create.content.logistics.block.belts.tunnel.BeltTunnelBlock.Shape; import com.simibubi.create.foundation.gui.widgets.InterpolatedChasingValue; -import com.simibubi.create.modules.logistics.block.belts.tunnel.BeltTunnelBlock.Shape; +import com.simibubi.create.foundation.tileEntity.SyncedTileEntity; import net.minecraft.block.BlockState; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/simibubi/create/modules/logistics/block/belts/tunnel/BeltTunnelTileEntityRenderer.java b/src/main/java/com/simibubi/create/content/logistics/block/belts/tunnel/BeltTunnelTileEntityRenderer.java similarity index 95% rename from src/main/java/com/simibubi/create/modules/logistics/block/belts/tunnel/BeltTunnelTileEntityRenderer.java rename to src/main/java/com/simibubi/create/content/logistics/block/belts/tunnel/BeltTunnelTileEntityRenderer.java index 67a10ce65..dfb1e3a68 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/block/belts/tunnel/BeltTunnelTileEntityRenderer.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/belts/tunnel/BeltTunnelTileEntityRenderer.java @@ -1,9 +1,9 @@ -package com.simibubi.create.modules.logistics.block.belts.tunnel; +package com.simibubi.create.content.logistics.block.belts.tunnel; import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.vertex.IVertexBuilder; import com.simibubi.create.AllBlockPartials; -import com.simibubi.create.foundation.block.SafeTileEntityRenderer; +import com.simibubi.create.foundation.tileEntity.renderer.SafeTileEntityRenderer; import com.simibubi.create.foundation.utility.ColorHelper; import com.simibubi.create.foundation.utility.SuperByteBuffer; diff --git a/src/main/java/com/simibubi/create/modules/logistics/block/diodes/AbstractDiodeBlock.java b/src/main/java/com/simibubi/create/content/logistics/block/diodes/AbstractDiodeBlock.java similarity index 63% rename from src/main/java/com/simibubi/create/modules/logistics/block/diodes/AbstractDiodeBlock.java rename to src/main/java/com/simibubi/create/content/logistics/block/diodes/AbstractDiodeBlock.java index 04ad51126..4d43d897f 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/block/diodes/AbstractDiodeBlock.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/diodes/AbstractDiodeBlock.java @@ -1,6 +1,6 @@ -package com.simibubi.create.modules.logistics.block.diodes; +package com.simibubi.create.content.logistics.block.diodes; -import com.simibubi.create.modules.contraptions.IWrenchable; +import com.simibubi.create.content.contraptions.wrench.IWrenchable; import net.minecraft.block.RedstoneDiodeBlock; diff --git a/src/main/java/com/simibubi/create/modules/logistics/block/diodes/AbstractDiodeGenerator.java b/src/main/java/com/simibubi/create/content/logistics/block/diodes/AbstractDiodeGenerator.java similarity index 95% rename from src/main/java/com/simibubi/create/modules/logistics/block/diodes/AbstractDiodeGenerator.java rename to src/main/java/com/simibubi/create/content/logistics/block/diodes/AbstractDiodeGenerator.java index 8f1d4c8ca..7093f3d29 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/block/diodes/AbstractDiodeGenerator.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/diodes/AbstractDiodeGenerator.java @@ -1,9 +1,9 @@ -package com.simibubi.create.modules.logistics.block.diodes; +package com.simibubi.create.content.logistics.block.diodes; import java.util.Vector; import com.simibubi.create.Create; -import com.simibubi.create.foundation.utility.data.SpecialBlockStateGen; +import com.simibubi.create.foundation.data.SpecialBlockStateGen; import com.tterrag.registrate.providers.DataGenContext; import com.tterrag.registrate.providers.RegistrateBlockstateProvider; import com.tterrag.registrate.providers.RegistrateItemModelProvider; diff --git a/src/main/java/com/simibubi/create/modules/logistics/block/diodes/AdjustablePulseRepeaterTileEntity.java b/src/main/java/com/simibubi/create/content/logistics/block/diodes/AdjustablePulseRepeaterTileEntity.java similarity index 88% rename from src/main/java/com/simibubi/create/modules/logistics/block/diodes/AdjustablePulseRepeaterTileEntity.java rename to src/main/java/com/simibubi/create/content/logistics/block/diodes/AdjustablePulseRepeaterTileEntity.java index dfd68ab56..504ca1ac0 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/block/diodes/AdjustablePulseRepeaterTileEntity.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/diodes/AdjustablePulseRepeaterTileEntity.java @@ -1,6 +1,6 @@ -package com.simibubi.create.modules.logistics.block.diodes; +package com.simibubi.create.content.logistics.block.diodes; -import static com.simibubi.create.modules.logistics.block.diodes.AdjustableRepeaterBlock.POWERING; +import static com.simibubi.create.content.logistics.block.diodes.AdjustableRepeaterBlock.POWERING; import com.simibubi.create.AllTileEntities; diff --git a/src/main/java/com/simibubi/create/modules/logistics/block/diodes/AdjustableRepeaterBlock.java b/src/main/java/com/simibubi/create/content/logistics/block/diodes/AdjustableRepeaterBlock.java similarity index 96% rename from src/main/java/com/simibubi/create/modules/logistics/block/diodes/AdjustableRepeaterBlock.java rename to src/main/java/com/simibubi/create/content/logistics/block/diodes/AdjustableRepeaterBlock.java index 8b2758e1d..4b76ec5c0 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/block/diodes/AdjustableRepeaterBlock.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/diodes/AdjustableRepeaterBlock.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.logistics.block.diodes; +package com.simibubi.create.content.logistics.block.diodes; import com.simibubi.create.AllBlocks; diff --git a/src/main/java/com/simibubi/create/modules/logistics/block/diodes/AdjustableRepeaterGenerator.java b/src/main/java/com/simibubi/create/content/logistics/block/diodes/AdjustableRepeaterGenerator.java similarity index 95% rename from src/main/java/com/simibubi/create/modules/logistics/block/diodes/AdjustableRepeaterGenerator.java rename to src/main/java/com/simibubi/create/content/logistics/block/diodes/AdjustableRepeaterGenerator.java index b4a01b509..201675c68 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/block/diodes/AdjustableRepeaterGenerator.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/diodes/AdjustableRepeaterGenerator.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.logistics.block.diodes; +package com.simibubi.create.content.logistics.block.diodes; import java.util.Vector; diff --git a/src/main/java/com/simibubi/create/modules/logistics/block/diodes/AdjustableRepeaterRenderer.java b/src/main/java/com/simibubi/create/content/logistics/block/diodes/AdjustableRepeaterRenderer.java similarity index 84% rename from src/main/java/com/simibubi/create/modules/logistics/block/diodes/AdjustableRepeaterRenderer.java rename to src/main/java/com/simibubi/create/content/logistics/block/diodes/AdjustableRepeaterRenderer.java index 0693462ec..86b1b43e5 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/block/diodes/AdjustableRepeaterRenderer.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/diodes/AdjustableRepeaterRenderer.java @@ -1,7 +1,7 @@ -package com.simibubi.create.modules.logistics.block.diodes; +package com.simibubi.create.content.logistics.block.diodes; import com.simibubi.create.AllBlockPartials; -import com.simibubi.create.foundation.block.render.ColoredOverlayTileEntityRenderer; +import com.simibubi.create.foundation.tileEntity.renderer.ColoredOverlayTileEntityRenderer; import com.simibubi.create.foundation.utility.ColorHelper; import com.simibubi.create.foundation.utility.SuperByteBuffer; diff --git a/src/main/java/com/simibubi/create/modules/logistics/block/diodes/AdjustableRepeaterScrollSlot.java b/src/main/java/com/simibubi/create/content/logistics/block/diodes/AdjustableRepeaterScrollSlot.java similarity index 84% rename from src/main/java/com/simibubi/create/modules/logistics/block/diodes/AdjustableRepeaterScrollSlot.java rename to src/main/java/com/simibubi/create/content/logistics/block/diodes/AdjustableRepeaterScrollSlot.java index 1b5a852ed..97e4ef07e 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/block/diodes/AdjustableRepeaterScrollSlot.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/diodes/AdjustableRepeaterScrollSlot.java @@ -1,7 +1,7 @@ -package com.simibubi.create.modules.logistics.block.diodes; +package com.simibubi.create.content.logistics.block.diodes; import com.mojang.blaze3d.matrix.MatrixStack; -import com.simibubi.create.foundation.behaviour.ValueBoxTransform; +import com.simibubi.create.foundation.tileEntity.behaviour.ValueBoxTransform; import com.simibubi.create.foundation.utility.AngleHelper; import com.simibubi.create.foundation.utility.VecHelper; diff --git a/src/main/java/com/simibubi/create/modules/logistics/block/diodes/AdjustableRepeaterTileEntity.java b/src/main/java/com/simibubi/create/content/logistics/block/diodes/AdjustableRepeaterTileEntity.java similarity index 86% rename from src/main/java/com/simibubi/create/modules/logistics/block/diodes/AdjustableRepeaterTileEntity.java rename to src/main/java/com/simibubi/create/content/logistics/block/diodes/AdjustableRepeaterTileEntity.java index 21f8d663a..3c1ce7e07 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/block/diodes/AdjustableRepeaterTileEntity.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/diodes/AdjustableRepeaterTileEntity.java @@ -1,15 +1,15 @@ -package com.simibubi.create.modules.logistics.block.diodes; +package com.simibubi.create.content.logistics.block.diodes; -import static com.simibubi.create.modules.logistics.block.diodes.AdjustableRepeaterBlock.POWERING; +import static com.simibubi.create.content.logistics.block.diodes.AdjustableRepeaterBlock.POWERING; import static net.minecraft.block.RedstoneDiodeBlock.POWERED; import java.util.List; import com.simibubi.create.AllTileEntities; -import com.simibubi.create.foundation.behaviour.base.SmartTileEntity; -import com.simibubi.create.foundation.behaviour.base.TileEntityBehaviour; -import com.simibubi.create.foundation.behaviour.scrollvalue.ScrollValueBehaviour; -import com.simibubi.create.foundation.behaviour.scrollvalue.ScrollValueBehaviour.StepContext; +import com.simibubi.create.foundation.tileEntity.SmartTileEntity; +import com.simibubi.create.foundation.tileEntity.TileEntityBehaviour; +import com.simibubi.create.foundation.tileEntity.behaviour.scrollvalue.ScrollValueBehaviour; +import com.simibubi.create.foundation.tileEntity.behaviour.scrollvalue.ScrollValueBehaviour.StepContext; import com.simibubi.create.foundation.utility.Lang; import net.minecraft.nbt.CompoundNBT; diff --git a/src/main/java/com/simibubi/create/modules/logistics/block/diodes/PoweredLatchBlock.java b/src/main/java/com/simibubi/create/content/logistics/block/diodes/PoweredLatchBlock.java similarity index 98% rename from src/main/java/com/simibubi/create/modules/logistics/block/diodes/PoweredLatchBlock.java rename to src/main/java/com/simibubi/create/content/logistics/block/diodes/PoweredLatchBlock.java index f4bf86ab9..81f4670ae 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/block/diodes/PoweredLatchBlock.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/diodes/PoweredLatchBlock.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.logistics.block.diodes; +package com.simibubi.create.content.logistics.block.diodes; import java.util.Random; diff --git a/src/main/java/com/simibubi/create/modules/logistics/block/diodes/PoweredLatchGenerator.java b/src/main/java/com/simibubi/create/content/logistics/block/diodes/PoweredLatchGenerator.java similarity index 94% rename from src/main/java/com/simibubi/create/modules/logistics/block/diodes/PoweredLatchGenerator.java rename to src/main/java/com/simibubi/create/content/logistics/block/diodes/PoweredLatchGenerator.java index 87eddd742..305c3e724 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/block/diodes/PoweredLatchGenerator.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/diodes/PoweredLatchGenerator.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.logistics.block.diodes; +package com.simibubi.create.content.logistics.block.diodes; import java.util.Vector; diff --git a/src/main/java/com/simibubi/create/modules/logistics/block/diodes/PulseRepeaterBlock.java b/src/main/java/com/simibubi/create/content/logistics/block/diodes/PulseRepeaterBlock.java similarity index 97% rename from src/main/java/com/simibubi/create/modules/logistics/block/diodes/PulseRepeaterBlock.java rename to src/main/java/com/simibubi/create/content/logistics/block/diodes/PulseRepeaterBlock.java index c0f3e9244..d15a129ad 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/block/diodes/PulseRepeaterBlock.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/diodes/PulseRepeaterBlock.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.logistics.block.diodes; +package com.simibubi.create.content.logistics.block.diodes; import java.util.Random; diff --git a/src/main/java/com/simibubi/create/modules/logistics/block/diodes/PulseRepeaterGenerator.java b/src/main/java/com/simibubi/create/content/logistics/block/diodes/PulseRepeaterGenerator.java similarity index 94% rename from src/main/java/com/simibubi/create/modules/logistics/block/diodes/PulseRepeaterGenerator.java rename to src/main/java/com/simibubi/create/content/logistics/block/diodes/PulseRepeaterGenerator.java index 7d9f53f34..fd61ed1a8 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/block/diodes/PulseRepeaterGenerator.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/diodes/PulseRepeaterGenerator.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.logistics.block.diodes; +package com.simibubi.create.content.logistics.block.diodes; import java.util.Vector; diff --git a/src/main/java/com/simibubi/create/modules/logistics/block/diodes/ToggleLatchBlock.java b/src/main/java/com/simibubi/create/content/logistics/block/diodes/ToggleLatchBlock.java similarity index 97% rename from src/main/java/com/simibubi/create/modules/logistics/block/diodes/ToggleLatchBlock.java rename to src/main/java/com/simibubi/create/content/logistics/block/diodes/ToggleLatchBlock.java index ed6b2cac1..9f6c1ef7c 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/block/diodes/ToggleLatchBlock.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/diodes/ToggleLatchBlock.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.logistics.block.diodes; +package com.simibubi.create.content.logistics.block.diodes; import java.util.Random; diff --git a/src/main/java/com/simibubi/create/modules/logistics/block/diodes/ToggleLatchGenerator.java b/src/main/java/com/simibubi/create/content/logistics/block/diodes/ToggleLatchGenerator.java similarity index 95% rename from src/main/java/com/simibubi/create/modules/logistics/block/diodes/ToggleLatchGenerator.java rename to src/main/java/com/simibubi/create/content/logistics/block/diodes/ToggleLatchGenerator.java index 953ea9414..3bcae9dcd 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/block/diodes/ToggleLatchGenerator.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/diodes/ToggleLatchGenerator.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.logistics.block.diodes; +package com.simibubi.create.content.logistics.block.diodes; import java.util.Vector; diff --git a/src/main/java/com/simibubi/create/modules/logistics/block/extractor/ExtractorBlock.java b/src/main/java/com/simibubi/create/content/logistics/block/extractor/ExtractorBlock.java similarity index 90% rename from src/main/java/com/simibubi/create/modules/logistics/block/extractor/ExtractorBlock.java rename to src/main/java/com/simibubi/create/content/logistics/block/extractor/ExtractorBlock.java index cc9f11b58..64bd25365 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/block/extractor/ExtractorBlock.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/extractor/ExtractorBlock.java @@ -1,13 +1,13 @@ -package com.simibubi.create.modules.logistics.block.extractor; +package com.simibubi.create.content.logistics.block.extractor; import com.simibubi.create.AllBlocks; -import com.simibubi.create.foundation.utility.AllShapes; +import com.simibubi.create.AllShapes; +import com.simibubi.create.content.contraptions.components.structureMovement.IPortableBlock; +import com.simibubi.create.content.contraptions.components.structureMovement.MovementBehaviour; +import com.simibubi.create.content.logistics.block.AttachedLogisticalBlock; +import com.simibubi.create.content.logistics.block.belts.BeltAttachableLogisticalBlock; import com.simibubi.create.foundation.utility.AngleHelper; import com.simibubi.create.foundation.utility.VecHelper; -import com.simibubi.create.modules.contraptions.components.contraptions.IPortableBlock; -import com.simibubi.create.modules.contraptions.components.contraptions.MovementBehaviour; -import com.simibubi.create.modules.logistics.block.AttachedLogisticalBlock; -import com.simibubi.create.modules.logistics.block.belts.BeltAttachableLogisticalBlock; import net.minecraft.block.Block; import net.minecraft.block.BlockState; diff --git a/src/main/java/com/simibubi/create/modules/logistics/block/extractor/ExtractorMovementBehaviour.java b/src/main/java/com/simibubi/create/content/logistics/block/extractor/ExtractorMovementBehaviour.java similarity index 84% rename from src/main/java/com/simibubi/create/modules/logistics/block/extractor/ExtractorMovementBehaviour.java rename to src/main/java/com/simibubi/create/content/logistics/block/extractor/ExtractorMovementBehaviour.java index 3816d2af8..d4a7b4fa8 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/block/extractor/ExtractorMovementBehaviour.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/extractor/ExtractorMovementBehaviour.java @@ -1,10 +1,10 @@ -package com.simibubi.create.modules.logistics.block.extractor; +package com.simibubi.create.content.logistics.block.extractor; +import com.simibubi.create.content.contraptions.components.structureMovement.MovementBehaviour; +import com.simibubi.create.content.contraptions.components.structureMovement.MovementContext; +import com.simibubi.create.content.logistics.block.AttachedLogisticalBlock; +import com.simibubi.create.content.logistics.item.filter.FilterItem; import com.simibubi.create.foundation.item.ItemHelper; -import com.simibubi.create.modules.contraptions.components.contraptions.MovementBehaviour; -import com.simibubi.create.modules.contraptions.components.contraptions.MovementContext; -import com.simibubi.create.modules.logistics.block.AttachedLogisticalBlock; -import com.simibubi.create.modules.logistics.item.filter.FilterItem; import net.minecraft.entity.Entity; import net.minecraft.entity.item.ItemEntity; diff --git a/src/main/java/com/simibubi/create/modules/logistics/block/extractor/ExtractorSlots.java b/src/main/java/com/simibubi/create/content/logistics/block/extractor/ExtractorSlots.java similarity index 91% rename from src/main/java/com/simibubi/create/modules/logistics/block/extractor/ExtractorSlots.java rename to src/main/java/com/simibubi/create/content/logistics/block/extractor/ExtractorSlots.java index ef5fcbbca..f14289c90 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/block/extractor/ExtractorSlots.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/extractor/ExtractorSlots.java @@ -1,13 +1,13 @@ -package com.simibubi.create.modules.logistics.block.extractor; +package com.simibubi.create.content.logistics.block.extractor; import static net.minecraft.block.HorizontalBlock.HORIZONTAL_FACING; import com.mojang.blaze3d.matrix.MatrixStack; -import com.simibubi.create.foundation.behaviour.ValueBoxTransform; +import com.simibubi.create.content.logistics.block.AttachedLogisticalBlock; +import com.simibubi.create.content.logistics.block.transposer.TransposerBlock; +import com.simibubi.create.foundation.tileEntity.behaviour.ValueBoxTransform; import com.simibubi.create.foundation.utility.AngleHelper; import com.simibubi.create.foundation.utility.VecHelper; -import com.simibubi.create.modules.logistics.block.AttachedLogisticalBlock; -import com.simibubi.create.modules.logistics.block.transposer.TransposerBlock; import net.minecraft.block.BlockState; import net.minecraft.util.Direction.Axis; diff --git a/src/main/java/com/simibubi/create/modules/logistics/block/extractor/ExtractorTileEntity.java b/src/main/java/com/simibubi/create/content/logistics/block/extractor/ExtractorTileEntity.java similarity index 83% rename from src/main/java/com/simibubi/create/modules/logistics/block/extractor/ExtractorTileEntity.java rename to src/main/java/com/simibubi/create/content/logistics/block/extractor/ExtractorTileEntity.java index 05a2a630c..ba8da1dea 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/block/extractor/ExtractorTileEntity.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/extractor/ExtractorTileEntity.java @@ -1,20 +1,20 @@ -package com.simibubi.create.modules.logistics.block.extractor; +package com.simibubi.create.content.logistics.block.extractor; import java.util.List; import com.simibubi.create.AllBlocks; import com.simibubi.create.AllTileEntities; -import com.simibubi.create.config.AllConfigs; -import com.simibubi.create.foundation.behaviour.base.SmartTileEntity; -import com.simibubi.create.foundation.behaviour.base.TileEntityBehaviour; -import com.simibubi.create.foundation.behaviour.filtering.FilteringBehaviour; -import com.simibubi.create.foundation.behaviour.inventory.AutoExtractingBehaviour; -import com.simibubi.create.foundation.behaviour.inventory.ExtractingBehaviour; -import com.simibubi.create.foundation.behaviour.inventory.SingleTargetAutoExtractingBehaviour; +import com.simibubi.create.content.contraptions.base.KineticTileEntity; +import com.simibubi.create.content.contraptions.relays.belt.BeltTileEntity; +import com.simibubi.create.content.logistics.block.AttachedLogisticalBlock; +import com.simibubi.create.foundation.config.AllConfigs; +import com.simibubi.create.foundation.tileEntity.SmartTileEntity; +import com.simibubi.create.foundation.tileEntity.TileEntityBehaviour; +import com.simibubi.create.foundation.tileEntity.behaviour.filtering.FilteringBehaviour; +import com.simibubi.create.foundation.tileEntity.behaviour.inventory.AutoExtractingBehaviour; +import com.simibubi.create.foundation.tileEntity.behaviour.inventory.ExtractingBehaviour; +import com.simibubi.create.foundation.tileEntity.behaviour.inventory.SingleTargetAutoExtractingBehaviour; import com.simibubi.create.foundation.utility.VecHelper; -import com.simibubi.create.modules.contraptions.base.KineticTileEntity; -import com.simibubi.create.modules.contraptions.relays.belt.BeltTileEntity; -import com.simibubi.create.modules.logistics.block.AttachedLogisticalBlock; import net.minecraft.entity.Entity; import net.minecraft.entity.item.ItemEntity; diff --git a/src/main/java/com/simibubi/create/modules/logistics/block/extractor/LinkedExtractorBlock.java b/src/main/java/com/simibubi/create/content/logistics/block/extractor/LinkedExtractorBlock.java similarity index 95% rename from src/main/java/com/simibubi/create/modules/logistics/block/extractor/LinkedExtractorBlock.java rename to src/main/java/com/simibubi/create/content/logistics/block/extractor/LinkedExtractorBlock.java index 475279336..bb4f97ee3 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/block/extractor/LinkedExtractorBlock.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/extractor/LinkedExtractorBlock.java @@ -1,11 +1,11 @@ -package com.simibubi.create.modules.logistics.block.extractor; +package com.simibubi.create.content.logistics.block.extractor; import org.apache.commons.lang3.tuple.Pair; import com.simibubi.create.AllBlocks; +import com.simibubi.create.content.logistics.block.AttachedLogisticalBlock; import com.simibubi.create.foundation.utility.AngleHelper; import com.simibubi.create.foundation.utility.VecHelper; -import com.simibubi.create.modules.logistics.block.AttachedLogisticalBlock; import net.minecraft.block.BlockState; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/com/simibubi/create/modules/logistics/block/extractor/LinkedExtractorTileEntity.java b/src/main/java/com/simibubi/create/content/logistics/block/extractor/LinkedExtractorTileEntity.java similarity index 78% rename from src/main/java/com/simibubi/create/modules/logistics/block/extractor/LinkedExtractorTileEntity.java rename to src/main/java/com/simibubi/create/content/logistics/block/extractor/LinkedExtractorTileEntity.java index 49619e7e1..996e610b9 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/block/extractor/LinkedExtractorTileEntity.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/extractor/LinkedExtractorTileEntity.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.logistics.block.extractor; +package com.simibubi.create.content.logistics.block.extractor; import static net.minecraft.state.properties.BlockStateProperties.POWERED; @@ -7,9 +7,9 @@ import java.util.List; import org.apache.commons.lang3.tuple.Pair; import com.simibubi.create.AllTileEntities; -import com.simibubi.create.foundation.behaviour.ValueBoxTransform; -import com.simibubi.create.foundation.behaviour.base.TileEntityBehaviour; -import com.simibubi.create.foundation.behaviour.linked.LinkBehaviour; +import com.simibubi.create.foundation.tileEntity.TileEntityBehaviour; +import com.simibubi.create.foundation.tileEntity.behaviour.ValueBoxTransform; +import com.simibubi.create.foundation.tileEntity.behaviour.linked.LinkBehaviour; public class LinkedExtractorTileEntity extends ExtractorTileEntity { diff --git a/src/main/java/com/simibubi/create/modules/logistics/block/extractor/VerticalExtractorGenerator.java b/src/main/java/com/simibubi/create/content/logistics/block/extractor/VerticalExtractorGenerator.java similarity index 79% rename from src/main/java/com/simibubi/create/modules/logistics/block/extractor/VerticalExtractorGenerator.java rename to src/main/java/com/simibubi/create/content/logistics/block/extractor/VerticalExtractorGenerator.java index a6a07d234..27f87ac30 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/block/extractor/VerticalExtractorGenerator.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/extractor/VerticalExtractorGenerator.java @@ -1,8 +1,8 @@ -package com.simibubi.create.modules.logistics.block.extractor; +package com.simibubi.create.content.logistics.block.extractor; -import com.simibubi.create.foundation.utility.data.AssetLookup; -import com.simibubi.create.foundation.utility.data.SpecialBlockStateGen; -import com.simibubi.create.modules.logistics.block.funnel.FunnelBlock; +import com.simibubi.create.content.logistics.block.funnel.FunnelBlock; +import com.simibubi.create.foundation.data.AssetLookup; +import com.simibubi.create.foundation.data.SpecialBlockStateGen; import com.tterrag.registrate.providers.DataGenContext; import com.tterrag.registrate.providers.RegistrateBlockstateProvider; diff --git a/src/main/java/com/simibubi/create/modules/logistics/block/funnel/FunnelBlock.java b/src/main/java/com/simibubi/create/content/logistics/block/funnel/FunnelBlock.java similarity index 89% rename from src/main/java/com/simibubi/create/modules/logistics/block/funnel/FunnelBlock.java rename to src/main/java/com/simibubi/create/content/logistics/block/funnel/FunnelBlock.java index 66c4e721c..26879a44b 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/block/funnel/FunnelBlock.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/funnel/FunnelBlock.java @@ -1,22 +1,22 @@ -package com.simibubi.create.modules.logistics.block.funnel; +package com.simibubi.create.content.logistics.block.funnel; import java.util.Arrays; import java.util.Collections; import java.util.List; import com.simibubi.create.AllBlocks; -import com.simibubi.create.foundation.behaviour.base.TileEntityBehaviour; -import com.simibubi.create.foundation.behaviour.filtering.FilteringBehaviour; +import com.simibubi.create.AllShapes; +import com.simibubi.create.content.contraptions.components.structureMovement.IPortableBlock; +import com.simibubi.create.content.contraptions.components.structureMovement.MovementBehaviour; +import com.simibubi.create.content.contraptions.relays.belt.BeltHelper; +import com.simibubi.create.content.contraptions.relays.belt.BeltTileEntity; +import com.simibubi.create.content.contraptions.relays.belt.AllBeltAttachments.BeltAttachmentState; +import com.simibubi.create.content.contraptions.relays.belt.AllBeltAttachments.IBeltAttachment; +import com.simibubi.create.content.contraptions.relays.belt.transport.TransportedItemStack; +import com.simibubi.create.content.logistics.block.AttachedLogisticalBlock; import com.simibubi.create.foundation.block.ITE; -import com.simibubi.create.foundation.utility.AllShapes; -import com.simibubi.create.modules.contraptions.components.contraptions.IPortableBlock; -import com.simibubi.create.modules.contraptions.components.contraptions.MovementBehaviour; -import com.simibubi.create.modules.contraptions.relays.belt.AllBeltAttachments.BeltAttachmentState; -import com.simibubi.create.modules.contraptions.relays.belt.AllBeltAttachments.IBeltAttachment; -import com.simibubi.create.modules.contraptions.relays.belt.BeltHelper; -import com.simibubi.create.modules.contraptions.relays.belt.BeltTileEntity; -import com.simibubi.create.modules.contraptions.relays.belt.transport.TransportedItemStack; -import com.simibubi.create.modules.logistics.block.AttachedLogisticalBlock; +import com.simibubi.create.foundation.tileEntity.TileEntityBehaviour; +import com.simibubi.create.foundation.tileEntity.behaviour.filtering.FilteringBehaviour; import net.minecraft.block.Block; import net.minecraft.block.BlockState; diff --git a/src/main/java/com/simibubi/create/modules/logistics/block/funnel/FunnelFilterSlot.java b/src/main/java/com/simibubi/create/content/logistics/block/funnel/FunnelFilterSlot.java similarity index 86% rename from src/main/java/com/simibubi/create/modules/logistics/block/funnel/FunnelFilterSlot.java rename to src/main/java/com/simibubi/create/content/logistics/block/funnel/FunnelFilterSlot.java index 1ae029622..ca8c83f7e 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/block/funnel/FunnelFilterSlot.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/funnel/FunnelFilterSlot.java @@ -1,11 +1,11 @@ -package com.simibubi.create.modules.logistics.block.funnel; +package com.simibubi.create.content.logistics.block.funnel; import com.mojang.blaze3d.matrix.MatrixStack; -import com.simibubi.create.foundation.behaviour.ValueBoxTransform; +import com.simibubi.create.content.logistics.block.AttachedLogisticalBlock; +import com.simibubi.create.content.logistics.block.extractor.ExtractorBlock; +import com.simibubi.create.foundation.tileEntity.behaviour.ValueBoxTransform; import com.simibubi.create.foundation.utility.AngleHelper; import com.simibubi.create.foundation.utility.VecHelper; -import com.simibubi.create.modules.logistics.block.AttachedLogisticalBlock; -import com.simibubi.create.modules.logistics.block.extractor.ExtractorBlock; import net.minecraft.block.BlockState; import net.minecraft.util.Direction; diff --git a/src/main/java/com/simibubi/create/modules/logistics/block/funnel/FunnelMovementBehaviour.java b/src/main/java/com/simibubi/create/content/logistics/block/funnel/FunnelMovementBehaviour.java similarity index 80% rename from src/main/java/com/simibubi/create/modules/logistics/block/funnel/FunnelMovementBehaviour.java rename to src/main/java/com/simibubi/create/content/logistics/block/funnel/FunnelMovementBehaviour.java index fbc52571d..c0cc9deef 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/block/funnel/FunnelMovementBehaviour.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/funnel/FunnelMovementBehaviour.java @@ -1,10 +1,10 @@ -package com.simibubi.create.modules.logistics.block.funnel; +package com.simibubi.create.content.logistics.block.funnel; import java.util.List; -import com.simibubi.create.modules.contraptions.components.contraptions.MovementBehaviour; -import com.simibubi.create.modules.contraptions.components.contraptions.MovementContext; -import com.simibubi.create.modules.logistics.item.filter.FilterItem; +import com.simibubi.create.content.contraptions.components.structureMovement.MovementBehaviour; +import com.simibubi.create.content.contraptions.components.structureMovement.MovementContext; +import com.simibubi.create.content.logistics.item.filter.FilterItem; import net.minecraft.entity.item.ItemEntity; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/simibubi/create/modules/logistics/block/funnel/FunnelTileEntity.java b/src/main/java/com/simibubi/create/content/logistics/block/funnel/FunnelTileEntity.java similarity index 82% rename from src/main/java/com/simibubi/create/modules/logistics/block/funnel/FunnelTileEntity.java rename to src/main/java/com/simibubi/create/content/logistics/block/funnel/FunnelTileEntity.java index 1eb2a3d98..a517486da 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/block/funnel/FunnelTileEntity.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/funnel/FunnelTileEntity.java @@ -1,19 +1,19 @@ -package com.simibubi.create.modules.logistics.block.funnel; +package com.simibubi.create.content.logistics.block.funnel; import java.util.List; import com.simibubi.create.AllBlocks; import com.simibubi.create.AllSoundEvents; import com.simibubi.create.AllTileEntities; -import com.simibubi.create.foundation.behaviour.base.SmartTileEntity; -import com.simibubi.create.foundation.behaviour.base.TileEntityBehaviour; -import com.simibubi.create.foundation.behaviour.filtering.FilteringBehaviour; -import com.simibubi.create.foundation.behaviour.inventory.InsertingBehaviour; -import com.simibubi.create.foundation.behaviour.inventory.InventoryManagementBehaviour.Attachments; +import com.simibubi.create.content.contraptions.relays.belt.BeltHelper; +import com.simibubi.create.content.contraptions.relays.belt.BeltTileEntity; +import com.simibubi.create.content.logistics.block.AttachedLogisticalBlock; +import com.simibubi.create.foundation.tileEntity.SmartTileEntity; +import com.simibubi.create.foundation.tileEntity.TileEntityBehaviour; +import com.simibubi.create.foundation.tileEntity.behaviour.filtering.FilteringBehaviour; +import com.simibubi.create.foundation.tileEntity.behaviour.inventory.InsertingBehaviour; +import com.simibubi.create.foundation.tileEntity.behaviour.inventory.InventoryManagementBehaviour.Attachments; import com.simibubi.create.foundation.utility.VecHelper; -import com.simibubi.create.modules.contraptions.relays.belt.BeltHelper; -import com.simibubi.create.modules.contraptions.relays.belt.BeltTileEntity; -import com.simibubi.create.modules.logistics.block.AttachedLogisticalBlock; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; diff --git a/src/main/java/com/simibubi/create/modules/logistics/block/funnel/VerticalFunnelGenerator.java b/src/main/java/com/simibubi/create/content/logistics/block/funnel/VerticalFunnelGenerator.java similarity index 86% rename from src/main/java/com/simibubi/create/modules/logistics/block/funnel/VerticalFunnelGenerator.java rename to src/main/java/com/simibubi/create/content/logistics/block/funnel/VerticalFunnelGenerator.java index 7e28f1a3f..1c1ee2649 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/block/funnel/VerticalFunnelGenerator.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/funnel/VerticalFunnelGenerator.java @@ -1,6 +1,6 @@ -package com.simibubi.create.modules.logistics.block.funnel; +package com.simibubi.create.content.logistics.block.funnel; -import com.simibubi.create.foundation.utility.data.SpecialBlockStateGen; +import com.simibubi.create.foundation.data.SpecialBlockStateGen; import com.tterrag.registrate.providers.DataGenContext; import com.tterrag.registrate.providers.RegistrateBlockstateProvider; diff --git a/src/main/java/com/simibubi/create/modules/logistics/block/inventories/AdjustableCrateBlock.java b/src/main/java/com/simibubi/create/content/logistics/block/inventories/AdjustableCrateBlock.java similarity index 98% rename from src/main/java/com/simibubi/create/modules/logistics/block/inventories/AdjustableCrateBlock.java rename to src/main/java/com/simibubi/create/content/logistics/block/inventories/AdjustableCrateBlock.java index dccd37154..aec887c45 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/block/inventories/AdjustableCrateBlock.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/inventories/AdjustableCrateBlock.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.logistics.block.inventories; +package com.simibubi.create.content.logistics.block.inventories; import com.simibubi.create.AllBlocks; import com.simibubi.create.foundation.item.ItemHelper; diff --git a/src/main/java/com/simibubi/create/modules/logistics/block/inventories/AdjustableCrateContainer.java b/src/main/java/com/simibubi/create/content/logistics/block/inventories/AdjustableCrateContainer.java similarity index 92% rename from src/main/java/com/simibubi/create/modules/logistics/block/inventories/AdjustableCrateContainer.java rename to src/main/java/com/simibubi/create/content/logistics/block/inventories/AdjustableCrateContainer.java index 3d0d0cf59..68c13d22a 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/block/inventories/AdjustableCrateContainer.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/inventories/AdjustableCrateContainer.java @@ -1,6 +1,6 @@ -package com.simibubi.create.modules.logistics.block.inventories; +package com.simibubi.create.content.logistics.block.inventories; -import com.simibubi.create.AllContainers; +import com.simibubi.create.AllContainerTypes; import net.minecraft.client.Minecraft; import net.minecraft.client.world.ClientWorld; @@ -20,7 +20,7 @@ public class AdjustableCrateContainer extends Container { public boolean doubleCrate; public AdjustableCrateContainer(int id, PlayerInventory inv, PacketBuffer extraData) { - super(AllContainers.FLEXCRATE.type, id); + super(AllContainerTypes.FLEXCRATE.type, id); ClientWorld world = Minecraft.getInstance().world; TileEntity tileEntity = world.getTileEntity(extraData.readBlockPos()); this.playerInventory = inv; @@ -32,7 +32,7 @@ public class AdjustableCrateContainer extends Container { } public AdjustableCrateContainer(int id, PlayerInventory inv, AdjustableCrateTileEntity te) { - super(AllContainers.FLEXCRATE.type, id); + super(AllContainerTypes.FLEXCRATE.type, id); this.te = te; this.playerInventory = inv; init(); diff --git a/src/main/java/com/simibubi/create/modules/logistics/block/inventories/AdjustableCrateScreen.java b/src/main/java/com/simibubi/create/content/logistics/block/inventories/AdjustableCrateScreen.java similarity index 88% rename from src/main/java/com/simibubi/create/modules/logistics/block/inventories/AdjustableCrateScreen.java rename to src/main/java/com/simibubi/create/content/logistics/block/inventories/AdjustableCrateScreen.java index 05ce91840..1c415d279 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/block/inventories/AdjustableCrateScreen.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/inventories/AdjustableCrateScreen.java @@ -1,22 +1,22 @@ -package com.simibubi.create.modules.logistics.block.inventories; +package com.simibubi.create.content.logistics.block.inventories; -import static com.simibubi.create.ScreenResources.FLEXCRATE; -import static com.simibubi.create.ScreenResources.FLEXCRATE_DOUBLE; -import static com.simibubi.create.ScreenResources.PLAYER_INVENTORY; +import static com.simibubi.create.foundation.gui.AllGuiTextures.FLEXCRATE; +import static com.simibubi.create.foundation.gui.AllGuiTextures.FLEXCRATE_DOUBLE; +import static com.simibubi.create.foundation.gui.AllGuiTextures.PLAYER_INVENTORY; import java.util.ArrayList; import java.util.List; import com.mojang.blaze3d.systems.RenderSystem; import com.simibubi.create.AllBlocks; -import com.simibubi.create.AllPackets; -import com.simibubi.create.ScreenResources; +import com.simibubi.create.content.logistics.packet.ConfigureFlexcratePacket; import com.simibubi.create.foundation.gui.AbstractSimiContainerScreen; +import com.simibubi.create.foundation.gui.AllGuiTextures; import com.simibubi.create.foundation.gui.GuiGameElement; import com.simibubi.create.foundation.gui.widgets.Label; import com.simibubi.create.foundation.gui.widgets.ScrollInput; +import com.simibubi.create.foundation.networking.AllPackets; import com.simibubi.create.foundation.utility.Lang; -import com.simibubi.create.modules.logistics.packet.ConfigureFlexcratePacket; import net.minecraft.client.renderer.Rectangle2d; import net.minecraft.entity.player.PlayerInventory; @@ -94,7 +94,7 @@ public class AdjustableCrateScreen extends AbstractSimiContainerScreen extends AbstractSimiContainerScreen { - protected ScreenResources background; + protected AllGuiTextures background; private IconButton resetButton; private IconButton confirmButton; - protected AbstractFilterScreen(F container, PlayerInventory inv, ITextComponent title, ScreenResources background) { + protected AbstractFilterScreen(F container, PlayerInventory inv, ITextComponent title, AllGuiTextures background) { super(container, inv, title); this.background = background; } @@ -41,8 +42,8 @@ public abstract class AbstractFilterScreen ex super.init(); widgets.clear(); - resetButton = new IconButton(guiLeft + 15, guiTop + background.height - 30, ScreenResources.I_TRASH); - confirmButton = new IconButton(guiLeft + 159, guiTop + background.height - 30, ScreenResources.I_CONFIRM); + resetButton = new IconButton(guiLeft + 15, guiTop + background.height - 30, AllIcons.I_TRASH); + confirmButton = new IconButton(guiLeft + 159, guiTop + background.height - 30, AllIcons.I_CONFIRM); widgets.add(resetButton); widgets.add(confirmButton); diff --git a/src/main/java/com/simibubi/create/modules/logistics/item/filter/AttributeFilterContainer.java b/src/main/java/com/simibubi/create/content/logistics/item/filter/AttributeFilterContainer.java similarity index 94% rename from src/main/java/com/simibubi/create/modules/logistics/item/filter/AttributeFilterContainer.java rename to src/main/java/com/simibubi/create/content/logistics/item/filter/AttributeFilterContainer.java index 819678412..45595fd97 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/item/filter/AttributeFilterContainer.java +++ b/src/main/java/com/simibubi/create/content/logistics/item/filter/AttributeFilterContainer.java @@ -1,9 +1,9 @@ -package com.simibubi.create.modules.logistics.item.filter; +package com.simibubi.create.content.logistics.item.filter; import java.util.ArrayList; import java.util.List; -import com.simibubi.create.AllContainers; +import com.simibubi.create.AllContainerTypes; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; @@ -30,11 +30,11 @@ public class AttributeFilterContainer extends AbstractFilterContainer { List selectedAttributes; public AttributeFilterContainer(int id, PlayerInventory inv, PacketBuffer extraData) { - super(AllContainers.ATTRIBUTE_FILTER.type, id, inv, extraData); + super(AllContainerTypes.ATTRIBUTE_FILTER.type, id, inv, extraData); } public AttributeFilterContainer(int id, PlayerInventory inv, ItemStack stack) { - super(AllContainers.ATTRIBUTE_FILTER.type, id, inv, stack); + super(AllContainerTypes.ATTRIBUTE_FILTER.type, id, inv, stack); } public void appendSelectedAttribute(ItemAttribute itemAttribute) { diff --git a/src/main/java/com/simibubi/create/modules/logistics/item/filter/AttributeFilterScreen.java b/src/main/java/com/simibubi/create/content/logistics/item/filter/AttributeFilterScreen.java similarity index 92% rename from src/main/java/com/simibubi/create/modules/logistics/item/filter/AttributeFilterScreen.java rename to src/main/java/com/simibubi/create/content/logistics/item/filter/AttributeFilterScreen.java index 1c871c8cd..d31e29cf9 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/item/filter/AttributeFilterScreen.java +++ b/src/main/java/com/simibubi/create/content/logistics/item/filter/AttributeFilterScreen.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.logistics.item.filter; +package com.simibubi.create.content.logistics.item.filter; import java.util.ArrayList; import java.util.Arrays; @@ -6,15 +6,16 @@ import java.util.List; import java.util.stream.Collectors; import com.mojang.blaze3d.systems.RenderSystem; -import com.simibubi.create.AllPackets; -import com.simibubi.create.ScreenResources; +import com.simibubi.create.content.logistics.item.filter.AttributeFilterContainer.WhitelistMode; +import com.simibubi.create.content.logistics.item.filter.FilterScreenPacket.Option; +import com.simibubi.create.foundation.gui.AllGuiTextures; +import com.simibubi.create.foundation.gui.AllIcons; import com.simibubi.create.foundation.gui.widgets.IconButton; import com.simibubi.create.foundation.gui.widgets.Indicator; import com.simibubi.create.foundation.gui.widgets.Label; import com.simibubi.create.foundation.gui.widgets.SelectionScrollInput; +import com.simibubi.create.foundation.networking.AllPackets; import com.simibubi.create.foundation.utility.Lang; -import com.simibubi.create.modules.logistics.item.filter.AttributeFilterContainer.WhitelistMode; -import com.simibubi.create.modules.logistics.item.filter.FilterScreenPacket.Option; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.item.ItemStack; @@ -48,7 +49,7 @@ public class AttributeFilterScreen extends AbstractFilterScreen { private Indicator respectNBTIndicator, ignoreNBTIndicator; public FilterScreen(FilterContainer container, PlayerInventory inv, ITextComponent title) { - super(container, inv, title, ScreenResources.FILTER); + super(container, inv, title, AllGuiTextures.FILTER); } @Override @@ -41,17 +42,17 @@ public class FilterScreen extends AbstractFilterScreen { int x = guiLeft; int y = guiTop; - blacklist = new IconButton(x + 58, y + 72, ScreenResources.I_BLACKLIST); + blacklist = new IconButton(x + 58, y + 72, AllIcons.I_BLACKLIST); blacklist.setToolTip(blacklistN); - whitelist = new IconButton(x + 76, y + 72, ScreenResources.I_WHITELIST); + whitelist = new IconButton(x + 76, y + 72, AllIcons.I_WHITELIST); whitelist.setToolTip(whitelistN); blacklistIndicator = new Indicator(x + 58, y + 67, ""); whitelistIndicator = new Indicator(x + 76, y + 67, ""); widgets.addAll(Arrays.asList(blacklist, whitelist, blacklistIndicator, whitelistIndicator)); - respectNBT = new IconButton(x + 98, y + 72, ScreenResources.I_RESPECT_NBT); + respectNBT = new IconButton(x + 98, y + 72, AllIcons.I_RESPECT_NBT); respectNBT.setToolTip(respectDataN); - ignoreNBT = new IconButton(x + 116, y + 72, ScreenResources.I_IGNORE_NBT); + ignoreNBT = new IconButton(x + 116, y + 72, AllIcons.I_IGNORE_NBT); ignoreNBT.setToolTip(ignoreDataN); respectNBTIndicator = new Indicator(x + 98, y + 67, ""); ignoreNBTIndicator = new Indicator(x + 116, y + 67, ""); diff --git a/src/main/java/com/simibubi/create/modules/logistics/item/filter/FilterScreenPacket.java b/src/main/java/com/simibubi/create/content/logistics/item/filter/FilterScreenPacket.java similarity index 92% rename from src/main/java/com/simibubi/create/modules/logistics/item/filter/FilterScreenPacket.java rename to src/main/java/com/simibubi/create/content/logistics/item/filter/FilterScreenPacket.java index 0ce993235..e3c7808cd 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/item/filter/FilterScreenPacket.java +++ b/src/main/java/com/simibubi/create/content/logistics/item/filter/FilterScreenPacket.java @@ -1,9 +1,9 @@ -package com.simibubi.create.modules.logistics.item.filter; +package com.simibubi.create.content.logistics.item.filter; import java.util.function.Supplier; -import com.simibubi.create.foundation.packet.SimplePacketBase; -import com.simibubi.create.modules.logistics.item.filter.AttributeFilterContainer.WhitelistMode; +import com.simibubi.create.content.logistics.item.filter.AttributeFilterContainer.WhitelistMode; +import com.simibubi.create.foundation.networking.SimplePacketBase; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.nbt.CompoundNBT; diff --git a/src/main/java/com/simibubi/create/modules/logistics/item/filter/ItemAttribute.java b/src/main/java/com/simibubi/create/content/logistics/item/filter/ItemAttribute.java similarity index 98% rename from src/main/java/com/simibubi/create/modules/logistics/item/filter/ItemAttribute.java rename to src/main/java/com/simibubi/create/content/logistics/item/filter/ItemAttribute.java index 43ac89f0a..3759744aa 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/item/filter/ItemAttribute.java +++ b/src/main/java/com/simibubi/create/content/logistics/item/filter/ItemAttribute.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.logistics.item.filter; +package com.simibubi.create.content.logistics.item.filter; import java.util.ArrayList; import java.util.Arrays; @@ -12,8 +12,8 @@ import java.util.stream.Collectors; import org.apache.commons.lang3.StringUtils; import com.google.common.base.Predicates; +import com.simibubi.create.content.logistics.InWorldProcessing; import com.simibubi.create.foundation.utility.Lang; -import com.simibubi.create.modules.logistics.InWorldProcessing; import net.minecraft.client.resources.I18n; import net.minecraft.inventory.IInventory; diff --git a/src/main/java/com/simibubi/create/modules/logistics/packet/ConfigureFlexcratePacket.java b/src/main/java/com/simibubi/create/content/logistics/packet/ConfigureFlexcratePacket.java similarity index 78% rename from src/main/java/com/simibubi/create/modules/logistics/packet/ConfigureFlexcratePacket.java rename to src/main/java/com/simibubi/create/content/logistics/packet/ConfigureFlexcratePacket.java index b8d52a639..0acc1c7ad 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/packet/ConfigureFlexcratePacket.java +++ b/src/main/java/com/simibubi/create/content/logistics/packet/ConfigureFlexcratePacket.java @@ -1,7 +1,7 @@ -package com.simibubi.create.modules.logistics.packet; +package com.simibubi.create.content.logistics.packet; -import com.simibubi.create.foundation.packet.TileEntityConfigurationPacket; -import com.simibubi.create.modules.logistics.block.inventories.AdjustableCrateTileEntity; +import com.simibubi.create.content.logistics.block.inventories.AdjustableCrateTileEntity; +import com.simibubi.create.foundation.networking.TileEntityConfigurationPacket; import net.minecraft.network.PacketBuffer; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/com/simibubi/create/modules/logistics/packet/ConfigureStockswitchPacket.java b/src/main/java/com/simibubi/create/content/logistics/packet/ConfigureStockswitchPacket.java similarity index 79% rename from src/main/java/com/simibubi/create/modules/logistics/packet/ConfigureStockswitchPacket.java rename to src/main/java/com/simibubi/create/content/logistics/packet/ConfigureStockswitchPacket.java index af51fcb39..3f6febd1f 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/packet/ConfigureStockswitchPacket.java +++ b/src/main/java/com/simibubi/create/content/logistics/packet/ConfigureStockswitchPacket.java @@ -1,7 +1,7 @@ -package com.simibubi.create.modules.logistics.packet; +package com.simibubi.create.content.logistics.packet; -import com.simibubi.create.foundation.packet.TileEntityConfigurationPacket; -import com.simibubi.create.modules.logistics.block.StockpileSwitchTileEntity; +import com.simibubi.create.content.logistics.block.redstone.StockpileSwitchTileEntity; +import com.simibubi.create.foundation.networking.TileEntityConfigurationPacket; import net.minecraft.network.PacketBuffer; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/com/simibubi/create/modules/palettes/AllPaletteBlocks.java b/src/main/java/com/simibubi/create/content/palettes/AllPaletteBlocks.java similarity index 88% rename from src/main/java/com/simibubi/create/modules/palettes/AllPaletteBlocks.java rename to src/main/java/com/simibubi/create/content/palettes/AllPaletteBlocks.java index bedbc698c..3b7067875 100644 --- a/src/main/java/com/simibubi/create/modules/palettes/AllPaletteBlocks.java +++ b/src/main/java/com/simibubi/create/content/palettes/AllPaletteBlocks.java @@ -1,20 +1,20 @@ -package com.simibubi.create.modules.palettes; +package com.simibubi.create.content.palettes; -import static com.simibubi.create.foundation.utility.data.WindowGen.customWindowBlock; -import static com.simibubi.create.foundation.utility.data.WindowGen.customWindowPane; -import static com.simibubi.create.foundation.utility.data.WindowGen.framedGlass; -import static com.simibubi.create.foundation.utility.data.WindowGen.framedGlassPane; -import static com.simibubi.create.foundation.utility.data.WindowGen.woodenWindowBlock; -import static com.simibubi.create.foundation.utility.data.WindowGen.woodenWindowPane; +import static com.simibubi.create.foundation.data.WindowGen.customWindowBlock; +import static com.simibubi.create.foundation.data.WindowGen.customWindowPane; +import static com.simibubi.create.foundation.data.WindowGen.framedGlass; +import static com.simibubi.create.foundation.data.WindowGen.framedGlassPane; +import static com.simibubi.create.foundation.data.WindowGen.woodenWindowBlock; +import static com.simibubi.create.foundation.data.WindowGen.woodenWindowPane; import com.simibubi.create.AllSpriteShifts; import com.simibubi.create.Create; +import com.simibubi.create.content.AllSections; import com.simibubi.create.foundation.block.connected.HorizontalCTBehaviour; import com.simibubi.create.foundation.block.connected.StandardCTBehaviour; -import com.simibubi.create.foundation.registrate.CreateRegistrate; -import com.simibubi.create.foundation.utility.data.BlockStateGen; -import com.simibubi.create.foundation.utility.data.WindowGen; -import com.simibubi.create.modules.Sections; +import com.simibubi.create.foundation.data.BlockStateGen; +import com.simibubi.create.foundation.data.CreateRegistrate; +import com.simibubi.create.foundation.data.WindowGen; import com.tterrag.registrate.providers.DataGenContext; import com.tterrag.registrate.providers.RegistrateBlockstateProvider; import com.tterrag.registrate.util.entry.BlockEntry; @@ -32,7 +32,7 @@ public class AllPaletteBlocks { private static final CreateRegistrate REGISTRATE = Create.registrate() .itemGroup(() -> Create.palettesCreativeTab) - .startSection(Sections.PALETTES); + .startSection(AllSections.PALETTES); // Windows and Glass diff --git a/src/main/java/com/simibubi/create/modules/palettes/ConnectedGlassBlock.java b/src/main/java/com/simibubi/create/content/palettes/ConnectedGlassBlock.java similarity index 93% rename from src/main/java/com/simibubi/create/modules/palettes/ConnectedGlassBlock.java rename to src/main/java/com/simibubi/create/content/palettes/ConnectedGlassBlock.java index 27d37b542..7d37253bb 100644 --- a/src/main/java/com/simibubi/create/modules/palettes/ConnectedGlassBlock.java +++ b/src/main/java/com/simibubi/create/content/palettes/ConnectedGlassBlock.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.palettes; +package com.simibubi.create.content.palettes; import net.minecraft.block.BlockState; import net.minecraft.block.GlassBlock; diff --git a/src/main/java/com/simibubi/create/modules/palettes/ConnectedGlassPaneBlock.java b/src/main/java/com/simibubi/create/content/palettes/ConnectedGlassPaneBlock.java similarity index 92% rename from src/main/java/com/simibubi/create/modules/palettes/ConnectedGlassPaneBlock.java rename to src/main/java/com/simibubi/create/content/palettes/ConnectedGlassPaneBlock.java index a73053232..b7d57bc0d 100644 --- a/src/main/java/com/simibubi/create/modules/palettes/ConnectedGlassPaneBlock.java +++ b/src/main/java/com/simibubi/create/content/palettes/ConnectedGlassPaneBlock.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.palettes; +package com.simibubi.create.content.palettes; import net.minecraft.block.BlockState; import net.minecraft.util.Direction; diff --git a/src/main/java/com/simibubi/create/modules/palettes/GlassPaneBlock.java b/src/main/java/com/simibubi/create/content/palettes/GlassPaneBlock.java similarity index 77% rename from src/main/java/com/simibubi/create/modules/palettes/GlassPaneBlock.java rename to src/main/java/com/simibubi/create/content/palettes/GlassPaneBlock.java index b44ab46a8..afd74e0d8 100644 --- a/src/main/java/com/simibubi/create/modules/palettes/GlassPaneBlock.java +++ b/src/main/java/com/simibubi/create/content/palettes/GlassPaneBlock.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.palettes; +package com.simibubi.create.content.palettes; import net.minecraft.block.PaneBlock; diff --git a/src/main/java/com/simibubi/create/modules/palettes/MossyBlock.java b/src/main/java/com/simibubi/create/content/palettes/MossyBlock.java similarity index 91% rename from src/main/java/com/simibubi/create/modules/palettes/MossyBlock.java rename to src/main/java/com/simibubi/create/content/palettes/MossyBlock.java index 70eab99f6..d882ac47d 100644 --- a/src/main/java/com/simibubi/create/modules/palettes/MossyBlock.java +++ b/src/main/java/com/simibubi/create/content/palettes/MossyBlock.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.palettes; +package com.simibubi.create.content.palettes; import com.simibubi.create.foundation.block.IHaveColorHandler; diff --git a/src/main/java/com/simibubi/create/modules/palettes/PaletteBlockPartial.java b/src/main/java/com/simibubi/create/content/palettes/PaletteBlockPartial.java similarity index 98% rename from src/main/java/com/simibubi/create/modules/palettes/PaletteBlockPartial.java rename to src/main/java/com/simibubi/create/content/palettes/PaletteBlockPartial.java index 1eb35b7fa..2692e972e 100644 --- a/src/main/java/com/simibubi/create/modules/palettes/PaletteBlockPartial.java +++ b/src/main/java/com/simibubi/create/content/palettes/PaletteBlockPartial.java @@ -1,10 +1,10 @@ -package com.simibubi.create.modules.palettes; +package com.simibubi.create.content.palettes; import java.util.Arrays; import java.util.function.Supplier; import com.simibubi.create.Create; -import com.simibubi.create.foundation.registrate.CreateRegistrate; +import com.simibubi.create.foundation.data.CreateRegistrate; import com.tterrag.registrate.builders.BlockBuilder; import com.tterrag.registrate.builders.ItemBuilder; import com.tterrag.registrate.providers.DataGenContext; diff --git a/src/main/java/com/simibubi/create/modules/palettes/PaletteBlockPatterns.java b/src/main/java/com/simibubi/create/content/palettes/PaletteBlockPatterns.java similarity index 94% rename from src/main/java/com/simibubi/create/modules/palettes/PaletteBlockPatterns.java rename to src/main/java/com/simibubi/create/content/palettes/PaletteBlockPatterns.java index 46dc8cd46..4d6ccc015 100644 --- a/src/main/java/com/simibubi/create/modules/palettes/PaletteBlockPatterns.java +++ b/src/main/java/com/simibubi/create/content/palettes/PaletteBlockPatterns.java @@ -1,10 +1,10 @@ -package com.simibubi.create.modules.palettes; +package com.simibubi.create.content.palettes; -import static com.simibubi.create.modules.palettes.PaletteBlockPartial.AllPartials; -import static com.simibubi.create.modules.palettes.PaletteBlockPartial.ForPolished; -import static com.simibubi.create.modules.palettes.PatternNameType.Prefix; -import static com.simibubi.create.modules.palettes.PatternNameType.Suffix; -import static com.simibubi.create.modules.palettes.PatternNameType.Wrap; +import static com.simibubi.create.content.palettes.PaletteBlockPartial.AllPartials; +import static com.simibubi.create.content.palettes.PaletteBlockPartial.ForPolished; +import static com.simibubi.create.content.palettes.PatternNameType.Prefix; +import static com.simibubi.create.content.palettes.PatternNameType.Suffix; +import static com.simibubi.create.content.palettes.PatternNameType.Wrap; import java.util.Optional; import java.util.function.Function; @@ -15,8 +15,8 @@ import com.simibubi.create.foundation.block.connected.CTSpriteShiftEntry; import com.simibubi.create.foundation.block.connected.CTSpriteShifter.CTType; import com.simibubi.create.foundation.block.connected.ConnectedTextureBehaviour; import com.simibubi.create.foundation.block.connected.HorizontalCTBehaviour; -import com.simibubi.create.foundation.utility.data.BlockStateGen; -import com.simibubi.create.foundation.utility.data.ModelGen; +import com.simibubi.create.foundation.data.BlockStateGen; +import com.simibubi.create.foundation.data.ModelGen; import com.tterrag.registrate.providers.DataGenContext; import com.tterrag.registrate.providers.RegistrateBlockstateProvider; import com.tterrag.registrate.util.nullness.NonNullBiConsumer; diff --git a/src/main/java/com/simibubi/create/modules/palettes/PaletteStoneVariants.java b/src/main/java/com/simibubi/create/content/palettes/PaletteStoneVariants.java similarity index 75% rename from src/main/java/com/simibubi/create/modules/palettes/PaletteStoneVariants.java rename to src/main/java/com/simibubi/create/content/palettes/PaletteStoneVariants.java index c9998430f..bddc2c320 100644 --- a/src/main/java/com/simibubi/create/modules/palettes/PaletteStoneVariants.java +++ b/src/main/java/com/simibubi/create/content/palettes/PaletteStoneVariants.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.palettes; +package com.simibubi.create.content.palettes; public enum PaletteStoneVariants { diff --git a/src/main/java/com/simibubi/create/modules/palettes/PalettesItemGroup.java b/src/main/java/com/simibubi/create/content/palettes/PalettesItemGroup.java similarity index 64% rename from src/main/java/com/simibubi/create/modules/palettes/PalettesItemGroup.java rename to src/main/java/com/simibubi/create/content/palettes/PalettesItemGroup.java index 7b6f03c98..a96173a7b 100644 --- a/src/main/java/com/simibubi/create/modules/palettes/PalettesItemGroup.java +++ b/src/main/java/com/simibubi/create/content/palettes/PalettesItemGroup.java @@ -1,9 +1,9 @@ -package com.simibubi.create.modules.palettes; +package com.simibubi.create.content.palettes; import java.util.EnumSet; -import com.simibubi.create.CreateItemGroupBase; -import com.simibubi.create.modules.Sections; +import com.simibubi.create.content.AllSections; +import com.simibubi.create.foundation.item.CreateItemGroupBase; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; @@ -15,8 +15,8 @@ public class PalettesItemGroup extends CreateItemGroupBase { } @Override - protected EnumSet getSections() { - return EnumSet.of(Sections.PALETTES); + protected EnumSet getSections() { + return EnumSet.of(AllSections.PALETTES); } @Override diff --git a/src/main/java/com/simibubi/create/modules/palettes/PalettesVariantEntry.java b/src/main/java/com/simibubi/create/content/palettes/PalettesVariantEntry.java similarity index 90% rename from src/main/java/com/simibubi/create/modules/palettes/PalettesVariantEntry.java rename to src/main/java/com/simibubi/create/content/palettes/PalettesVariantEntry.java index 620af384d..4f7fb2a27 100644 --- a/src/main/java/com/simibubi/create/modules/palettes/PalettesVariantEntry.java +++ b/src/main/java/com/simibubi/create/content/palettes/PalettesVariantEntry.java @@ -1,10 +1,10 @@ -package com.simibubi.create.modules.palettes; +package com.simibubi.create.content.palettes; -import static com.simibubi.create.foundation.registrate.CreateRegistrate.connectedTextures; +import static com.simibubi.create.foundation.data.CreateRegistrate.connectedTextures; import com.google.common.collect.ImmutableList; import com.simibubi.create.Create; -import com.simibubi.create.foundation.registrate.CreateRegistrate; +import com.simibubi.create.foundation.data.CreateRegistrate; import com.simibubi.create.foundation.utility.Lang; import com.tterrag.registrate.builders.BlockBuilder; import com.tterrag.registrate.util.entry.BlockEntry; diff --git a/src/main/java/com/simibubi/create/modules/palettes/PatternNameType.java b/src/main/java/com/simibubi/create/content/palettes/PatternNameType.java similarity index 50% rename from src/main/java/com/simibubi/create/modules/palettes/PatternNameType.java rename to src/main/java/com/simibubi/create/content/palettes/PatternNameType.java index 6ee04c094..67c9cf1d5 100644 --- a/src/main/java/com/simibubi/create/modules/palettes/PatternNameType.java +++ b/src/main/java/com/simibubi/create/content/palettes/PatternNameType.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.palettes; +package com.simibubi.create.content.palettes; enum PatternNameType { Prefix, Suffix, Wrap diff --git a/src/main/java/com/simibubi/create/modules/palettes/PavedBlock.java b/src/main/java/com/simibubi/create/content/palettes/PavedBlock.java similarity index 96% rename from src/main/java/com/simibubi/create/modules/palettes/PavedBlock.java rename to src/main/java/com/simibubi/create/content/palettes/PavedBlock.java index 3d4657afa..f1376cb8a 100644 --- a/src/main/java/com/simibubi/create/modules/palettes/PavedBlock.java +++ b/src/main/java/com/simibubi/create/content/palettes/PavedBlock.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.palettes; +package com.simibubi.create.content.palettes; import net.minecraft.block.Block; import net.minecraft.block.BlockState; diff --git a/src/main/java/com/simibubi/create/modules/palettes/ScoriaBlock.java b/src/main/java/com/simibubi/create/content/palettes/ScoriaBlock.java similarity index 96% rename from src/main/java/com/simibubi/create/modules/palettes/ScoriaBlock.java rename to src/main/java/com/simibubi/create/content/palettes/ScoriaBlock.java index 845fff1dc..1aefc47dc 100644 --- a/src/main/java/com/simibubi/create/modules/palettes/ScoriaBlock.java +++ b/src/main/java/com/simibubi/create/content/palettes/ScoriaBlock.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.palettes; +package com.simibubi.create.content.palettes; import com.simibubi.create.foundation.block.IHaveColoredVertices; import com.simibubi.create.foundation.utility.ColorHelper; diff --git a/src/main/java/com/simibubi/create/modules/palettes/StandardFoliageColorHandler.java b/src/main/java/com/simibubi/create/content/palettes/StandardFoliageColorHandler.java similarity index 93% rename from src/main/java/com/simibubi/create/modules/palettes/StandardFoliageColorHandler.java rename to src/main/java/com/simibubi/create/content/palettes/StandardFoliageColorHandler.java index c55f93e2c..b876f3c0f 100644 --- a/src/main/java/com/simibubi/create/modules/palettes/StandardFoliageColorHandler.java +++ b/src/main/java/com/simibubi/create/content/palettes/StandardFoliageColorHandler.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.palettes; +package com.simibubi.create.content.palettes; import net.minecraft.block.BlockState; import net.minecraft.client.renderer.color.IBlockColor; diff --git a/src/main/java/com/simibubi/create/modules/palettes/WindowBlock.java b/src/main/java/com/simibubi/create/content/palettes/WindowBlock.java similarity index 94% rename from src/main/java/com/simibubi/create/modules/palettes/WindowBlock.java rename to src/main/java/com/simibubi/create/content/palettes/WindowBlock.java index 7160e202c..02e3db3f7 100644 --- a/src/main/java/com/simibubi/create/modules/palettes/WindowBlock.java +++ b/src/main/java/com/simibubi/create/content/palettes/WindowBlock.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.palettes; +package com.simibubi.create.content.palettes; import net.minecraft.block.BlockState; import net.minecraft.client.renderer.RenderType; diff --git a/src/main/java/com/simibubi/create/modules/schematics/ClientSchematicLoader.java b/src/main/java/com/simibubi/create/content/schematics/ClientSchematicLoader.java similarity index 94% rename from src/main/java/com/simibubi/create/modules/schematics/ClientSchematicLoader.java rename to src/main/java/com/simibubi/create/content/schematics/ClientSchematicLoader.java index e2b215f62..420cad086 100644 --- a/src/main/java/com/simibubi/create/modules/schematics/ClientSchematicLoader.java +++ b/src/main/java/com/simibubi/create/content/schematics/ClientSchematicLoader.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.schematics; +package com.simibubi.create.content.schematics; import java.io.IOException; import java.io.InputStream; @@ -14,12 +14,12 @@ import java.util.HashSet; import java.util.List; import java.util.Map; -import com.simibubi.create.AllPackets; import com.simibubi.create.Create; -import com.simibubi.create.config.AllConfigs; +import com.simibubi.create.content.schematics.packet.SchematicUploadPacket; +import com.simibubi.create.foundation.config.AllConfigs; +import com.simibubi.create.foundation.networking.AllPackets; import com.simibubi.create.foundation.utility.FilesHelper; import com.simibubi.create.foundation.utility.Lang; -import com.simibubi.create.modules.schematics.packet.SchematicUploadPacket; import net.minecraft.client.Minecraft; import net.minecraft.util.text.StringTextComponent; diff --git a/src/main/java/com/simibubi/create/modules/schematics/ISpecialBlockItemRequirement.java b/src/main/java/com/simibubi/create/content/schematics/ISpecialBlockItemRequirement.java similarity index 80% rename from src/main/java/com/simibubi/create/modules/schematics/ISpecialBlockItemRequirement.java rename to src/main/java/com/simibubi/create/content/schematics/ISpecialBlockItemRequirement.java index c0832dee3..c23feb02a 100644 --- a/src/main/java/com/simibubi/create/modules/schematics/ISpecialBlockItemRequirement.java +++ b/src/main/java/com/simibubi/create/content/schematics/ISpecialBlockItemRequirement.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.schematics; +package com.simibubi.create.content.schematics; import net.minecraft.block.BlockState; diff --git a/src/main/java/com/simibubi/create/modules/schematics/ISpecialEntityItemRequirement.java b/src/main/java/com/simibubi/create/content/schematics/ISpecialEntityItemRequirement.java similarity index 74% rename from src/main/java/com/simibubi/create/modules/schematics/ISpecialEntityItemRequirement.java rename to src/main/java/com/simibubi/create/content/schematics/ISpecialEntityItemRequirement.java index 914eb8827..f5bd10caf 100644 --- a/src/main/java/com/simibubi/create/modules/schematics/ISpecialEntityItemRequirement.java +++ b/src/main/java/com/simibubi/create/content/schematics/ISpecialEntityItemRequirement.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.schematics; +package com.simibubi.create.content.schematics; public interface ISpecialEntityItemRequirement { diff --git a/src/main/java/com/simibubi/create/modules/schematics/ItemRequirement.java b/src/main/java/com/simibubi/create/content/schematics/ItemRequirement.java similarity index 98% rename from src/main/java/com/simibubi/create/modules/schematics/ItemRequirement.java rename to src/main/java/com/simibubi/create/content/schematics/ItemRequirement.java index 7df7fc7fe..6220d871c 100644 --- a/src/main/java/com/simibubi/create/modules/schematics/ItemRequirement.java +++ b/src/main/java/com/simibubi/create/content/schematics/ItemRequirement.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.schematics; +package com.simibubi.create.content.schematics; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/main/java/com/simibubi/create/modules/schematics/MaterialChecklist.java b/src/main/java/com/simibubi/create/content/schematics/MaterialChecklist.java similarity index 97% rename from src/main/java/com/simibubi/create/modules/schematics/MaterialChecklist.java rename to src/main/java/com/simibubi/create/content/schematics/MaterialChecklist.java index ddbd5401f..045511d4d 100644 --- a/src/main/java/com/simibubi/create/modules/schematics/MaterialChecklist.java +++ b/src/main/java/com/simibubi/create/content/schematics/MaterialChecklist.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.schematics; +package com.simibubi.create.content.schematics; import java.util.ArrayList; import java.util.Collections; @@ -8,7 +8,7 @@ import java.util.Locale; import java.util.Map; import com.google.common.collect.Sets; -import com.simibubi.create.modules.schematics.ItemRequirement.ItemUseType; +import com.simibubi.create.content.schematics.ItemRequirement.ItemUseType; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/simibubi/create/modules/schematics/SchematicWorld.java b/src/main/java/com/simibubi/create/content/schematics/SchematicWorld.java similarity index 74% rename from src/main/java/com/simibubi/create/modules/schematics/SchematicWorld.java rename to src/main/java/com/simibubi/create/content/schematics/SchematicWorld.java index 33c5d8223..e696dda81 100644 --- a/src/main/java/com/simibubi/create/modules/schematics/SchematicWorld.java +++ b/src/main/java/com/simibubi/create/content/schematics/SchematicWorld.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.schematics; +package com.simibubi.create.content.schematics; import java.util.ArrayList; import java.util.Collections; @@ -8,8 +8,7 @@ import java.util.Map; import java.util.Set; import java.util.function.Predicate; -import com.simibubi.create.foundation.type.Cuboid; -import com.simibubi.create.foundation.utility.WrappedWorld; +import com.simibubi.create.foundation.utility.worldWrappers.WrappedWorld; import net.minecraft.block.Block; import net.minecraft.block.BlockState; @@ -23,6 +22,7 @@ import net.minecraft.fluid.IFluidState; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MutableBoundingBox; import net.minecraft.world.EmptyTickList; import net.minecraft.world.ITickList; import net.minecraft.world.LightType; @@ -35,7 +35,7 @@ public class SchematicWorld extends WrappedWorld { private Map blocks; private Map tileEntities; private List entities; - private Cuboid bounds; + private MutableBoundingBox bounds; public BlockPos anchor; public boolean renderMode; @@ -43,7 +43,7 @@ public class SchematicWorld extends WrappedWorld { super(original); this.blocks = new HashMap<>(); this.tileEntities = new HashMap<>(); - this.bounds = new Cuboid(); + this.bounds = new MutableBoundingBox(); this.anchor = anchor; this.entities = new ArrayList<>(); } @@ -51,19 +51,21 @@ public class SchematicWorld extends WrappedWorld { public Set getAllPositions() { return blocks.keySet(); } - + @Override public boolean addEntity(Entity entityIn) { - if (entityIn instanceof ItemFrameEntity) - ((ItemFrameEntity) entityIn).getDisplayedItem().setTag(null); + if (entityIn instanceof ItemFrameEntity) + ((ItemFrameEntity) entityIn).getDisplayedItem() + .setTag(null); if (entityIn instanceof ArmorStandEntity) { ArmorStandEntity armorStandEntity = (ArmorStandEntity) entityIn; - armorStandEntity.getEquipmentAndArmor().forEach(stack -> stack.setTag(null)); + armorStandEntity.getEquipmentAndArmor() + .forEach(stack -> stack.setTag(null)); } - + return entities.add(entityIn); } - + public List getEntities() { return entities; } @@ -90,15 +92,11 @@ public class SchematicWorld extends WrappedWorld { public BlockState getBlockState(BlockPos globalPos) { BlockPos pos = globalPos.subtract(anchor); - if (pos.getY() - bounds.y == -1 && !renderMode) { + if (pos.getY() - bounds.minY == -1 && !renderMode) return Blocks.GRASS_BLOCK.getDefaultState(); - } - - if (getBounds().contains(pos) && blocks.containsKey(pos)) { + if (getBounds().isVecInside(pos) && blocks.containsKey(pos)) return blocks.get(pos); - } else { - return Blocks.AIR.getDefaultState(); - } + return Blocks.AIR.getDefaultState(); } public Map getBlockMap() { @@ -127,7 +125,7 @@ public class SchematicWorld extends WrappedWorld { @Override public List getEntitiesWithinAABB(Class arg0, AxisAlignedBB arg1, - Predicate arg2) { + Predicate arg2) { return Collections.emptyList(); } @@ -159,29 +157,7 @@ public class SchematicWorld extends WrappedWorld { @Override public boolean setBlockState(BlockPos pos, BlockState arg1, int arg2) { pos = pos.subtract(anchor); - if (pos.getX() < bounds.x) { - bounds.width += bounds.x - pos.getX(); - bounds.x = pos.getX(); - } - if (pos.getY() < bounds.y) { - bounds.height += bounds.y - pos.getY(); - bounds.y = pos.getY(); - } - if (pos.getZ() < bounds.z) { - bounds.length += bounds.z - pos.getZ(); - bounds.z = pos.getZ(); - } - BlockPos boundsMax = bounds.getOrigin().add(bounds.getSize()); - if (boundsMax.getX() <= pos.getX()) { - bounds.width += pos.getX() - boundsMax.getX() + 1; - } - if (boundsMax.getY() <= pos.getY()) { - bounds.height += pos.getY() - boundsMax.getY() + 1; - } - if (boundsMax.getZ() <= pos.getZ()) { - bounds.length += pos.getZ() - boundsMax.getZ() + 1; - } - + bounds.expandTo(new MutableBoundingBox(pos, pos.add(1, 1, 1))); blocks.put(pos, arg1); return true; } @@ -196,14 +172,10 @@ public class SchematicWorld extends WrappedWorld { return EmptyTickList.get(); } - public Cuboid getBounds() { + public MutableBoundingBox getBounds() { return bounds; } - public void setBounds(Cuboid bounds) { - this.bounds = bounds; - } - public Iterable getTileEntities() { return tileEntities.values(); } diff --git a/src/main/java/com/simibubi/create/modules/schematics/ServerSchematicLoader.java b/src/main/java/com/simibubi/create/content/schematics/ServerSchematicLoader.java similarity index 77% rename from src/main/java/com/simibubi/create/modules/schematics/ServerSchematicLoader.java rename to src/main/java/com/simibubi/create/content/schematics/ServerSchematicLoader.java index 4ed7c7688..735c8ec6d 100644 --- a/src/main/java/com/simibubi/create/modules/schematics/ServerSchematicLoader.java +++ b/src/main/java/com/simibubi/create/content/schematics/ServerSchematicLoader.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.schematics; +package com.simibubi.create.content.schematics; import java.io.IOException; import java.io.OutputStream; @@ -16,31 +16,33 @@ import java.util.stream.Stream; import com.simibubi.create.AllBlocks; import com.simibubi.create.Create; -import com.simibubi.create.config.AllConfigs; -import com.simibubi.create.config.CSchematics; -import com.simibubi.create.foundation.type.DimensionPos; +import com.simibubi.create.content.schematics.block.SchematicTableTileEntity; +import com.simibubi.create.content.schematics.item.SchematicItem; +import com.simibubi.create.foundation.config.AllConfigs; +import com.simibubi.create.foundation.config.CSchematics; import com.simibubi.create.foundation.utility.FilesHelper; -import com.simibubi.create.modules.schematics.block.SchematicTableTileEntity; -import com.simibubi.create.modules.schematics.item.SchematicItem; import net.minecraft.block.BlockState; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.StringTextComponent; import net.minecraft.util.text.TranslationTextComponent; +import net.minecraft.world.World; public class ServerSchematicLoader { private Map activeUploads; public class SchematicUploadEntry { + public World world; + public BlockPos tablePos; public OutputStream stream; public long bytesUploaded; public long totalBytes; - public DimensionPos tablePos; public int idleTime; - public SchematicUploadEntry(OutputStream stream, long totalBytes, DimensionPos tablePos) { + public SchematicUploadEntry(OutputStream stream, long totalBytes, World world, BlockPos tablePos) { this.stream = stream; this.totalBytes = totalBytes; this.tablePos = tablePos; @@ -79,9 +81,11 @@ public class ServerSchematicLoader { new HashSet<>(activeUploads.keySet()).forEach(this::cancelUpload); } - public void handleNewUpload(ServerPlayerEntity player, String schematic, long size, DimensionPos dimPos) { - String playerPath = getSchematicPath() + "/" + player.getName().getFormattedText(); - String playerSchematicId = player.getName().getFormattedText() + "/" + schematic; + public void handleNewUpload(ServerPlayerEntity player, String schematic, long size, BlockPos pos) { + String playerPath = getSchematicPath() + "/" + player.getName() + .getFormattedText(); + String playerSchematicId = player.getName() + .getFormattedText() + "/" + schematic; FilesHelper.createFolderIfMissing(playerPath); // Unsupported Format @@ -93,9 +97,9 @@ public class ServerSchematicLoader { Integer maxFileSize = getConfig().maxTotalSchematicSize.get(); if (size > maxFileSize * 1000) { player.sendMessage(new TranslationTextComponent("create.schematics.uploadTooLarge") - .appendSibling(new StringTextComponent(" (" + size / 1000 + " KB)."))); + .appendSibling(new StringTextComponent(" (" + size / 1000 + " KB)."))); player.sendMessage(new TranslationTextComponent("create.schematics.maxAllowedSize") - .appendSibling(new StringTextComponent(" " + maxFileSize + " KB"))); + .appendSibling(new StringTextComponent(" " + maxFileSize + " KB"))); return; } @@ -105,7 +109,7 @@ public class ServerSchematicLoader { try { // Validate Referenced Block - SchematicTableTileEntity table = getTable(dimPos); + SchematicTableTileEntity table = getTable(player.getEntityWorld(), pos); if (table == null) return; @@ -117,7 +121,8 @@ public class ServerSchematicLoader { if (list.count() >= getConfig().maxSchematics.get()) { Stream list2 = Files.list(Paths.get(playerPath)); Optional lastFilePath = list2.filter(f -> !Files.isDirectory(f)) - .min(Comparator.comparingLong(f -> f.toFile().lastModified())); + .min(Comparator.comparingLong(f -> f.toFile() + .lastModified())); list2.close(); if (lastFilePath.isPresent()) { Files.deleteIfExists(lastFilePath.get()); @@ -128,7 +133,8 @@ public class ServerSchematicLoader { // Open Stream OutputStream writer = Files.newOutputStream(Paths.get(getSchematicPath(), playerSchematicId), StandardOpenOption.CREATE_NEW); - activeUploads.put(playerSchematicId, new SchematicUploadEntry(writer, size, dimPos)); + activeUploads.put(playerSchematicId, + new SchematicUploadEntry(writer, size, player.getEntityWorld(), pos)); // Notify Tile Entity table.startUpload(schematic); @@ -144,7 +150,8 @@ public class ServerSchematicLoader { } public void handleWriteRequest(ServerPlayerEntity player, String schematic, byte[] data) { - String playerSchematicId = player.getName().getFormattedText() + "/" + schematic; + String playerSchematicId = player.getName() + .getFormattedText() + "/" + schematic; if (activeUploads.containsKey(playerSchematicId)) { SchematicUploadEntry entry = activeUploads.get(playerSchematicId); @@ -167,7 +174,7 @@ public class ServerSchematicLoader { entry.stream.write(data); entry.idleTime = 0; - SchematicTableTileEntity table = getTable(entry.tablePos); + SchematicTableTileEntity table = getTable(entry.world, entry.tablePos); if (table == null) return; table.uploadingProgress = (float) ((double) entry.bytesUploaded / entry.totalBytes); @@ -196,17 +203,17 @@ public class ServerSchematicLoader { e.printStackTrace(); } - DimensionPos dimpos = entry.tablePos; - if (dimpos == null) + BlockPos pos = entry.tablePos; + if (pos == null) return; - SchematicTableTileEntity table = getTable(dimpos); + SchematicTableTileEntity table = getTable(entry.world, pos); if (table != null) table.finishUpload(); } - public SchematicTableTileEntity getTable(DimensionPos dimpos) { - TileEntity te = dimpos.world.getTileEntity(dimpos.pos); + public SchematicTableTileEntity getTable(World world, BlockPos pos) { + TileEntity te = world.getTileEntity(pos); if (!(te instanceof SchematicTableTileEntity)) return null; SchematicTableTileEntity table = (SchematicTableTileEntity) te; @@ -214,26 +221,30 @@ public class ServerSchematicLoader { } public void handleFinishedUpload(ServerPlayerEntity player, String schematic) { - String playerSchematicId = player.getName().getFormattedText() + "/" + schematic; + String playerSchematicId = player.getName() + .getFormattedText() + "/" + schematic; if (activeUploads.containsKey(playerSchematicId)) { try { activeUploads.get(playerSchematicId).stream.close(); - DimensionPos dimpos = activeUploads.remove(playerSchematicId).tablePos; + SchematicUploadEntry removed = activeUploads.remove(playerSchematicId); + World world = removed.world; + BlockPos pos = removed.tablePos; + Create.logger.info("New Schematic Uploaded: " + playerSchematicId); - - if (dimpos == null) + if (pos == null) return; - BlockState blockState = dimpos.world.getBlockState(dimpos.pos); + BlockState blockState = world.getBlockState(pos); if (AllBlocks.SCHEMATIC_TABLE.get() != blockState.getBlock()) return; - SchematicTableTileEntity table = getTable(dimpos); + SchematicTableTileEntity table = getTable(world, pos); if (table == null) return; table.finishUpload(); - table.inventory.setStackInSlot(1, SchematicItem.create(schematic, player.getName().getFormattedText())); + table.inventory.setStackInSlot(1, SchematicItem.create(schematic, player.getName() + .getFormattedText())); } catch (IOException e) { Create.logger.error("Exception Thrown when finishing Upload: " + playerSchematicId); diff --git a/src/main/java/com/simibubi/create/modules/schematics/block/LaunchedItem.java b/src/main/java/com/simibubi/create/content/schematics/block/LaunchedItem.java similarity index 95% rename from src/main/java/com/simibubi/create/modules/schematics/block/LaunchedItem.java rename to src/main/java/com/simibubi/create/content/schematics/block/LaunchedItem.java index bd87af670..a685417fc 100644 --- a/src/main/java/com/simibubi/create/modules/schematics/block/LaunchedItem.java +++ b/src/main/java/com/simibubi/create/content/schematics/block/LaunchedItem.java @@ -1,12 +1,12 @@ -package com.simibubi.create.modules.schematics.block; +package com.simibubi.create.content.schematics.block; import java.util.Optional; import com.simibubi.create.AllBlocks; -import com.simibubi.create.modules.contraptions.relays.belt.BeltBlock; -import com.simibubi.create.modules.contraptions.relays.belt.BeltBlock.Part; -import com.simibubi.create.modules.contraptions.relays.belt.item.BeltConnectorItem; -import com.simibubi.create.modules.contraptions.relays.elementary.ShaftBlock; +import com.simibubi.create.content.contraptions.relays.belt.BeltBlock; +import com.simibubi.create.content.contraptions.relays.belt.BeltBlock.Part; +import com.simibubi.create.content.contraptions.relays.belt.item.BeltConnectorItem; +import com.simibubi.create.content.contraptions.relays.elementary.ShaftBlock; import net.minecraft.block.Block; import net.minecraft.block.BlockState; diff --git a/src/main/java/com/simibubi/create/modules/schematics/block/SchematicTableBlock.java b/src/main/java/com/simibubi/create/content/schematics/block/SchematicTableBlock.java similarity index 96% rename from src/main/java/com/simibubi/create/modules/schematics/block/SchematicTableBlock.java rename to src/main/java/com/simibubi/create/content/schematics/block/SchematicTableBlock.java index f08971e65..d5e375858 100644 --- a/src/main/java/com/simibubi/create/modules/schematics/block/SchematicTableBlock.java +++ b/src/main/java/com/simibubi/create/content/schematics/block/SchematicTableBlock.java @@ -1,8 +1,8 @@ -package com.simibubi.create.modules.schematics.block; +package com.simibubi.create.content.schematics.block; +import com.simibubi.create.AllShapes; import com.simibubi.create.foundation.block.ITE; import com.simibubi.create.foundation.item.ItemHelper; -import com.simibubi.create.foundation.utility.AllShapes; import net.minecraft.block.Block; import net.minecraft.block.BlockState; diff --git a/src/main/java/com/simibubi/create/modules/schematics/block/SchematicTableContainer.java b/src/main/java/com/simibubi/create/content/schematics/block/SchematicTableContainer.java similarity index 93% rename from src/main/java/com/simibubi/create/modules/schematics/block/SchematicTableContainer.java rename to src/main/java/com/simibubi/create/content/schematics/block/SchematicTableContainer.java index 40b71cab4..0aa49dfd4 100644 --- a/src/main/java/com/simibubi/create/modules/schematics/block/SchematicTableContainer.java +++ b/src/main/java/com/simibubi/create/content/schematics/block/SchematicTableContainer.java @@ -1,6 +1,6 @@ -package com.simibubi.create.modules.schematics.block; +package com.simibubi.create.content.schematics.block; -import com.simibubi.create.AllContainers; +import com.simibubi.create.AllContainerTypes; import com.simibubi.create.AllItems; import net.minecraft.client.Minecraft; @@ -22,7 +22,7 @@ public class SchematicTableContainer extends Container { private PlayerEntity player; public SchematicTableContainer(int id, PlayerInventory inv, PacketBuffer extraData) { - super(AllContainers.SCHEMATIC_TABLE.type, id); + super(AllContainerTypes.SCHEMATIC_TABLE.type, id); player = inv.player; ClientWorld world = Minecraft.getInstance().world; TileEntity tileEntity = world.getTileEntity(extraData.readBlockPos()); @@ -34,7 +34,7 @@ public class SchematicTableContainer extends Container { } public SchematicTableContainer(int id, PlayerInventory inv, SchematicTableTileEntity te) { - super(AllContainers.SCHEMATIC_TABLE.type, id); + super(AllContainerTypes.SCHEMATIC_TABLE.type, id); this.player = inv.player; this.te = te; init(); diff --git a/src/main/java/com/simibubi/create/modules/schematics/block/SchematicTableScreen.java b/src/main/java/com/simibubi/create/content/schematics/block/SchematicTableScreen.java similarity index 86% rename from src/main/java/com/simibubi/create/modules/schematics/block/SchematicTableScreen.java rename to src/main/java/com/simibubi/create/content/schematics/block/SchematicTableScreen.java index aca44eb2e..ea4b09f9d 100644 --- a/src/main/java/com/simibubi/create/modules/schematics/block/SchematicTableScreen.java +++ b/src/main/java/com/simibubi/create/content/schematics/block/SchematicTableScreen.java @@ -1,7 +1,7 @@ -package com.simibubi.create.modules.schematics.block; +package com.simibubi.create.content.schematics.block; -import static com.simibubi.create.ScreenResources.SCHEMATIC_TABLE; -import static com.simibubi.create.ScreenResources.SCHEMATIC_TABLE_PROGRESS; +import static com.simibubi.create.foundation.gui.AllGuiTextures.SCHEMATIC_TABLE; +import static com.simibubi.create.foundation.gui.AllGuiTextures.SCHEMATIC_TABLE_PROGRESS; import java.nio.file.Paths; import java.util.List; @@ -9,15 +9,16 @@ import java.util.List; import com.mojang.blaze3d.systems.RenderSystem; import com.simibubi.create.AllBlocks; import com.simibubi.create.CreateClient; -import com.simibubi.create.ScreenResources; +import com.simibubi.create.content.schematics.ClientSchematicLoader; import com.simibubi.create.foundation.gui.AbstractSimiContainerScreen; +import com.simibubi.create.foundation.gui.AllGuiTextures; +import com.simibubi.create.foundation.gui.AllIcons; import com.simibubi.create.foundation.gui.GuiGameElement; import com.simibubi.create.foundation.gui.widgets.IconButton; import com.simibubi.create.foundation.gui.widgets.Label; import com.simibubi.create.foundation.gui.widgets.ScrollInput; import com.simibubi.create.foundation.gui.widgets.SelectionScrollInput; import com.simibubi.create.foundation.utility.Lang; -import com.simibubi.create.modules.schematics.ClientSchematicLoader; import net.minecraft.client.gui.IHasContainer; import net.minecraft.entity.player.PlayerInventory; @@ -72,9 +73,9 @@ public class SchematicTableScreen extends AbstractSimiContainerScreen(4); replaceLevelIndicators = new Vector<>(4); - List icons = ImmutableList - .of(ScreenResources.I_DONT_REPLACE, ScreenResources.I_REPLACE_SOLID, ScreenResources.I_REPLACE_ANY, - ScreenResources.I_REPLACE_EMPTY); + List icons = ImmutableList + .of(AllIcons.I_DONT_REPLACE, AllIcons.I_REPLACE_SOLID, AllIcons.I_REPLACE_ANY, + AllIcons.I_REPLACE_EMPTY); List toolTips = ImmutableList .of(Lang.translate("gui.schematicannon.option.dontReplaceSolid"), Lang.translate("gui.schematicannon.option.replaceWithSolid"), @@ -106,12 +107,12 @@ public class SchematicannonScreen extends AbstractSimiContainerScreen= fuelX && mouseY >= fuelY && mouseX <= fuelX + ScreenResources.SCHEMATICANNON_FUEL.width - && mouseY <= fuelY + ScreenResources.SCHEMATICANNON_FUEL.height) { + if (mouseX >= fuelX && mouseY >= fuelY && mouseX <= fuelX + AllGuiTextures.SCHEMATICANNON_FUEL.width + && mouseY <= fuelY + AllGuiTextures.SCHEMATICANNON_FUEL.height) { container.getTileEntity(); double fuelUsageRate = te.getFuelUsageRate(); diff --git a/src/main/java/com/simibubi/create/modules/schematics/block/SchematicannonTileEntity.java b/src/main/java/com/simibubi/create/content/schematics/block/SchematicannonTileEntity.java similarity index 94% rename from src/main/java/com/simibubi/create/modules/schematics/block/SchematicannonTileEntity.java rename to src/main/java/com/simibubi/create/content/schematics/block/SchematicannonTileEntity.java index 890e57321..c56382b3c 100644 --- a/src/main/java/com/simibubi/create/modules/schematics/block/SchematicannonTileEntity.java +++ b/src/main/java/com/simibubi/create/content/schematics/block/SchematicannonTileEntity.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.schematics.block; +package com.simibubi.create.content.schematics.block; import java.util.LinkedList; import java.util.List; @@ -7,22 +7,22 @@ import com.simibubi.create.AllBlocks; import com.simibubi.create.AllItems; import com.simibubi.create.AllSoundEvents; import com.simibubi.create.AllTileEntities; -import com.simibubi.create.config.AllConfigs; -import com.simibubi.create.config.CSchematics; -import com.simibubi.create.foundation.behaviour.base.SmartTileEntity; -import com.simibubi.create.foundation.behaviour.base.TileEntityBehaviour; +import com.simibubi.create.content.contraptions.relays.belt.BeltBlock; +import com.simibubi.create.content.contraptions.relays.belt.BeltTileEntity; +import com.simibubi.create.content.contraptions.relays.belt.BeltBlock.Part; +import com.simibubi.create.content.contraptions.relays.belt.BeltBlock.Slope; +import com.simibubi.create.content.contraptions.relays.elementary.ShaftBlock; +import com.simibubi.create.content.schematics.ItemRequirement; +import com.simibubi.create.content.schematics.MaterialChecklist; +import com.simibubi.create.content.schematics.SchematicWorld; +import com.simibubi.create.content.schematics.ItemRequirement.ItemUseType; +import com.simibubi.create.content.schematics.item.SchematicItem; +import com.simibubi.create.foundation.config.AllConfigs; +import com.simibubi.create.foundation.config.CSchematics; import com.simibubi.create.foundation.item.ItemHelper; import com.simibubi.create.foundation.item.ItemHelper.ExtractionCountMode; -import com.simibubi.create.modules.contraptions.relays.belt.BeltBlock; -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.belt.BeltTileEntity; -import com.simibubi.create.modules.contraptions.relays.elementary.ShaftBlock; -import com.simibubi.create.modules.schematics.ItemRequirement; -import com.simibubi.create.modules.schematics.ItemRequirement.ItemUseType; -import com.simibubi.create.modules.schematics.MaterialChecklist; -import com.simibubi.create.modules.schematics.SchematicWorld; -import com.simibubi.create.modules.schematics.item.SchematicItem; +import com.simibubi.create.foundation.tileEntity.SmartTileEntity; +import com.simibubi.create.foundation.tileEntity.TileEntityBehaviour; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; @@ -50,6 +50,7 @@ import net.minecraft.util.Direction.AxisDirection; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MutableBoundingBox; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.StringTextComponent; import net.minecraft.world.gen.feature.template.PlacementSettings; @@ -561,10 +562,8 @@ public class SchematicannonTileEntity extends SmartTileEntity implements INamedC updateChecklist(); sendUpdate = true; blocksToPlace += blocksPlaced; - currentPos = currentPos != null ? currentPos.west() - : blockReader.getBounds() - .getOrigin() - .west(); + MutableBoundingBox bounds = blockReader.getBounds(); + currentPos = currentPos != null ? currentPos.west() : new BlockPos(bounds.minX - 1, bounds.minY, bounds.minZ); } protected ItemStack getItemForBlock(BlockState blockState) { @@ -655,19 +654,17 @@ public class SchematicannonTileEntity extends SmartTileEntity implements INamedC return; } - BlockPos size = blockReader.getBounds() - .getSize(); + MutableBoundingBox bounds = blockReader.getBounds(); currentPos = currentPos.offset(Direction.EAST); - BlockPos posInBounds = currentPos.subtract(blockReader.getBounds() - .getOrigin()); + BlockPos posInBounds = currentPos.add(-bounds.minX, -bounds.minY, -bounds.minZ); - if (posInBounds.getX() > size.getX()) - currentPos = new BlockPos(blockReader.getBounds().x, currentPos.getY(), currentPos.getZ() + 1).west(); - if (posInBounds.getZ() > size.getZ()) - currentPos = new BlockPos(currentPos.getX(), currentPos.getY() + 1, blockReader.getBounds().z).west(); + if (posInBounds.getX() > bounds.getXSize()) + currentPos = new BlockPos(bounds.minX, currentPos.getY(), currentPos.getZ() + 1).west(); + if (posInBounds.getZ() > bounds.getZSize()) + currentPos = new BlockPos(currentPos.getX(), currentPos.getY() + 1, bounds.minZ).west(); // End of blocks reached - if (currentPos.getY() > size.getY()) { + if (currentPos.getY() > bounds.getYSize()) { printingEntityIndex = 0; if (entities.isEmpty()) { finishedPrinting(); diff --git a/src/main/java/com/simibubi/create/modules/schematics/client/SchematicAndQuillHandler.java b/src/main/java/com/simibubi/create/content/schematics/client/SchematicAndQuillHandler.java similarity index 99% rename from src/main/java/com/simibubi/create/modules/schematics/client/SchematicAndQuillHandler.java rename to src/main/java/com/simibubi/create/content/schematics/client/SchematicAndQuillHandler.java index c21531c7c..03f6a5907 100644 --- a/src/main/java/com/simibubi/create/modules/schematics/client/SchematicAndQuillHandler.java +++ b/src/main/java/com/simibubi/create/content/schematics/client/SchematicAndQuillHandler.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.schematics.client; +package com.simibubi.create.content.schematics.client; import java.io.IOException; import java.io.OutputStream; diff --git a/src/main/java/com/simibubi/create/modules/schematics/client/SchematicEditScreen.java b/src/main/java/com/simibubi/create/content/schematics/client/SchematicEditScreen.java similarity index 92% rename from src/main/java/com/simibubi/create/modules/schematics/client/SchematicEditScreen.java rename to src/main/java/com/simibubi/create/content/schematics/client/SchematicEditScreen.java index 57a7d7fde..efbe230f8 100644 --- a/src/main/java/com/simibubi/create/modules/schematics/client/SchematicEditScreen.java +++ b/src/main/java/com/simibubi/create/content/schematics/client/SchematicEditScreen.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.schematics.client; +package com.simibubi.create.content.schematics.client; import java.util.Collections; import java.util.List; @@ -6,8 +6,8 @@ import java.util.List; import com.mojang.blaze3d.systems.RenderSystem; import com.simibubi.create.AllItems; import com.simibubi.create.CreateClient; -import com.simibubi.create.ScreenResources; import com.simibubi.create.foundation.gui.AbstractSimiScreen; +import com.simibubi.create.foundation.gui.AllGuiTextures; import com.simibubi.create.foundation.gui.widgets.Label; import com.simibubi.create.foundation.gui.widgets.ScrollInput; import com.simibubi.create.foundation.gui.widgets.SelectionScrollInput; @@ -41,7 +41,7 @@ public class SchematicEditScreen extends AbstractSimiScreen { @Override protected void init() { - setWindowSize(ScreenResources.SCHEMATIC.width + 50, ScreenResources.SCHEMATIC.height); + setWindowSize(AllGuiTextures.SCHEMATIC.width + 50, AllGuiTextures.SCHEMATIC.height); int x = guiLeft; int y = guiTop; handler = CreateClient.schematicHandler; @@ -129,14 +129,14 @@ public class SchematicEditScreen extends AbstractSimiScreen { protected void renderWindow(int mouseX, int mouseY, float partialTicks) { int x = guiLeft; int y = guiTop; - ScreenResources.SCHEMATIC.draw(this, x, y); + AllGuiTextures.SCHEMATIC.draw(this, x, y); font.drawStringWithShadow(handler.getCurrentSchematicName(), x + 103 - font.getStringWidth(handler.getCurrentSchematicName()) / 2, y + 10, 0xDDEEFF); - font.drawString(positionLabel, x + 10, y + 32, ScreenResources.FONT_COLOR); - font.drawString(rotationLabel, x + 10, y + 52, ScreenResources.FONT_COLOR); - font.drawString(mirrorLabel, x + 10, y + 72, ScreenResources.FONT_COLOR); + font.drawString(positionLabel, x + 10, y + 32, AllGuiTextures.FONT_COLOR); + font.drawString(rotationLabel, x + 10, y + 52, AllGuiTextures.FONT_COLOR); + font.drawString(mirrorLabel, x + 10, y + 72, AllGuiTextures.FONT_COLOR); RenderSystem.pushMatrix(); RenderSystem.translated(guiLeft + 220, guiTop + 20, 0); diff --git a/src/main/java/com/simibubi/create/modules/schematics/client/SchematicHandler.java b/src/main/java/com/simibubi/create/content/schematics/client/SchematicHandler.java similarity index 95% rename from src/main/java/com/simibubi/create/modules/schematics/client/SchematicHandler.java rename to src/main/java/com/simibubi/create/content/schematics/client/SchematicHandler.java index 777b362e7..23f7af662 100644 --- a/src/main/java/com/simibubi/create/modules/schematics/client/SchematicHandler.java +++ b/src/main/java/com/simibubi/create/content/schematics/client/SchematicHandler.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.schematics.client; +package com.simibubi.create.content.schematics.client; import java.util.List; @@ -7,14 +7,14 @@ import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.platform.GlStateManager; import com.simibubi.create.AllItems; import com.simibubi.create.AllKeys; -import com.simibubi.create.AllPackets; +import com.simibubi.create.content.schematics.SchematicWorld; +import com.simibubi.create.content.schematics.client.tools.Tools; +import com.simibubi.create.content.schematics.item.SchematicItem; +import com.simibubi.create.content.schematics.packet.SchematicPlacePacket; import com.simibubi.create.foundation.gui.ToolSelectionScreen; -import com.simibubi.create.foundation.packet.NbtPacket; +import com.simibubi.create.foundation.networking.AllPackets; +import com.simibubi.create.foundation.networking.NbtPacket; import com.simibubi.create.foundation.utility.TessellatorHelper; -import com.simibubi.create.modules.schematics.SchematicWorld; -import com.simibubi.create.modules.schematics.client.tools.Tools; -import com.simibubi.create.modules.schematics.item.SchematicItem; -import com.simibubi.create.modules.schematics.packet.SchematicPlacePacket; import net.minecraft.client.Minecraft; import net.minecraft.client.entity.player.ClientPlayerEntity; diff --git a/src/main/java/com/simibubi/create/modules/schematics/client/SchematicHotbarSlotOverlay.java b/src/main/java/com/simibubi/create/content/schematics/client/SchematicHotbarSlotOverlay.java similarity index 74% rename from src/main/java/com/simibubi/create/modules/schematics/client/SchematicHotbarSlotOverlay.java rename to src/main/java/com/simibubi/create/content/schematics/client/SchematicHotbarSlotOverlay.java index d595dfe58..0190de43a 100644 --- a/src/main/java/com/simibubi/create/modules/schematics/client/SchematicHotbarSlotOverlay.java +++ b/src/main/java/com/simibubi/create/content/schematics/client/SchematicHotbarSlotOverlay.java @@ -1,7 +1,7 @@ -package com.simibubi.create.modules.schematics.client; +package com.simibubi.create.content.schematics.client; import com.mojang.blaze3d.systems.RenderSystem; -import com.simibubi.create.ScreenResources; +import com.simibubi.create.foundation.gui.AllGuiTextures; import net.minecraft.client.MainWindow; import net.minecraft.client.Minecraft; @@ -14,7 +14,7 @@ public class SchematicHotbarSlotOverlay extends AbstractGui { int x = mainWindow.getScaledWidth() / 2 - 92; int y = mainWindow.getScaledHeight() - 23; RenderSystem.enableAlphaTest(); - ScreenResources.BLUEPRINT_SLOT.draw(this, x + 20 * slot, y); + AllGuiTextures.BLUEPRINT_SLOT.draw(this, x + 20 * slot, y); RenderSystem.disableAlphaTest(); } diff --git a/src/main/java/com/simibubi/create/modules/schematics/client/SchematicRenderer.java b/src/main/java/com/simibubi/create/content/schematics/client/SchematicRenderer.java similarity index 70% rename from src/main/java/com/simibubi/create/modules/schematics/client/SchematicRenderer.java rename to src/main/java/com/simibubi/create/content/schematics/client/SchematicRenderer.java index 2719538ce..8bb4e0da4 100644 --- a/src/main/java/com/simibubi/create/modules/schematics/client/SchematicRenderer.java +++ b/src/main/java/com/simibubi/create/content/schematics/client/SchematicRenderer.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.schematics.client; +package com.simibubi.create.content.schematics.client; import java.nio.ByteBuffer; import java.util.HashSet; @@ -12,11 +12,9 @@ import org.lwjgl.system.MemoryUtil; import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.datafixers.util.Pair; -import com.simibubi.create.modules.schematics.SchematicWorld; +import com.simibubi.create.content.schematics.SchematicWorld; -import net.minecraft.block.BedBlock; import net.minecraft.block.BlockState; -import net.minecraft.block.Blocks; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.ActiveRenderInfo; import net.minecraft.client.renderer.BlockRendererDispatcher; @@ -36,8 +34,10 @@ import net.minecraftforge.client.model.data.EmptyModelData; public class SchematicRenderer { private final RegionRenderCacheBuilder bufferCache = new RegionRenderCacheBuilder(); - private final Set usedBlockRenderLayers = new HashSet<>(RenderType.getBlockLayers().size()); - private final Set startedBufferBuilders = new HashSet<>(RenderType.getBlockLayers().size()); + private final Set usedBlockRenderLayers = new HashSet<>(RenderType.getBlockLayers() + .size()); + private final Set startedBufferBuilders = new HashSet<>(RenderType.getBlockLayers() + .size()); private boolean active; private boolean changed; private SchematicWorld schematic; @@ -78,7 +78,8 @@ public class SchematicRenderer { if (!active) return; - final Entity entity = Minecraft.getInstance().getRenderViewEntity(); + final Entity entity = Minecraft.getInstance() + .getRenderViewEntity(); if (entity == null) { return; @@ -119,43 +120,36 @@ public class SchematicRenderer { List blockstates = new LinkedList<>(); - for (BlockPos localPos : BlockPos.getAllInBoxMutable(blockAccess.getBounds().getOrigin(), - blockAccess.getBounds().getOrigin().add(blockAccess.getBounds().getSize()))) { - BlockPos pos = localPos.add(anchor); - BlockState state = blockAccess.getBlockState(pos); - for (RenderType blockRenderLayer : RenderType.getBlockLayers()) { - if (!RenderTypeLookup.canRenderInLayer(state, blockRenderLayer)) { - continue; - } - ForgeHooksClient.setRenderLayer(blockRenderLayer); - final BufferBuilder bufferBuilder = bufferCache.get(blockRenderLayer); - if (startedBufferBuilders.add(blockRenderLayer)) { - // Copied from RenderChunk - { + BlockPos.func_229383_a_(blockAccess.getBounds()) + .forEach(localPos -> { + BlockPos pos = localPos.add(anchor); + BlockState state = blockAccess.getBlockState(pos); + + for (RenderType blockRenderLayer : RenderType.getBlockLayers()) { + if (!RenderTypeLookup.canRenderInLayer(state, blockRenderLayer)) + continue; + ForgeHooksClient.setRenderLayer(blockRenderLayer); + + final BufferBuilder bufferBuilder = bufferCache.get(blockRenderLayer); + if (startedBufferBuilders.add(blockRenderLayer)) bufferBuilder.begin(GL11.GL_QUADS, DefaultVertexFormats.BLOCK); + if (blockRendererDispatcher.renderModel(state, pos, blockAccess, new MatrixStack(), bufferBuilder, + true, minecraft.world.rand, EmptyModelData.INSTANCE)) { + usedBlockRenderLayers.add(blockRenderLayer); } + blockstates.add(state); } - - // Block transformations - if (state.getBlock() instanceof BedBlock) { - state = Blocks.QUARTZ_SLAB.getDefaultState(); - } - - if (blockRendererDispatcher.renderModel(state, pos, blockAccess, new MatrixStack(), bufferBuilder, true, - minecraft.world.rand, EmptyModelData.INSTANCE)) { - usedBlockRenderLayers.add(blockRenderLayer); - } - blockstates.add(state); - } - ForgeHooksClient.setRenderLayer(null); - } + + ForgeHooksClient.setRenderLayer(null); + }); // finishDrawing for (RenderType layer : RenderType.getBlockLayers()) { if (!startedBufferBuilders.contains(layer)) { continue; } - bufferCache.get(layer).finishDrawing(); + bufferCache.get(layer) + .finishDrawing(); } } @@ -164,9 +158,11 @@ public class SchematicRenderer { BufferBuilder.DrawState state = pair.getFirst(); if (state.getCount() > 0) { - state.getVertexFormat().startDrawing(MemoryUtil.memAddress(pair.getSecond())); + state.getVertexFormat() + .startDrawing(MemoryUtil.memAddress(pair.getSecond())); RenderSystem.drawArrays(state.getMode(), 0, state.getCount()); - state.getVertexFormat().endDrawing(); + state.getVertexFormat() + .endDrawing(); } } diff --git a/src/main/java/com/simibubi/create/modules/schematics/client/SchematicTransformation.java b/src/main/java/com/simibubi/create/content/schematics/client/SchematicTransformation.java similarity index 99% rename from src/main/java/com/simibubi/create/modules/schematics/client/SchematicTransformation.java rename to src/main/java/com/simibubi/create/content/schematics/client/SchematicTransformation.java index 20eb873b6..d3d06894b 100644 --- a/src/main/java/com/simibubi/create/modules/schematics/client/SchematicTransformation.java +++ b/src/main/java/com/simibubi/create/content/schematics/client/SchematicTransformation.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.schematics.client; +package com.simibubi.create.content.schematics.client; import com.mojang.blaze3d.systems.RenderSystem; import com.simibubi.create.foundation.gui.widgets.InterpolatedChasingAngle; diff --git a/src/main/java/com/simibubi/create/modules/schematics/client/tools/DeployTool.java b/src/main/java/com/simibubi/create/content/schematics/client/tools/DeployTool.java similarity index 96% rename from src/main/java/com/simibubi/create/modules/schematics/client/tools/DeployTool.java rename to src/main/java/com/simibubi/create/content/schematics/client/tools/DeployTool.java index bb0bc0141..4efc02352 100644 --- a/src/main/java/com/simibubi/create/modules/schematics/client/tools/DeployTool.java +++ b/src/main/java/com/simibubi/create/content/schematics/client/tools/DeployTool.java @@ -1,9 +1,9 @@ -package com.simibubi.create.modules.schematics.client.tools; +package com.simibubi.create.content.schematics.client.tools; import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.systems.RenderSystem; import com.simibubi.create.AllKeys; -import com.simibubi.create.modules.schematics.client.SchematicTransformation; +import com.simibubi.create.content.schematics.client.SchematicTransformation; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.IRenderTypeBuffer; diff --git a/src/main/java/com/simibubi/create/modules/schematics/client/tools/FlipTool.java b/src/main/java/com/simibubi/create/content/schematics/client/tools/FlipTool.java similarity index 98% rename from src/main/java/com/simibubi/create/modules/schematics/client/tools/FlipTool.java rename to src/main/java/com/simibubi/create/content/schematics/client/tools/FlipTool.java index 59635bff3..9c336c2da 100644 --- a/src/main/java/com/simibubi/create/modules/schematics/client/tools/FlipTool.java +++ b/src/main/java/com/simibubi/create/content/schematics/client/tools/FlipTool.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.schematics.client.tools; +package com.simibubi.create.content.schematics.client.tools; import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.platform.GlStateManager; diff --git a/src/main/java/com/simibubi/create/modules/schematics/client/tools/ISchematicTool.java b/src/main/java/com/simibubi/create/content/schematics/client/tools/ISchematicTool.java similarity index 90% rename from src/main/java/com/simibubi/create/modules/schematics/client/tools/ISchematicTool.java rename to src/main/java/com/simibubi/create/content/schematics/client/tools/ISchematicTool.java index 0d0647fe4..c408e542c 100644 --- a/src/main/java/com/simibubi/create/modules/schematics/client/tools/ISchematicTool.java +++ b/src/main/java/com/simibubi/create/content/schematics/client/tools/ISchematicTool.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.schematics.client.tools; +package com.simibubi.create.content.schematics.client.tools; import com.mojang.blaze3d.matrix.MatrixStack; diff --git a/src/main/java/com/simibubi/create/modules/schematics/client/tools/MoveTool.java b/src/main/java/com/simibubi/create/content/schematics/client/tools/MoveTool.java similarity index 89% rename from src/main/java/com/simibubi/create/modules/schematics/client/tools/MoveTool.java rename to src/main/java/com/simibubi/create/content/schematics/client/tools/MoveTool.java index 116f2f81f..f1d7860f0 100644 --- a/src/main/java/com/simibubi/create/modules/schematics/client/tools/MoveTool.java +++ b/src/main/java/com/simibubi/create/content/schematics/client/tools/MoveTool.java @@ -1,7 +1,7 @@ -package com.simibubi.create.modules.schematics.client.tools; +package com.simibubi.create.content.schematics.client.tools; +import com.simibubi.create.content.schematics.client.SchematicTransformation; import com.simibubi.create.foundation.utility.VecHelper; -import com.simibubi.create.modules.schematics.client.SchematicTransformation; import net.minecraft.util.Direction.Axis; import net.minecraft.util.math.Vec3d; diff --git a/src/main/java/com/simibubi/create/modules/schematics/client/tools/MoveVerticalTool.java b/src/main/java/com/simibubi/create/content/schematics/client/tools/MoveVerticalTool.java similarity index 83% rename from src/main/java/com/simibubi/create/modules/schematics/client/tools/MoveVerticalTool.java rename to src/main/java/com/simibubi/create/content/schematics/client/tools/MoveVerticalTool.java index a0d583018..a3f8a6dbe 100644 --- a/src/main/java/com/simibubi/create/modules/schematics/client/tools/MoveVerticalTool.java +++ b/src/main/java/com/simibubi/create/content/schematics/client/tools/MoveVerticalTool.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.schematics.client.tools; +package com.simibubi.create.content.schematics.client.tools; public class MoveVerticalTool extends PlacementToolBase { diff --git a/src/main/java/com/simibubi/create/modules/schematics/client/tools/PlaceTool.java b/src/main/java/com/simibubi/create/content/schematics/client/tools/PlaceTool.java similarity index 79% rename from src/main/java/com/simibubi/create/modules/schematics/client/tools/PlaceTool.java rename to src/main/java/com/simibubi/create/content/schematics/client/tools/PlaceTool.java index f9ac22097..591a9a0c3 100644 --- a/src/main/java/com/simibubi/create/modules/schematics/client/tools/PlaceTool.java +++ b/src/main/java/com/simibubi/create/content/schematics/client/tools/PlaceTool.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.schematics.client.tools; +package com.simibubi.create.content.schematics.client.tools; public class PlaceTool extends SchematicToolBase { diff --git a/src/main/java/com/simibubi/create/modules/schematics/client/tools/PlacementToolBase.java b/src/main/java/com/simibubi/create/content/schematics/client/tools/PlacementToolBase.java similarity index 92% rename from src/main/java/com/simibubi/create/modules/schematics/client/tools/PlacementToolBase.java rename to src/main/java/com/simibubi/create/content/schematics/client/tools/PlacementToolBase.java index 583028f3e..a068d0a2f 100644 --- a/src/main/java/com/simibubi/create/modules/schematics/client/tools/PlacementToolBase.java +++ b/src/main/java/com/simibubi/create/content/schematics/client/tools/PlacementToolBase.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.schematics.client.tools; +package com.simibubi.create.content.schematics.client.tools; import com.mojang.blaze3d.matrix.MatrixStack; diff --git a/src/main/java/com/simibubi/create/modules/schematics/client/tools/RotateTool.java b/src/main/java/com/simibubi/create/content/schematics/client/tools/RotateTool.java similarity index 95% rename from src/main/java/com/simibubi/create/modules/schematics/client/tools/RotateTool.java rename to src/main/java/com/simibubi/create/content/schematics/client/tools/RotateTool.java index 0e150bc21..db87de1d5 100644 --- a/src/main/java/com/simibubi/create/modules/schematics/client/tools/RotateTool.java +++ b/src/main/java/com/simibubi/create/content/schematics/client/tools/RotateTool.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.schematics.client.tools; +package com.simibubi.create.content.schematics.client.tools; import com.mojang.blaze3d.matrix.MatrixStack; diff --git a/src/main/java/com/simibubi/create/modules/schematics/client/tools/SchematicToolBase.java b/src/main/java/com/simibubi/create/content/schematics/client/tools/SchematicToolBase.java similarity index 96% rename from src/main/java/com/simibubi/create/modules/schematics/client/tools/SchematicToolBase.java rename to src/main/java/com/simibubi/create/content/schematics/client/tools/SchematicToolBase.java index 6c398e9e7..d86ba6b5c 100644 --- a/src/main/java/com/simibubi/create/modules/schematics/client/tools/SchematicToolBase.java +++ b/src/main/java/com/simibubi/create/content/schematics/client/tools/SchematicToolBase.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.schematics.client.tools; +package com.simibubi.create.content.schematics.client.tools; import java.util.Arrays; import java.util.List; @@ -6,11 +6,11 @@ import java.util.List; import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.systems.RenderSystem; import com.simibubi.create.CreateClient; +import com.simibubi.create.content.schematics.client.SchematicHandler; +import com.simibubi.create.content.schematics.client.SchematicTransformation; import com.simibubi.create.foundation.utility.RaycastHelper; import com.simibubi.create.foundation.utility.RaycastHelper.PredicateTraceResult; import com.simibubi.create.foundation.utility.VecHelper; -import com.simibubi.create.modules.schematics.client.SchematicHandler; -import com.simibubi.create.modules.schematics.client.SchematicTransformation; import net.minecraft.client.Minecraft; import net.minecraft.client.entity.player.ClientPlayerEntity; diff --git a/src/main/java/com/simibubi/create/modules/schematics/client/tools/Tools.java b/src/main/java/com/simibubi/create/content/schematics/client/tools/Tools.java similarity index 57% rename from src/main/java/com/simibubi/create/modules/schematics/client/tools/Tools.java rename to src/main/java/com/simibubi/create/content/schematics/client/tools/Tools.java index 805643c5d..45da5bc11 100644 --- a/src/main/java/com/simibubi/create/modules/schematics/client/tools/Tools.java +++ b/src/main/java/com/simibubi/create/content/schematics/client/tools/Tools.java @@ -1,25 +1,25 @@ -package com.simibubi.create.modules.schematics.client.tools; +package com.simibubi.create.content.schematics.client.tools; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import com.simibubi.create.ScreenResources; +import com.simibubi.create.foundation.gui.AllIcons; import com.simibubi.create.foundation.utility.Lang; public enum Tools { - Deploy(new DeployTool(), ScreenResources.I_TOOL_DEPLOY), - Move(new MoveTool(), ScreenResources.I_TOOL_MOVE_XZ), - MoveY(new MoveVerticalTool(), ScreenResources.I_TOOL_MOVE_Y), - Rotate(new RotateTool(), ScreenResources.I_TOOL_ROTATE), - Print(new PlaceTool(), ScreenResources.I_CONFIRM), - Flip(new FlipTool(), ScreenResources.I_TOOL_MIRROR); + Deploy(new DeployTool(), AllIcons.I_TOOL_DEPLOY), + Move(new MoveTool(), AllIcons.I_TOOL_MOVE_XZ), + MoveY(new MoveVerticalTool(), AllIcons.I_TOOL_MOVE_Y), + Rotate(new RotateTool(), AllIcons.I_TOOL_ROTATE), + Print(new PlaceTool(), AllIcons.I_CONFIRM), + Flip(new FlipTool(), AllIcons.I_TOOL_MIRROR); private ISchematicTool tool; - private ScreenResources icon; + private AllIcons icon; - private Tools(ISchematicTool tool, ScreenResources icon) { + private Tools(ISchematicTool tool, AllIcons icon) { this.tool = tool; this.icon = icon; } @@ -32,7 +32,7 @@ public enum Tools { return Lang.translate("schematic.tool." + Lang.asId(name())); } - public ScreenResources getIcon() { + public AllIcons getIcon() { return icon; } diff --git a/src/main/java/com/simibubi/create/modules/schematics/item/SchematicAndQuillItem.java b/src/main/java/com/simibubi/create/content/schematics/item/SchematicAndQuillItem.java similarity index 75% rename from src/main/java/com/simibubi/create/modules/schematics/item/SchematicAndQuillItem.java rename to src/main/java/com/simibubi/create/content/schematics/item/SchematicAndQuillItem.java index 0845ccdb7..30e330076 100644 --- a/src/main/java/com/simibubi/create/modules/schematics/item/SchematicAndQuillItem.java +++ b/src/main/java/com/simibubi/create/content/schematics/item/SchematicAndQuillItem.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.schematics.item; +package com.simibubi.create.content.schematics.item; import net.minecraft.item.Item; diff --git a/src/main/java/com/simibubi/create/modules/schematics/item/SchematicItem.java b/src/main/java/com/simibubi/create/content/schematics/item/SchematicItem.java similarity index 97% rename from src/main/java/com/simibubi/create/modules/schematics/item/SchematicItem.java rename to src/main/java/com/simibubi/create/content/schematics/item/SchematicItem.java index a7f42a22f..1b80357e7 100644 --- a/src/main/java/com/simibubi/create/modules/schematics/item/SchematicItem.java +++ b/src/main/java/com/simibubi/create/content/schematics/item/SchematicItem.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.schematics.item; +package com.simibubi.create.content.schematics.item; import java.io.IOException; import java.io.InputStream; @@ -10,9 +10,9 @@ import java.util.List; import org.apache.commons.io.IOUtils; import com.simibubi.create.AllItems; +import com.simibubi.create.content.schematics.client.SchematicEditScreen; import com.simibubi.create.foundation.gui.ScreenOpener; import com.simibubi.create.foundation.utility.Lang; -import com.simibubi.create.modules.schematics.client.SchematicEditScreen; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.PlayerEntity; diff --git a/src/main/java/com/simibubi/create/modules/schematics/packet/ConfigureSchematicannonPacket.java b/src/main/java/com/simibubi/create/content/schematics/packet/ConfigureSchematicannonPacket.java similarity index 90% rename from src/main/java/com/simibubi/create/modules/schematics/packet/ConfigureSchematicannonPacket.java rename to src/main/java/com/simibubi/create/content/schematics/packet/ConfigureSchematicannonPacket.java index 52d8f1e89..f8f9a1e93 100644 --- a/src/main/java/com/simibubi/create/modules/schematics/packet/ConfigureSchematicannonPacket.java +++ b/src/main/java/com/simibubi/create/content/schematics/packet/ConfigureSchematicannonPacket.java @@ -1,10 +1,10 @@ -package com.simibubi.create.modules.schematics.packet; +package com.simibubi.create.content.schematics.packet; import java.util.function.Supplier; -import com.simibubi.create.foundation.packet.SimplePacketBase; -import com.simibubi.create.modules.schematics.block.SchematicannonTileEntity; -import com.simibubi.create.modules.schematics.block.SchematicannonTileEntity.State; +import com.simibubi.create.content.schematics.block.SchematicannonTileEntity; +import com.simibubi.create.content.schematics.block.SchematicannonTileEntity.State; +import com.simibubi.create.foundation.networking.SimplePacketBase; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.network.PacketBuffer; diff --git a/src/main/java/com/simibubi/create/modules/schematics/packet/SchematicPlacePacket.java b/src/main/java/com/simibubi/create/content/schematics/packet/SchematicPlacePacket.java similarity index 86% rename from src/main/java/com/simibubi/create/modules/schematics/packet/SchematicPlacePacket.java rename to src/main/java/com/simibubi/create/content/schematics/packet/SchematicPlacePacket.java index a62e6e2f1..4f907675f 100644 --- a/src/main/java/com/simibubi/create/modules/schematics/packet/SchematicPlacePacket.java +++ b/src/main/java/com/simibubi/create/content/schematics/packet/SchematicPlacePacket.java @@ -1,9 +1,9 @@ -package com.simibubi.create.modules.schematics.packet; +package com.simibubi.create.content.schematics.packet; import java.util.function.Supplier; -import com.simibubi.create.foundation.packet.SimplePacketBase; -import com.simibubi.create.modules.schematics.item.SchematicItem; +import com.simibubi.create.content.schematics.item.SchematicItem; +import com.simibubi.create.foundation.networking.SimplePacketBase; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/simibubi/create/modules/schematics/packet/SchematicUploadPacket.java b/src/main/java/com/simibubi/create/content/schematics/packet/SchematicUploadPacket.java similarity index 67% rename from src/main/java/com/simibubi/create/modules/schematics/packet/SchematicUploadPacket.java rename to src/main/java/com/simibubi/create/content/schematics/packet/SchematicUploadPacket.java index 55f27f5ba..447745bd5 100644 --- a/src/main/java/com/simibubi/create/modules/schematics/packet/SchematicUploadPacket.java +++ b/src/main/java/com/simibubi/create/content/schematics/packet/SchematicUploadPacket.java @@ -1,11 +1,10 @@ -package com.simibubi.create.modules.schematics.packet; +package com.simibubi.create.content.schematics.packet; import java.util.function.Supplier; import com.simibubi.create.Create; -import com.simibubi.create.foundation.packet.SimplePacketBase; -import com.simibubi.create.foundation.type.DimensionPos; -import com.simibubi.create.modules.schematics.block.SchematicTableContainer; +import com.simibubi.create.content.schematics.block.SchematicTableContainer; +import com.simibubi.create.foundation.networking.SimplePacketBase; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.network.PacketBuffer; @@ -65,20 +64,22 @@ public class SchematicUploadPacket extends SimplePacketBase { } public void handle(Supplier context) { - context.get().enqueueWork(() -> { - ServerPlayerEntity player = context.get().getSender(); - if (code == BEGIN) { - BlockPos pos = ((SchematicTableContainer) player.openContainer).getTileEntity().getPos(); - Create.schematicReceiver.handleNewUpload(player, schematic, size, new DimensionPos(player, pos)); - } - if (code == WRITE) { - Create.schematicReceiver.handleWriteRequest(player, schematic, data); - } - if (code == FINISH) { - Create.schematicReceiver.handleFinishedUpload(player, schematic); - } - }); - context.get().setPacketHandled(true); + context.get() + .enqueueWork(() -> { + ServerPlayerEntity player = context.get() + .getSender(); + if (code == BEGIN) { + BlockPos pos = ((SchematicTableContainer) player.openContainer).getTileEntity() + .getPos(); + Create.schematicReceiver.handleNewUpload(player, schematic, size, pos); + } + if (code == WRITE) + Create.schematicReceiver.handleWriteRequest(player, schematic, data); + if (code == FINISH) + Create.schematicReceiver.handleFinishedUpload(player, schematic); + }); + context.get() + .setPacketHandled(true); } } diff --git a/src/main/java/com/simibubi/create/ResourceReloadHandler.java b/src/main/java/com/simibubi/create/foundation/ResourceReloadHandler.java similarity index 87% rename from src/main/java/com/simibubi/create/ResourceReloadHandler.java rename to src/main/java/com/simibubi/create/foundation/ResourceReloadHandler.java index 36cbd2010..78a8c52ce 100644 --- a/src/main/java/com/simibubi/create/ResourceReloadHandler.java +++ b/src/main/java/com/simibubi/create/foundation/ResourceReloadHandler.java @@ -1,5 +1,6 @@ -package com.simibubi.create; +package com.simibubi.create.foundation; +import com.simibubi.create.CreateClient; import com.simibubi.create.foundation.block.render.SpriteShifter; import net.minecraft.client.resources.ReloadListener; diff --git a/src/main/java/com/simibubi/create/data/CreateAdvancements.java b/src/main/java/com/simibubi/create/foundation/advancement/AllAdvancements.java similarity index 96% rename from src/main/java/com/simibubi/create/data/CreateAdvancements.java rename to src/main/java/com/simibubi/create/foundation/advancement/AllAdvancements.java index 88e24615f..5fab34469 100644 --- a/src/main/java/com/simibubi/create/data/CreateAdvancements.java +++ b/src/main/java/com/simibubi/create/foundation/advancement/AllAdvancements.java @@ -1,4 +1,4 @@ -package com.simibubi.create.data; +package com.simibubi.create.foundation.advancement; import java.io.IOException; import java.nio.file.Path; @@ -14,11 +14,9 @@ import com.google.gson.GsonBuilder; import com.simibubi.create.AllBlocks; import com.simibubi.create.AllItems; import com.simibubi.create.Create; -import com.simibubi.create.foundation.advancement.AllTriggers; -import com.simibubi.create.foundation.advancement.KineticBlockTrigger; -import com.simibubi.create.modules.curiosities.zapper.blockzapper.BlockzapperItem; -import com.simibubi.create.modules.curiosities.zapper.blockzapper.BlockzapperItem.ComponentTier; -import com.simibubi.create.modules.curiosities.zapper.blockzapper.BlockzapperItem.Components; +import com.simibubi.create.content.curiosities.zapper.blockzapper.BlockzapperItem; +import com.simibubi.create.content.curiosities.zapper.blockzapper.BlockzapperItem.ComponentTier; +import com.simibubi.create.content.curiosities.zapper.blockzapper.BlockzapperItem.Components; import net.minecraft.advancements.Advancement; import net.minecraft.advancements.Advancement.Builder; @@ -37,7 +35,7 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.text.TranslationTextComponent; @SuppressWarnings("unused") // dont warn about unused avancements -public class CreateAdvancements implements IDataProvider { +public class AllAdvancements implements IDataProvider { static final String LANG = "advancement." + Create.ID + "."; @@ -248,7 +246,7 @@ public class CreateAdvancements implements IDataProvider { .create(); private final DataGenerator generator; - public CreateAdvancements(DataGenerator generatorIn) { + public AllAdvancements(DataGenerator generatorIn) { this.generator = generatorIn; } diff --git a/src/main/java/com/simibubi/create/foundation/behaviour/base/IBehaviourType.java b/src/main/java/com/simibubi/create/foundation/behaviour/base/IBehaviourType.java deleted file mode 100644 index 413af5abe..000000000 --- a/src/main/java/com/simibubi/create/foundation/behaviour/base/IBehaviourType.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.simibubi.create.foundation.behaviour.base; - -public interface IBehaviourType { - -} diff --git a/src/main/java/com/simibubi/create/foundation/behaviour/scrollvalue/INamedIconOptions.java b/src/main/java/com/simibubi/create/foundation/behaviour/scrollvalue/INamedIconOptions.java deleted file mode 100644 index 051dae39c..000000000 --- a/src/main/java/com/simibubi/create/foundation/behaviour/scrollvalue/INamedIconOptions.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.simibubi.create.foundation.behaviour.scrollvalue; - -import com.simibubi.create.ScreenResources; - -public interface INamedIconOptions { - ScreenResources getIcon(); - String getTranslationKey(); -} \ No newline at end of file diff --git a/src/main/java/com/simibubi/create/foundation/block/AbstractTileEntityContainer.java b/src/main/java/com/simibubi/create/foundation/block/AbstractTileEntityContainer.java index f88f2b3b7..c42f3bf1e 100644 --- a/src/main/java/com/simibubi/create/foundation/block/AbstractTileEntityContainer.java +++ b/src/main/java/com/simibubi/create/foundation/block/AbstractTileEntityContainer.java @@ -1,6 +1,6 @@ package com.simibubi.create.foundation.block; -import com.simibubi.create.AllContainers; +import com.simibubi.create.AllContainerTypes; import net.minecraft.client.Minecraft; import net.minecraft.client.world.ClientWorld; @@ -18,7 +18,7 @@ public abstract class AbstractTileEntityContainer extends public PlayerEntity player; @SuppressWarnings("unchecked") - public AbstractTileEntityContainer(AllContainers containerType, int id, PlayerInventory inv, + public AbstractTileEntityContainer(AllContainerTypes containerType, int id, PlayerInventory inv, PacketBuffer extraData) { super(containerType.type, id); ClientWorld world = Minecraft.getInstance().world; @@ -28,7 +28,7 @@ public abstract class AbstractTileEntityContainer extends init(); } - public AbstractTileEntityContainer(AllContainers containerType, int id, PlayerInventory inv, T te) { + public AbstractTileEntityContainer(AllContainerTypes containerType, int id, PlayerInventory inv, T te) { super(containerType.type, id); this.te = te; this.player = inv.player; diff --git a/src/main/java/com/simibubi/create/foundation/block/ITE.java b/src/main/java/com/simibubi/create/foundation/block/ITE.java index ac09fc6d5..c6290f434 100644 --- a/src/main/java/com/simibubi/create/foundation/block/ITE.java +++ b/src/main/java/com/simibubi/create/foundation/block/ITE.java @@ -3,7 +3,7 @@ package com.simibubi.create.foundation.block; import java.util.function.Consumer; import com.simibubi.create.Create; -import com.simibubi.create.config.AllConfigs; +import com.simibubi.create.foundation.config.AllConfigs; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/com/simibubi/create/foundation/block/IWithContainerTileEntity.java b/src/main/java/com/simibubi/create/foundation/block/IWithContainerTileEntity.java deleted file mode 100644 index 934576b16..000000000 --- a/src/main/java/com/simibubi/create/foundation/block/IWithContainerTileEntity.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.simibubi.create.foundation.block; - -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.entity.player.ServerPlayerEntity; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IWorld; -import net.minecraftforge.fml.network.NetworkHooks; - -public interface IWithContainerTileEntity> extends ITE { - - default void open(IWorld world, BlockPos pos, PlayerEntity player) { - if (world.isRemote()) - return; - try { - T te = getTileEntity(world, pos); - NetworkHooks.openGui((ServerPlayerEntity) player, te, te::sendToContainer); - } catch (TileEntityException e) {} - } - -} diff --git a/src/main/java/com/simibubi/create/foundation/block/ProperStairsBlock.java b/src/main/java/com/simibubi/create/foundation/block/ProperStairsBlock.java deleted file mode 100644 index 35892d1fd..000000000 --- a/src/main/java/com/simibubi/create/foundation/block/ProperStairsBlock.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.simibubi.create.foundation.block; - -import net.minecraft.block.Block; -import net.minecraft.block.StairsBlock; - -public class ProperStairsBlock extends StairsBlock { - - public ProperStairsBlock(Block block) { - super(() -> block.getDefaultState(), Properties.from(block)); - } - -} diff --git a/src/main/java/com/simibubi/create/foundation/command/ConfigureConfigPacket.java b/src/main/java/com/simibubi/create/foundation/command/ConfigureConfigPacket.java index 571f220c4..354405087 100644 --- a/src/main/java/com/simibubi/create/foundation/command/ConfigureConfigPacket.java +++ b/src/main/java/com/simibubi/create/foundation/command/ConfigureConfigPacket.java @@ -2,8 +2,8 @@ package com.simibubi.create.foundation.command; import java.util.function.Supplier; -import com.simibubi.create.config.AllConfigs; -import com.simibubi.create.foundation.packet.SimplePacketBase; +import com.simibubi.create.foundation.config.AllConfigs; +import com.simibubi.create.foundation.networking.SimplePacketBase; import net.minecraft.network.PacketBuffer; import net.minecraftforge.api.distmarker.Dist; diff --git a/src/main/java/com/simibubi/create/foundation/command/ToggleDebugCommand.java b/src/main/java/com/simibubi/create/foundation/command/ToggleDebugCommand.java index 6f43e2dd7..a59870fa6 100644 --- a/src/main/java/com/simibubi/create/foundation/command/ToggleDebugCommand.java +++ b/src/main/java/com/simibubi/create/foundation/command/ToggleDebugCommand.java @@ -2,8 +2,8 @@ package com.simibubi.create.foundation.command; import com.mojang.brigadier.arguments.BoolArgumentType; import com.mojang.brigadier.builder.ArgumentBuilder; -import com.simibubi.create.AllPackets; -import com.simibubi.create.config.AllConfigs; +import com.simibubi.create.foundation.config.AllConfigs; +import com.simibubi.create.foundation.networking.AllPackets; import net.minecraft.command.CommandSource; import net.minecraft.command.Commands; diff --git a/src/main/java/com/simibubi/create/config/AllConfigs.java b/src/main/java/com/simibubi/create/foundation/config/AllConfigs.java similarity index 97% rename from src/main/java/com/simibubi/create/config/AllConfigs.java rename to src/main/java/com/simibubi/create/foundation/config/AllConfigs.java index 0b05583d4..049bb3e38 100644 --- a/src/main/java/com/simibubi/create/config/AllConfigs.java +++ b/src/main/java/com/simibubi/create/foundation/config/AllConfigs.java @@ -1,4 +1,4 @@ -package com.simibubi.create.config; +package com.simibubi.create.foundation.config; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/com/simibubi/create/config/CClient.java b/src/main/java/com/simibubi/create/foundation/config/CClient.java similarity index 95% rename from src/main/java/com/simibubi/create/config/CClient.java rename to src/main/java/com/simibubi/create/foundation/config/CClient.java index 718a2b33d..ee189517a 100644 --- a/src/main/java/com/simibubi/create/config/CClient.java +++ b/src/main/java/com/simibubi/create/foundation/config/CClient.java @@ -1,4 +1,4 @@ -package com.simibubi.create.config; +package com.simibubi.create.foundation.config; public class CClient extends ConfigBase { diff --git a/src/main/java/com/simibubi/create/config/CCommon.java b/src/main/java/com/simibubi/create/foundation/config/CCommon.java similarity index 90% rename from src/main/java/com/simibubi/create/config/CCommon.java rename to src/main/java/com/simibubi/create/foundation/config/CCommon.java index 670a4ae5e..d95a92f60 100644 --- a/src/main/java/com/simibubi/create/config/CCommon.java +++ b/src/main/java/com/simibubi/create/foundation/config/CCommon.java @@ -1,4 +1,4 @@ -package com.simibubi.create.config; +package com.simibubi.create.foundation.config; public class CCommon extends ConfigBase { diff --git a/src/main/java/com/simibubi/create/config/CCuriosities.java b/src/main/java/com/simibubi/create/foundation/config/CCuriosities.java similarity index 97% rename from src/main/java/com/simibubi/create/config/CCuriosities.java rename to src/main/java/com/simibubi/create/foundation/config/CCuriosities.java index 4b23a4f05..04dc72f7d 100644 --- a/src/main/java/com/simibubi/create/config/CCuriosities.java +++ b/src/main/java/com/simibubi/create/foundation/config/CCuriosities.java @@ -1,4 +1,4 @@ -package com.simibubi.create.config; +package com.simibubi.create.foundation.config; public class CCuriosities extends ConfigBase { diff --git a/src/main/java/com/simibubi/create/config/CDamageControl.java b/src/main/java/com/simibubi/create/foundation/config/CDamageControl.java similarity index 96% rename from src/main/java/com/simibubi/create/config/CDamageControl.java rename to src/main/java/com/simibubi/create/foundation/config/CDamageControl.java index 5d542d203..50400c322 100644 --- a/src/main/java/com/simibubi/create/config/CDamageControl.java +++ b/src/main/java/com/simibubi/create/foundation/config/CDamageControl.java @@ -1,4 +1,4 @@ -package com.simibubi.create.config; +package com.simibubi.create.foundation.config; public class CDamageControl extends ConfigBase { diff --git a/src/main/java/com/simibubi/create/config/CKinetics.java b/src/main/java/com/simibubi/create/foundation/config/CKinetics.java similarity index 99% rename from src/main/java/com/simibubi/create/config/CKinetics.java rename to src/main/java/com/simibubi/create/foundation/config/CKinetics.java index 1a8b992b2..0b5436ac2 100644 --- a/src/main/java/com/simibubi/create/config/CKinetics.java +++ b/src/main/java/com/simibubi/create/foundation/config/CKinetics.java @@ -1,4 +1,4 @@ -package com.simibubi.create.config; +package com.simibubi.create.foundation.config; public class CKinetics extends ConfigBase { diff --git a/src/main/java/com/simibubi/create/config/CLogistics.java b/src/main/java/com/simibubi/create/foundation/config/CLogistics.java similarity index 95% rename from src/main/java/com/simibubi/create/config/CLogistics.java rename to src/main/java/com/simibubi/create/foundation/config/CLogistics.java index 554fc05ba..90b7dd853 100644 --- a/src/main/java/com/simibubi/create/config/CLogistics.java +++ b/src/main/java/com/simibubi/create/foundation/config/CLogistics.java @@ -1,4 +1,4 @@ -package com.simibubi.create.config; +package com.simibubi.create.foundation.config; public class CLogistics extends ConfigBase { diff --git a/src/main/java/com/simibubi/create/config/CSchematics.java b/src/main/java/com/simibubi/create/foundation/config/CSchematics.java similarity index 97% rename from src/main/java/com/simibubi/create/config/CSchematics.java rename to src/main/java/com/simibubi/create/foundation/config/CSchematics.java index a09a7d65b..0b6d99f9d 100644 --- a/src/main/java/com/simibubi/create/config/CSchematics.java +++ b/src/main/java/com/simibubi/create/foundation/config/CSchematics.java @@ -1,4 +1,4 @@ -package com.simibubi.create.config; +package com.simibubi.create.foundation.config; public class CSchematics extends ConfigBase { diff --git a/src/main/java/com/simibubi/create/config/CServer.java b/src/main/java/com/simibubi/create/foundation/config/CServer.java similarity index 96% rename from src/main/java/com/simibubi/create/config/CServer.java rename to src/main/java/com/simibubi/create/foundation/config/CServer.java index 461828a8d..7b0b3e95c 100644 --- a/src/main/java/com/simibubi/create/config/CServer.java +++ b/src/main/java/com/simibubi/create/foundation/config/CServer.java @@ -1,4 +1,4 @@ -package com.simibubi.create.config; +package com.simibubi.create.foundation.config; public class CServer extends ConfigBase { diff --git a/src/main/java/com/simibubi/create/config/CStress.java b/src/main/java/com/simibubi/create/foundation/config/CStress.java similarity index 97% rename from src/main/java/com/simibubi/create/config/CStress.java rename to src/main/java/com/simibubi/create/foundation/config/CStress.java index 237f65887..8f1450fa9 100644 --- a/src/main/java/com/simibubi/create/config/CStress.java +++ b/src/main/java/com/simibubi/create/foundation/config/CStress.java @@ -1,4 +1,4 @@ -package com.simibubi.create.config; +package com.simibubi.create.foundation.config; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/com/simibubi/create/config/CWorldGen.java b/src/main/java/com/simibubi/create/foundation/config/CWorldGen.java similarity index 86% rename from src/main/java/com/simibubi/create/config/CWorldGen.java rename to src/main/java/com/simibubi/create/foundation/config/CWorldGen.java index b0abf610f..666f5fe63 100644 --- a/src/main/java/com/simibubi/create/config/CWorldGen.java +++ b/src/main/java/com/simibubi/create/foundation/config/CWorldGen.java @@ -1,6 +1,6 @@ -package com.simibubi.create.config; +package com.simibubi.create.foundation.config; -import com.simibubi.create.foundation.world.AllWorldFeatures; +import com.simibubi.create.foundation.worldgen.AllWorldFeatures; import net.minecraftforge.common.ForgeConfigSpec.Builder; diff --git a/src/main/java/com/simibubi/create/config/ConfigBase.java b/src/main/java/com/simibubi/create/foundation/config/ConfigBase.java similarity index 99% rename from src/main/java/com/simibubi/create/config/ConfigBase.java rename to src/main/java/com/simibubi/create/foundation/config/ConfigBase.java index 98fe50800..86c290f67 100644 --- a/src/main/java/com/simibubi/create/config/ConfigBase.java +++ b/src/main/java/com/simibubi/create/foundation/config/ConfigBase.java @@ -1,4 +1,4 @@ -package com.simibubi.create.config; +package com.simibubi.create.foundation.config; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/simibubi/create/config/StressConfigDefaults.java b/src/main/java/com/simibubi/create/foundation/config/StressConfigDefaults.java similarity index 96% rename from src/main/java/com/simibubi/create/config/StressConfigDefaults.java rename to src/main/java/com/simibubi/create/foundation/config/StressConfigDefaults.java index 4f882a154..525c08e71 100644 --- a/src/main/java/com/simibubi/create/config/StressConfigDefaults.java +++ b/src/main/java/com/simibubi/create/foundation/config/StressConfigDefaults.java @@ -1,4 +1,4 @@ -package com.simibubi.create.config; +package com.simibubi.create.foundation.config; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/com/simibubi/create/foundation/utility/data/AllItemsTagProvider.java b/src/main/java/com/simibubi/create/foundation/data/AllItemsTagProvider.java similarity index 95% rename from src/main/java/com/simibubi/create/foundation/utility/data/AllItemsTagProvider.java rename to src/main/java/com/simibubi/create/foundation/data/AllItemsTagProvider.java index d920289dc..ab9298ec5 100644 --- a/src/main/java/com/simibubi/create/foundation/utility/data/AllItemsTagProvider.java +++ b/src/main/java/com/simibubi/create/foundation/data/AllItemsTagProvider.java @@ -1,4 +1,4 @@ -package com.simibubi.create.foundation.utility.data; +package com.simibubi.create.foundation.data; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/com/simibubi/create/foundation/utility/data/AssetLookup.java b/src/main/java/com/simibubi/create/foundation/data/AssetLookup.java similarity index 98% rename from src/main/java/com/simibubi/create/foundation/utility/data/AssetLookup.java rename to src/main/java/com/simibubi/create/foundation/data/AssetLookup.java index 8389f06f3..4e5c5e2f0 100644 --- a/src/main/java/com/simibubi/create/foundation/utility/data/AssetLookup.java +++ b/src/main/java/com/simibubi/create/foundation/data/AssetLookup.java @@ -1,4 +1,4 @@ -package com.simibubi.create.foundation.utility.data; +package com.simibubi.create.foundation.data; import java.util.function.Function; diff --git a/src/main/java/com/simibubi/create/foundation/utility/data/BlockStateGen.java b/src/main/java/com/simibubi/create/foundation/data/BlockStateGen.java similarity index 95% rename from src/main/java/com/simibubi/create/foundation/utility/data/BlockStateGen.java rename to src/main/java/com/simibubi/create/foundation/data/BlockStateGen.java index 51d262c8f..37400f91c 100644 --- a/src/main/java/com/simibubi/create/foundation/utility/data/BlockStateGen.java +++ b/src/main/java/com/simibubi/create/foundation/data/BlockStateGen.java @@ -1,5 +1,5 @@ -package com.simibubi.create.foundation.utility.data; +package com.simibubi.create.foundation.data; import java.util.HashMap; import java.util.IdentityHashMap; @@ -8,14 +8,14 @@ import java.util.Vector; import java.util.function.BiFunction; import java.util.function.Function; +import com.simibubi.create.content.contraptions.base.DirectionalAxisKineticBlock; +import com.simibubi.create.content.contraptions.components.structureMovement.chassis.LinearChassisBlock; +import com.simibubi.create.content.contraptions.components.structureMovement.chassis.RadialChassisBlock; +import com.simibubi.create.content.contraptions.components.structureMovement.mounted.CartAssemblerBlock; +import com.simibubi.create.content.logistics.block.belts.observer.BeltObserverBlock; +import com.simibubi.create.content.palettes.PavedBlock; import com.simibubi.create.foundation.utility.Iterate; -import com.simibubi.create.foundation.world.OxidizingBlock; -import com.simibubi.create.modules.contraptions.base.DirectionalAxisKineticBlock; -import com.simibubi.create.modules.contraptions.components.contraptions.chassis.LinearChassisBlock; -import com.simibubi.create.modules.contraptions.components.contraptions.chassis.RadialChassisBlock; -import com.simibubi.create.modules.contraptions.components.contraptions.mounted.CartAssemblerBlock; -import com.simibubi.create.modules.logistics.block.belts.observer.BeltObserverBlock; -import com.simibubi.create.modules.palettes.PavedBlock; +import com.simibubi.create.foundation.worldgen.OxidizingBlock; import com.tterrag.registrate.builders.BlockBuilder; import com.tterrag.registrate.providers.DataGenContext; import com.tterrag.registrate.providers.RegistrateBlockstateProvider; diff --git a/src/main/java/com/simibubi/create/foundation/utility/data/BuilderTransformers.java b/src/main/java/com/simibubi/create/foundation/data/BuilderTransformers.java similarity index 89% rename from src/main/java/com/simibubi/create/foundation/utility/data/BuilderTransformers.java rename to src/main/java/com/simibubi/create/foundation/data/BuilderTransformers.java index b57806012..7916a6a37 100644 --- a/src/main/java/com/simibubi/create/foundation/utility/data/BuilderTransformers.java +++ b/src/main/java/com/simibubi/create/foundation/data/BuilderTransformers.java @@ -1,19 +1,17 @@ -package com.simibubi.create.foundation.utility.data; +package com.simibubi.create.foundation.data; -import static com.simibubi.create.foundation.registrate.CreateRegistrate.connectedTextures; +import static com.simibubi.create.foundation.data.CreateRegistrate.connectedTextures; import java.util.HashMap; import java.util.Map; import com.simibubi.create.Create; -import com.simibubi.create.SharedProperties; -import com.simibubi.create.config.StressConfigDefaults; +import com.simibubi.create.content.contraptions.base.CasingBlock; +import com.simibubi.create.content.contraptions.components.structureMovement.piston.MechanicalPistonGenerator; +import com.simibubi.create.content.logistics.block.inventories.CrateBlock; import com.simibubi.create.foundation.block.connected.CTSpriteShiftEntry; import com.simibubi.create.foundation.block.connected.StandardCTBehaviour; -import com.simibubi.create.foundation.registrate.CreateRegistrate; -import com.simibubi.create.modules.contraptions.CasingBlock; -import com.simibubi.create.modules.contraptions.components.contraptions.piston.MechanicalPistonGenerator; -import com.simibubi.create.modules.logistics.block.inventories.CrateBlock; +import com.simibubi.create.foundation.config.StressConfigDefaults; import com.tterrag.registrate.builders.BlockBuilder; import com.tterrag.registrate.util.nullness.NonNullUnaryOperator; @@ -21,8 +19,8 @@ import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderType; import net.minecraft.state.properties.PistonType; import net.minecraft.util.Direction; -import net.minecraft.util.ResourceLocation; import net.minecraft.util.Direction.Axis; +import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.generators.ConfiguredModel; import net.minecraftforge.client.model.generators.ModelFile; diff --git a/src/main/java/com/simibubi/create/foundation/registrate/CreateRegistrate.java b/src/main/java/com/simibubi/create/foundation/data/CreateRegistrate.java similarity index 83% rename from src/main/java/com/simibubi/create/foundation/registrate/CreateRegistrate.java rename to src/main/java/com/simibubi/create/foundation/data/CreateRegistrate.java index 887cfec33..5bdf26f01 100644 --- a/src/main/java/com/simibubi/create/foundation/registrate/CreateRegistrate.java +++ b/src/main/java/com/simibubi/create/foundation/data/CreateRegistrate.java @@ -1,4 +1,4 @@ -package com.simibubi.create.foundation.registrate; +package com.simibubi.create.foundation.data; import java.util.Collection; import java.util.IdentityHashMap; @@ -7,9 +7,9 @@ import java.util.Map.Entry; import java.util.stream.Collectors; import com.simibubi.create.CreateClient; +import com.simibubi.create.content.AllSections; import com.simibubi.create.foundation.block.connected.CTModel; import com.simibubi.create.foundation.block.connected.ConnectedTextureBehaviour; -import com.simibubi.create.modules.Sections; import com.tterrag.registrate.AbstractRegistrate; import com.tterrag.registrate.builders.BlockBuilder; import com.tterrag.registrate.builders.Builder; @@ -41,15 +41,15 @@ public class CreateRegistrate extends AbstractRegistrate { /* Section Tracking */ - private static Map, Sections> sectionLookup = new IdentityHashMap<>(); - private Sections section; + private static Map, AllSections> sectionLookup = new IdentityHashMap<>(); + private AllSections section; - public CreateRegistrate startSection(Sections section) { + public CreateRegistrate startSection(AllSections section) { this.section = section; return this; } - public Sections currentSection() { + public AllSections currentSection() { return section; } @@ -62,25 +62,25 @@ public class CreateRegistrate extends AbstractRegistrate { return ret; } - public void addToSection(RegistryEntry entry, Sections section) { + public void addToSection(RegistryEntry entry, AllSections section) { sectionLookup.put(entry, section); } - public Sections getSection(RegistryEntry entry) { - return sectionLookup.getOrDefault(entry, Sections.UNASSIGNED); + public AllSections getSection(RegistryEntry entry) { + return sectionLookup.getOrDefault(entry, AllSections.UNASSIGNED); } - public Sections getSection(IForgeRegistryEntry entry) { + public AllSections getSection(IForgeRegistryEntry entry) { return sectionLookup.entrySet() .stream() .filter(e -> e.getKey() .get() == entry) .map(Entry::getValue) .findFirst() - .orElse(Sections.UNASSIGNED); + .orElse(AllSections.UNASSIGNED); } - public > Collection> getAll(Sections section, Class registryType) { + public > Collection> getAll(AllSections section, Class registryType) { return this.getAll(registryType).stream() .filter(e -> getSection(e) == section) .collect(Collectors.toList()); diff --git a/src/main/java/com/simibubi/create/foundation/utility/data/Generator.java b/src/main/java/com/simibubi/create/foundation/data/Generator.java similarity index 74% rename from src/main/java/com/simibubi/create/foundation/utility/data/Generator.java rename to src/main/java/com/simibubi/create/foundation/data/Generator.java index d57f0033a..b1cda1930 100644 --- a/src/main/java/com/simibubi/create/foundation/utility/data/Generator.java +++ b/src/main/java/com/simibubi/create/foundation/data/Generator.java @@ -1,6 +1,6 @@ -package com.simibubi.create.foundation.utility.data; +package com.simibubi.create.foundation.data; -import com.simibubi.create.data.CreateAdvancements; +import com.simibubi.create.foundation.advancement.AllAdvancements; import net.minecraft.data.DataGenerator; import net.minecraftforge.eventbus.api.SubscribeEvent; @@ -14,7 +14,7 @@ public class Generator { public static void gatherData(GatherDataEvent event){ DataGenerator gen = event.getGenerator(); gen.addProvider(new AllItemsTagProvider(gen)); - gen.addProvider(new CreateAdvancements(gen)); + gen.addProvider(new AllAdvancements(gen)); } } diff --git a/src/main/java/com/simibubi/create/foundation/utility/data/ITaggable.java b/src/main/java/com/simibubi/create/foundation/data/ITaggable.java similarity index 98% rename from src/main/java/com/simibubi/create/foundation/utility/data/ITaggable.java rename to src/main/java/com/simibubi/create/foundation/data/ITaggable.java index 90dd3ef7d..c9d99631b 100644 --- a/src/main/java/com/simibubi/create/foundation/utility/data/ITaggable.java +++ b/src/main/java/com/simibubi/create/foundation/data/ITaggable.java @@ -1,4 +1,4 @@ -package com.simibubi.create.foundation.utility.data; +package com.simibubi.create.foundation.data; import java.util.Arrays; import java.util.Collections; diff --git a/src/main/java/com/simibubi/create/foundation/utility/data/ModelGen.java b/src/main/java/com/simibubi/create/foundation/data/ModelGen.java similarity index 97% rename from src/main/java/com/simibubi/create/foundation/utility/data/ModelGen.java rename to src/main/java/com/simibubi/create/foundation/data/ModelGen.java index fb32d4278..aec5e178a 100644 --- a/src/main/java/com/simibubi/create/foundation/utility/data/ModelGen.java +++ b/src/main/java/com/simibubi/create/foundation/data/ModelGen.java @@ -1,4 +1,4 @@ -package com.simibubi.create.foundation.utility.data; +package com.simibubi.create.foundation.data; import com.simibubi.create.Create; import com.tterrag.registrate.builders.ItemBuilder; diff --git a/src/main/java/com/simibubi/create/SharedProperties.java b/src/main/java/com/simibubi/create/foundation/data/SharedProperties.java similarity index 93% rename from src/main/java/com/simibubi/create/SharedProperties.java rename to src/main/java/com/simibubi/create/foundation/data/SharedProperties.java index 31b800657..1b143ec12 100644 --- a/src/main/java/com/simibubi/create/SharedProperties.java +++ b/src/main/java/com/simibubi/create/foundation/data/SharedProperties.java @@ -1,4 +1,4 @@ -package com.simibubi.create; +package com.simibubi.create.foundation.data; import net.minecraft.block.Block; import net.minecraft.block.Blocks; diff --git a/src/main/java/com/simibubi/create/foundation/utility/data/SpecialBlockStateGen.java b/src/main/java/com/simibubi/create/foundation/data/SpecialBlockStateGen.java similarity index 95% rename from src/main/java/com/simibubi/create/foundation/utility/data/SpecialBlockStateGen.java rename to src/main/java/com/simibubi/create/foundation/data/SpecialBlockStateGen.java index 5c2c3545d..bc4ee17e2 100644 --- a/src/main/java/com/simibubi/create/foundation/utility/data/SpecialBlockStateGen.java +++ b/src/main/java/com/simibubi/create/foundation/data/SpecialBlockStateGen.java @@ -1,4 +1,4 @@ -package com.simibubi.create.foundation.utility.data; +package com.simibubi.create.foundation.data; import com.tterrag.registrate.providers.DataGenContext; import com.tterrag.registrate.providers.RegistrateBlockstateProvider; diff --git a/src/main/java/com/simibubi/create/foundation/utility/data/WindowGen.java b/src/main/java/com/simibubi/create/foundation/data/WindowGen.java similarity index 94% rename from src/main/java/com/simibubi/create/foundation/utility/data/WindowGen.java rename to src/main/java/com/simibubi/create/foundation/data/WindowGen.java index 5bf6d9e29..d9e1dc0ad 100644 --- a/src/main/java/com/simibubi/create/foundation/utility/data/WindowGen.java +++ b/src/main/java/com/simibubi/create/foundation/data/WindowGen.java @@ -1,21 +1,20 @@ -package com.simibubi.create.foundation.utility.data; +package com.simibubi.create.foundation.data; -import static com.simibubi.create.foundation.registrate.CreateRegistrate.connectedTextures; +import static com.simibubi.create.foundation.data.CreateRegistrate.connectedTextures; import java.util.function.Function; import java.util.function.Supplier; import com.simibubi.create.AllSpriteShifts; import com.simibubi.create.Create; +import com.simibubi.create.content.palettes.ConnectedGlassBlock; +import com.simibubi.create.content.palettes.ConnectedGlassPaneBlock; +import com.simibubi.create.content.palettes.GlassPaneBlock; +import com.simibubi.create.content.palettes.WindowBlock; import com.simibubi.create.foundation.block.connected.CTSpriteShiftEntry; import com.simibubi.create.foundation.block.connected.ConnectedTextureBehaviour; import com.simibubi.create.foundation.block.connected.GlassPaneCTBehaviour; import com.simibubi.create.foundation.block.connected.HorizontalCTBehaviour; -import com.simibubi.create.foundation.registrate.CreateRegistrate; -import com.simibubi.create.modules.palettes.ConnectedGlassBlock; -import com.simibubi.create.modules.palettes.ConnectedGlassPaneBlock; -import com.simibubi.create.modules.palettes.GlassPaneBlock; -import com.simibubi.create.modules.palettes.WindowBlock; import com.tterrag.registrate.builders.BlockBuilder; import com.tterrag.registrate.providers.DataGenContext; import com.tterrag.registrate.providers.RegistrateBlockstateProvider; diff --git a/src/main/java/com/simibubi/create/ScreenResources.java b/src/main/java/com/simibubi/create/foundation/gui/AllGuiTextures.java similarity index 55% rename from src/main/java/com/simibubi/create/ScreenResources.java rename to src/main/java/com/simibubi/create/foundation/gui/AllGuiTextures.java index bd4e1777c..49d7882b6 100644 --- a/src/main/java/com/simibubi/create/ScreenResources.java +++ b/src/main/java/com/simibubi/create/foundation/gui/AllGuiTextures.java @@ -1,21 +1,15 @@ -package com.simibubi.create; +package com.simibubi.create.foundation.gui; -import com.mojang.blaze3d.matrix.MatrixStack; -import com.mojang.blaze3d.matrix.MatrixStack.Entry; -import com.mojang.blaze3d.vertex.IVertexBuilder; -import com.simibubi.create.foundation.utility.ColorHelper; +import com.simibubi.create.Create; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.AbstractGui; import net.minecraft.client.gui.screen.Screen; -import net.minecraft.client.renderer.IRenderTypeBuffer; -import net.minecraft.client.renderer.RenderType; import net.minecraft.util.ResourceLocation; -import net.minecraft.util.math.Vec3d; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -public enum ScreenResources { +public enum AllGuiTextures { // Inventories PLAYER_INVENTORY("player_inventory.png", 176, 108), @@ -84,94 +78,23 @@ public enum ScreenResources { BLUEPRINT_SLOT("widgets.png", 90, 0, 24, 24), - // Icons - I_ADD(0, 0), - I_TRASH(1, 0), - I_3x3(2, 0), - I_TARGET(3, 0), - I_PRIORITY_VERY_LOW(4, 0), - I_PRIORITY_LOW(5, 0), - I_PRIORITY_HIGH(6, 0), - I_PRIORITY_VERY_HIGH(7, 0), - I_BLACKLIST(8, 0), - I_WHITELIST(9, 0), - I_WHITELIST_OR(10, 0), - I_WHITELIST_AND(11, 0), - I_WHITELIST_NOT(12, 0), - I_RESPECT_NBT(13, 0), - I_IGNORE_NBT(14, 0), - - I_CONFIRM(0, 1), - I_NONE(1, 1), - I_OPEN_FOLDER(2, 1), - I_REFRESH(3, 1), - I_ACTIVE(4, 1), - I_PASSIVE(5, 1), - I_ROTATE_PLACE(6, 1), - I_ROTATE_PLACE_RETURNED(7, 1), - I_ROTATE_NEVER_PLACE(8, 1), - I_MOVE_PLACE(9, 1), - I_MOVE_PLACE_RETURNED(10, 1), - I_MOVE_NEVER_PLACE(11, 1), - I_CART_ROTATE(12, 1), - I_CART_ROTATE_PAUSED(13, 1), - I_CART_ROTATE_LOCKED(14, 1), - - I_DONT_REPLACE(0, 2), - I_REPLACE_SOLID(1, 2), - I_REPLACE_ANY(2, 2), - I_REPLACE_EMPTY(3, 2), - I_CENTERED(4, 2), - I_ATTACHED(5, 2), - I_INSERTED(6, 2), - I_FILL(7, 2), - I_PLACE(8, 2), - I_REPLACE(9, 2), - I_CLEAR(10, 2), - I_OVERLAY(11, 2), - I_FLATTEN(12, 2), - - I_TOOL_DEPLOY(0, 3), - I_SKIP_TILES(2, 3), - I_SKIP_MISSING(1, 3), - - I_TOOL_MOVE_XZ(0, 4), - I_TOOL_MOVE_Y(1, 4), - I_TOOL_ROTATE(2, 4), - I_TOOL_MIRROR(3, 4), - - I_PLAY(0, 5), - I_PAUSE(1, 5), - I_STOP(2, 5), - - I_PATTERN_SOLID(0, 6), - I_PATTERN_CHECKERED(1, 6), - I_PATTERN_CHECKERED_INVERSED(2, 6), - I_PATTERN_CHANCE_25(3, 6), - - I_PATTERN_CHANCE_50(0, 7), - I_PATTERN_CHANCE_75(1, 7), - I_FOLLOW_DIAGONAL(2, 7), - I_FOLLOW_MATERIAL(3, 7), - ; public static final int FONT_COLOR = 0x575F7A; - public static final ResourceLocation ICON_ATLAS = Create.asResource("textures/gui/icons.png"); public final ResourceLocation location; public int width, height; public int startX, startY; - private ScreenResources(String location, int width, int height) { + private AllGuiTextures(String location, int width, int height) { this(location, 0, 0, width, height); } - private ScreenResources(int startX, int startY) { + private AllGuiTextures(int startX, int startY) { this("icons.png", startX * 16, startY * 16, 16, 16); } - private ScreenResources(String location, int startX, int startY, int width, int height) { + private AllGuiTextures(String location, int startX, int startY, int width, int height) { this.location = new ResourceLocation(Create.ID, "textures/gui/" + location); this.width = width; this.height = height; @@ -198,39 +121,4 @@ public enum ScreenResources { }, x, y); } - @OnlyIn(Dist.CLIENT) - public void draw(MatrixStack ms, IRenderTypeBuffer buffer, int color) { - IVertexBuilder builder = buffer.getBuffer(RenderType.getTextSeeThrough(this.location)); - float sheetSize = 256; - int i = 15 << 20 | 15 << 4; - int j = i >> 16 & '\uffff'; - int k = i & '\uffff'; - Entry peek = ms.peek(); - Vec3d rgb = ColorHelper.getRGB(color); - - Vec3d vec4 = new Vec3d(1, 1, 0); - Vec3d vec3 = new Vec3d(0, 1, 0); - Vec3d vec2 = new Vec3d(0, 0, 0); - Vec3d vec1 = new Vec3d(1, 0, 0); - - float u1 = (startX + width) / sheetSize; - float u2 = startX / sheetSize; - float v1 = startY / sheetSize; - float v2 = (startY + height) / sheetSize; - - vertex(peek, builder, j, k, rgb, vec1, u1, v1); - vertex(peek, builder, j, k, rgb, vec2, u2, v1); - vertex(peek, builder, j, k, rgb, vec3, u2, v2); - vertex(peek, builder, j, k, rgb, vec4, u1, v2); - } - - @OnlyIn(Dist.CLIENT) - private void vertex(Entry peek, IVertexBuilder builder, int j, int k, Vec3d rgb, Vec3d vec, float u, float v) { - builder.vertex(peek.getModel(), (float) vec.x, (float) vec.y, (float) vec.z) - .color((float) rgb.x, (float) rgb.y, (float) rgb.z, 1) - .texture(u, v) - .light(j, k) - .endVertex(); - } - } diff --git a/src/main/java/com/simibubi/create/foundation/gui/AllIcons.java b/src/main/java/com/simibubi/create/foundation/gui/AllIcons.java new file mode 100644 index 000000000..28dc9bea8 --- /dev/null +++ b/src/main/java/com/simibubi/create/foundation/gui/AllIcons.java @@ -0,0 +1,166 @@ +package com.simibubi.create.foundation.gui; + +import com.mojang.blaze3d.matrix.MatrixStack; +import com.mojang.blaze3d.matrix.MatrixStack.Entry; +import com.mojang.blaze3d.vertex.IVertexBuilder; +import com.simibubi.create.Create; +import com.simibubi.create.foundation.utility.ColorHelper; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.AbstractGui; +import net.minecraft.client.gui.screen.Screen; +import net.minecraft.client.renderer.IRenderTypeBuffer; +import net.minecraft.client.renderer.RenderType; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.Vec3d; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; + +public class AllIcons { + + public static final ResourceLocation ICON_ATLAS = Create.asResource("textures/gui/icons.png"); + private static int x = 0, y = -1; + private int iconX; + private int iconY; + + public static final AllIcons + I_ADD = newRow(), + I_TRASH = next(), + I_3x3 = next(), + I_TARGET = next(), + I_PRIORITY_VERY_LOW = next(), + I_PRIORITY_LOW = next(), + I_PRIORITY_HIGH = next(), + I_PRIORITY_VERY_HIGH = next(), + I_BLACKLIST = next(), + I_WHITELIST = next(), + I_WHITELIST_OR = next(), + I_WHITELIST_AND = next(), + I_WHITELIST_NOT = next(), + I_RESPECT_NBT = next(), + I_IGNORE_NBT = next(); + + public static final AllIcons + I_CONFIRM = newRow(), + I_NONE = next(), + I_OPEN_FOLDER = next(), + I_REFRESH = next(), + I_ACTIVE = next(), + I_PASSIVE = next(), + I_ROTATE_PLACE = next(), + I_ROTATE_PLACE_RETURNED = next(), + I_ROTATE_NEVER_PLACE = next(), + I_MOVE_PLACE = next(), + I_MOVE_PLACE_RETURNED = next(), + I_MOVE_NEVER_PLACE = next(), + I_CART_ROTATE = next(), + I_CART_ROTATE_PAUSED = next(), + I_CART_ROTATE_LOCKED = next(); + + public static final AllIcons + I_DONT_REPLACE = newRow(), + I_REPLACE_SOLID = next(), + I_REPLACE_ANY = next(), + I_REPLACE_EMPTY = next(), + I_CENTERED = next(), + I_ATTACHED = next(), + I_INSERTED = next(), + I_FILL = next(), + I_PLACE = next(), + I_REPLACE = next(), + I_CLEAR = next(), + I_OVERLAY = next(), + I_FLATTEN = next(); + + public static final AllIcons + I_TOOL_DEPLOY = newRow(), + I_SKIP_MISSING = next(), + I_SKIP_TILES = next(), + + I_TOOL_MOVE_XZ = newRow(), + I_TOOL_MOVE_Y = next(), + I_TOOL_ROTATE = next(), + I_TOOL_MIRROR = next(), + + I_PLAY = newRow(), + I_PAUSE = next(), + I_STOP = next(), + + I_PATTERN_SOLID = newRow(), + I_PATTERN_CHECKERED = next(), + I_PATTERN_CHECKERED_INVERSED = next(), + I_PATTERN_CHANCE_25 = next(), + + I_PATTERN_CHANCE_50 = newRow(), + I_PATTERN_CHANCE_75 = next(), + I_FOLLOW_DIAGONAL = next(), + I_FOLLOW_MATERIAL = next(); + + public AllIcons(int x, int y) { + iconX = x * 16; + iconY = y * 16; + } + + private static AllIcons next() { + return new AllIcons(++x, y); + } + + private static AllIcons newRow() { + return new AllIcons(x = 0, ++y); + } + + @OnlyIn(Dist.CLIENT) + public void bind() { + Minecraft.getInstance() + .getTextureManager() + .bindTexture(ICON_ATLAS); + } + + @OnlyIn(Dist.CLIENT) + public void draw(AbstractGui screen, int x, int y) { + bind(); + screen.blit(x, y, iconX, iconY, 16, 16); + } + + @OnlyIn(Dist.CLIENT) + public void draw(int x, int y) { + draw(new Screen(null) { + }, x, y); + } + + @OnlyIn(Dist.CLIENT) + public void draw(MatrixStack ms, IRenderTypeBuffer buffer, int color) { + IVertexBuilder builder = buffer.getBuffer(RenderType.getTextSeeThrough(ICON_ATLAS)); + float sheetSize = 256; + int i = 15 << 20 | 15 << 4; + int j = i >> 16 & '\uffff'; + int k = i & '\uffff'; + Entry peek = ms.peek(); + Vec3d rgb = ColorHelper.getRGB(color); + + Vec3d vec4 = new Vec3d(1, 1, 0); + Vec3d vec3 = new Vec3d(0, 1, 0); + Vec3d vec2 = new Vec3d(0, 0, 0); + Vec3d vec1 = new Vec3d(1, 0, 0); + + float u1 = (iconX + 16) / sheetSize; + float u2 = iconX / sheetSize; + float v1 = iconY / sheetSize; + float v2 = (iconY + 16) / sheetSize; + + vertex(peek, builder, j, k, rgb, vec1, u1, v1); + vertex(peek, builder, j, k, rgb, vec2, u2, v1); + vertex(peek, builder, j, k, rgb, vec3, u2, v2); + vertex(peek, builder, j, k, rgb, vec4, u1, v2); + } + + @OnlyIn(Dist.CLIENT) + private void vertex(Entry peek, IVertexBuilder builder, int j, int k, Vec3d rgb, Vec3d vec, float u, float v) { + builder.vertex(peek.getModel(), (float) vec.x, (float) vec.y, (float) vec.z) + .color((float) rgb.x, (float) rgb.y, (float) rgb.z, 1) + .texture(u, v) + .light(j, k) + .endVertex(); + } + +} diff --git a/src/main/java/com/simibubi/create/foundation/gui/GuiGameElement.java b/src/main/java/com/simibubi/create/foundation/gui/GuiGameElement.java index ac6ec1ee8..53b183cb5 100644 --- a/src/main/java/com/simibubi/create/foundation/gui/GuiGameElement.java +++ b/src/main/java/com/simibubi/create/foundation/gui/GuiGameElement.java @@ -12,7 +12,7 @@ import com.simibubi.create.foundation.utility.AngleHelper; import com.simibubi.create.foundation.utility.ColorHelper; import com.simibubi.create.foundation.utility.Iterate; import com.simibubi.create.foundation.utility.VecHelper; -import com.simibubi.create.foundation.utility.WrappedWorld; +import com.simibubi.create.foundation.utility.worldWrappers.WrappedWorld; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; diff --git a/src/main/java/com/simibubi/create/foundation/gui/TextInputPromptScreen.java b/src/main/java/com/simibubi/create/foundation/gui/TextInputPromptScreen.java index ea0e9d294..27a52be14 100644 --- a/src/main/java/com/simibubi/create/foundation/gui/TextInputPromptScreen.java +++ b/src/main/java/com/simibubi/create/foundation/gui/TextInputPromptScreen.java @@ -4,7 +4,6 @@ import java.util.function.Consumer; import org.lwjgl.glfw.GLFW; -import com.simibubi.create.ScreenResources; import com.simibubi.create.foundation.utility.Lang; import net.minecraft.client.gui.widget.TextFieldWidget; @@ -41,7 +40,7 @@ public class TextInputPromptScreen extends AbstractSimiScreen { @Override public void init() { super.init(); - setWindowSize(ScreenResources.TEXT_INPUT.width, ScreenResources.TEXT_INPUT.height + 30); + setWindowSize(AllGuiTextures.TEXT_INPUT.width, AllGuiTextures.TEXT_INPUT.height + 30); this.nameField = new TextFieldWidget(font, guiLeft + 33, guiTop + 26, 128, 8, ""); this.nameField.setTextColor(-1); @@ -67,9 +66,9 @@ public class TextInputPromptScreen extends AbstractSimiScreen { @Override public void renderWindow(int mouseX, int mouseY, float partialTicks) { - ScreenResources.TEXT_INPUT.draw(this, guiLeft, guiTop); + AllGuiTextures.TEXT_INPUT.draw(this, guiLeft, guiTop); font.drawString(title, guiLeft + (sWidth / 2) - (font.getStringWidth(title) / 2), guiTop + 11, - ScreenResources.FONT_COLOR); + AllGuiTextures.FONT_COLOR); } @Override diff --git a/src/main/java/com/simibubi/create/foundation/gui/ToolSelectionScreen.java b/src/main/java/com/simibubi/create/foundation/gui/ToolSelectionScreen.java index f75a51661..8ec08b02c 100644 --- a/src/main/java/com/simibubi/create/foundation/gui/ToolSelectionScreen.java +++ b/src/main/java/com/simibubi/create/foundation/gui/ToolSelectionScreen.java @@ -5,9 +5,8 @@ import java.util.function.Consumer; import com.mojang.blaze3d.systems.RenderSystem; import com.simibubi.create.AllKeys; -import com.simibubi.create.ScreenResources; +import com.simibubi.create.content.schematics.client.tools.Tools; import com.simibubi.create.foundation.utility.Lang; -import com.simibubi.create.modules.schematics.client.tools.Tools; import net.minecraft.client.MainWindow; import net.minecraft.client.Minecraft; @@ -64,7 +63,7 @@ public class ToolSelectionScreen extends Screen { RenderSystem.pushMatrix(); RenderSystem.translatef(0, -yOffset, focused ? 100 : 0); - ScreenResources gray = ScreenResources.GRAY; + AllGuiTextures gray = AllGuiTextures.GRAY; RenderSystem.enableBlend(); RenderSystem.color4f(1, 1, 1, focused ? 7 / 8f : 1 / 2f); diff --git a/src/main/java/com/simibubi/create/foundation/gui/widgets/IconButton.java b/src/main/java/com/simibubi/create/foundation/gui/widgets/IconButton.java index 83447c23f..499a6a7c2 100644 --- a/src/main/java/com/simibubi/create/foundation/gui/widgets/IconButton.java +++ b/src/main/java/com/simibubi/create/foundation/gui/widgets/IconButton.java @@ -1,57 +1,50 @@ package com.simibubi.create.foundation.gui.widgets; import com.mojang.blaze3d.systems.RenderSystem; -import com.simibubi.create.ScreenResources; +import com.simibubi.create.foundation.gui.AllGuiTextures; +import com.simibubi.create.foundation.gui.AllIcons; -import net.minecraft.client.Minecraft; -import net.minecraft.util.ResourceLocation; +public class IconButton extends AbstractSimiWidget { -public class IconButton extends AbstractSimiWidget { - - private ScreenResources icon; + private AllIcons icon; protected boolean pressed; - - public IconButton(int x, int y, ScreenResources icon) { + + public IconButton(int x, int y, AllIcons icon) { super(x, y, 18, 18); this.icon = icon; } - + @Override public void renderButton(int mouseX, int mouseY, float partialTicks) { if (this.visible) { - ResourceLocation buttonTextures = ScreenResources.BUTTON.location; - ResourceLocation iconTexture = icon.location; - this.isHovered = mouseX >= this.x && mouseY >= this.y && mouseX < this.x + this.width && mouseY < this.y + this.height; - - ScreenResources button = - (pressed || !active) ? button = ScreenResources.BUTTON_DOWN : - (isHovered) ? ScreenResources.BUTTON_HOVER : - ScreenResources.BUTTON; - + this.isHovered = + mouseX >= this.x && mouseY >= this.y && mouseX < this.x + this.width && mouseY < this.y + this.height; + + AllGuiTextures button = (pressed || !active) ? button = AllGuiTextures.BUTTON_DOWN + : (isHovered) ? AllGuiTextures.BUTTON_HOVER : AllGuiTextures.BUTTON; + RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F); - Minecraft.getInstance().getTextureManager().bindTexture(buttonTextures); + AllGuiTextures.BUTTON.bind(); blit(x, y, button.startX, button.startY, button.width, button.height); - Minecraft.getInstance().getTextureManager().bindTexture(iconTexture); - blit(x +1, y +1, icon.startX, icon.startY, icon.width, icon.height); + icon.draw(this, x + 1, y + 1); } } - @Override public void onClick(double p_onClick_1_, double p_onClick_3_) { super.onClick(p_onClick_1_, p_onClick_3_); this.pressed = true; } - + @Override public void onRelease(double p_onRelease_1_, double p_onRelease_3_) { super.onRelease(p_onRelease_1_, p_onRelease_3_); this.pressed = false; } - + public void setToolTip(String text) { toolTip.clear(); toolTip.add(text); } - + } diff --git a/src/main/java/com/simibubi/create/foundation/gui/widgets/Indicator.java b/src/main/java/com/simibubi/create/foundation/gui/widgets/Indicator.java index e1b41c2b3..0d03dc8c0 100644 --- a/src/main/java/com/simibubi/create/foundation/gui/widgets/Indicator.java +++ b/src/main/java/com/simibubi/create/foundation/gui/widgets/Indicator.java @@ -1,7 +1,7 @@ package com.simibubi.create.foundation.gui.widgets; import com.google.common.collect.ImmutableList; -import com.simibubi.create.ScreenResources; +import com.simibubi.create.foundation.gui.AllGuiTextures; public class Indicator extends AbstractSimiWidget { @@ -13,21 +13,21 @@ public class Indicator extends AbstractSimiWidget { public State state; public Indicator(int x, int y, String tooltip) { - super(x, y, ScreenResources.INDICATOR.width, ScreenResources.INDICATOR.height); + super(x, y, AllGuiTextures.INDICATOR.width, AllGuiTextures.INDICATOR.height); this.toolTip = ImmutableList.of(tooltip); this.state = State.OFF; } @Override public void render(int mouseX, int mouseY, float partialTicks ) { - ScreenResources toDraw; + AllGuiTextures toDraw; switch(state) { - case ON: toDraw = ScreenResources.INDICATOR_WHITE; break; - case OFF: toDraw = ScreenResources.INDICATOR; break; - case RED: toDraw = ScreenResources.INDICATOR_RED; break; - case YELLOW: toDraw = ScreenResources.INDICATOR_YELLOW; break; - case GREEN: toDraw = ScreenResources.INDICATOR_GREEN; break; - default: toDraw = ScreenResources.INDICATOR; break; + case ON: toDraw = AllGuiTextures.INDICATOR_WHITE; break; + case OFF: toDraw = AllGuiTextures.INDICATOR; break; + case RED: toDraw = AllGuiTextures.INDICATOR_RED; break; + case YELLOW: toDraw = AllGuiTextures.INDICATOR_YELLOW; break; + case GREEN: toDraw = AllGuiTextures.INDICATOR_GREEN; break; + default: toDraw = AllGuiTextures.INDICATOR; break; } toDraw.draw(this, x, y); } diff --git a/src/main/java/com/simibubi/create/foundation/gui/widgets/ScrollInput.java b/src/main/java/com/simibubi/create/foundation/gui/widgets/ScrollInput.java index c57a3ba95..415fae287 100644 --- a/src/main/java/com/simibubi/create/foundation/gui/widgets/ScrollInput.java +++ b/src/main/java/com/simibubi/create/foundation/gui/widgets/ScrollInput.java @@ -4,7 +4,7 @@ import java.util.function.Consumer; import java.util.function.Function; import com.simibubi.create.AllKeys; -import com.simibubi.create.foundation.behaviour.scrollvalue.ScrollValueBehaviour.StepContext; +import com.simibubi.create.foundation.tileEntity.behaviour.scrollvalue.ScrollValueBehaviour.StepContext; import com.simibubi.create.foundation.utility.Lang; import net.minecraft.util.text.TextFormatting; diff --git a/src/main/java/com/simibubi/create/foundation/item/AbstractToolItem.java b/src/main/java/com/simibubi/create/foundation/item/AbstractToolItem.java deleted file mode 100644 index d55ef0cb4..000000000 --- a/src/main/java/com/simibubi/create/foundation/item/AbstractToolItem.java +++ /dev/null @@ -1,233 +0,0 @@ -package com.simibubi.create.foundation.item; - -import static com.simibubi.create.foundation.item.AllToolTypes.AXE; -import static com.simibubi.create.foundation.item.AllToolTypes.HOE; -import static com.simibubi.create.foundation.item.AllToolTypes.PICKAXE; -import static com.simibubi.create.foundation.item.AllToolTypes.SHOVEL; -import static com.simibubi.create.foundation.item.AllToolTypes.SWORD; - -import java.util.Collection; -import java.util.HashSet; -import java.util.Set; -import java.util.function.Supplier; - -import com.simibubi.create.foundation.packet.SimplePacketBase; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.block.Blocks; -import net.minecraft.block.material.Material; -import net.minecraft.client.Minecraft; -import net.minecraft.client.world.ClientWorld; -import net.minecraft.enchantment.Enchantment; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.IItemTier; -import net.minecraft.item.ItemStack; -import net.minecraft.item.ItemUseContext; -import net.minecraft.item.Items; -import net.minecraft.item.ToolItem; -import net.minecraft.nbt.NBTUtil; -import net.minecraft.network.PacketBuffer; -import net.minecraft.tags.BlockTags; -import net.minecraft.util.ActionResultType; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IWorld; -import net.minecraft.world.World; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -import net.minecraftforge.common.ToolType; -import net.minecraftforge.fml.DistExecutor; -import net.minecraftforge.fml.network.NetworkEvent.Context; - -public abstract class AbstractToolItem extends ToolItem { - - protected AllToolTypes[] toolTypes; - - public AbstractToolItem(float attackDamageIn, float attackSpeedIn, IItemTier tier, Properties builder, - AllToolTypes... types) { - super(attackDamageIn, attackSpeedIn, tier, getEffectiveBlocks(types), setToolTypes(builder, tier, types)); - toolTypes = types; - } - - @Override - public boolean canApplyAtEnchantingTable(ItemStack stack, Enchantment enchantment) { - boolean canEnchant = super.canApplyAtEnchantingTable(stack, enchantment); - for (AllToolTypes type : toolTypes) { - switch (type) { - case AXE: - canEnchant |= enchantment.canApply(new ItemStack(Items.DIAMOND_AXE)); - break; - case HOE: - canEnchant |= enchantment.canApply(new ItemStack(Items.DIAMOND_HOE)); - break; - case PICKAXE: - canEnchant |= enchantment.canApply(new ItemStack(Items.DIAMOND_PICKAXE)); - break; - case SHEARS: - canEnchant |= enchantment.canApply(new ItemStack(Items.SHEARS)); - break; - case SHOVEL: - canEnchant |= enchantment.canApply(new ItemStack(Items.DIAMOND_SHOVEL)); - break; - case SWORD: - canEnchant |= enchantment.canApply(new ItemStack(Items.DIAMOND_SWORD)); - break; - default: - break; - } - } - - return canEnchant; - } - - private static Set getEffectiveBlocks(AllToolTypes... types) { - Set blocks = new HashSet<>(); - for (AllToolTypes type : types) { - switch (type) { - case AXE: - blocks.addAll(EffectiveBlocks.AXE); - break; - case HOE: - break; - case PICKAXE: - blocks.addAll(EffectiveBlocks.PICKAXE); - break; - case SHEARS: - break; - case SHOVEL: - blocks.addAll(EffectiveBlocks.SHOVEL); - break; - case SWORD: - break; - default: - break; - } - } - return blocks; - } - - private static Properties setToolTypes(Properties builder, IItemTier tier, AllToolTypes... types) { - for (AllToolTypes type : types) { - if (type == PICKAXE) - builder.addToolType(ToolType.PICKAXE, tier.getHarvestLevel()); - if (type == SHOVEL) - builder.addToolType(ToolType.SHOVEL, tier.getHarvestLevel()); - if (type == AXE) - builder.addToolType(ToolType.AXE, tier.getHarvestLevel()); - } - return builder; - } - - protected boolean hasType(AllToolTypes typeIn) { - for (AllToolTypes type : toolTypes) - if (type == typeIn) - return true; - return false; - } - - @Override - public ActionResultType onItemUse(ItemUseContext context) { - if (hasType(HOE) && !context.getPlayer().isSneaking()) - return Items.WOODEN_HOE.onItemUse(context); - if (hasType(SHOVEL)) - return Items.WOODEN_SHOVEL.onItemUse(context); - return super.onItemUse(context); - } - - @Override - public boolean canHarvestBlock(ItemStack stack, BlockState state) { - int i = this.getTier().getHarvestLevel(); - if (getToolTypes(stack).contains(state.getHarvestTool())) - return i >= state.getHarvestLevel(); - Material material = state.getMaterial(); - boolean canHarvestMaterial = false; - if (hasType(PICKAXE)) - canHarvestMaterial |= material == Material.ROCK || material == Material.IRON || material == Material.ANVIL; - if (hasType(SHOVEL)) - canHarvestMaterial |= Items.WOODEN_SHOVEL.canHarvestBlock(stack, state); - if (hasType(SWORD)) - canHarvestMaterial |= Items.WOODEN_SWORD.canHarvestBlock(stack, state); - if (hasType(AllToolTypes.SHEARS)) - canHarvestMaterial |= Items.SHEARS.canHarvestBlock(state); - - return canHarvestMaterial; - } - - @Override - public boolean canPlayerBreakBlockWhileHolding(BlockState state, World worldIn, BlockPos pos, PlayerEntity player) { - return !hasType(SWORD) || !player.isCreative(); - } - - @Override - public float getDestroySpeed(ItemStack stack, BlockState state) { - Material material = state.getMaterial(); - if (hasType(PICKAXE) && (material == Material.IRON || material == Material.ANVIL || material == Material.ROCK)) - return this.efficiency; - if (hasType(AXE) && (material == Material.WOOD || material == Material.PLANTS - || material == Material.TALL_PLANTS || material == Material.BAMBOO)) - return this.efficiency; - if (hasType(SWORD) - && (state.getBlock() == Blocks.COBWEB || material == Material.PLANTS || material == Material.TALL_PLANTS - || material == Material.CORAL || state.isIn(BlockTags.LEAVES) || material == Material.GOURD)) - return this.efficiency; - return super.getDestroySpeed(stack, state); - } - - public boolean modifiesDrops() { - return false; - } - - public void modifyDrops(final Collection drops, IWorld world, BlockPos pos, ItemStack tool, - BlockState state) { - } - - public void spawnParticles(IWorld world, BlockPos pos, ItemStack tool, BlockState state) { - } - - public static class HarvestPacket extends SimplePacketBase { - - private BlockState state; - private ItemStack stack; - private BlockPos pos; - private boolean self; - - public HarvestPacket(BlockState state, ItemStack stack, BlockPos pos, boolean self) { - this.state = state; - this.stack = stack; - this.pos = pos; - this.self = self; - } - - public HarvestPacket(PacketBuffer buffer) { - state = NBTUtil.readBlockState(buffer.readCompoundTag()); - stack = buffer.readItemStack(); - pos = buffer.readBlockPos(); - self = buffer.readBoolean(); - } - - @Override - public void write(PacketBuffer buffer) { - buffer.writeCompoundTag(NBTUtil.writeBlockState(state)); - buffer.writeItemStack(stack); - buffer.writeBlockPos(pos); - buffer.writeBoolean(self); - } - - @Override - public void handle(Supplier context) { - context.get().enqueueWork(() -> DistExecutor.runWhenOn(Dist.CLIENT, () -> () -> this.spawnParticles(self))); - context.get().setPacketHandled(true); - } - - @OnlyIn(Dist.CLIENT) - void spawnParticles(boolean self) { - if (!(stack.getItem() instanceof AbstractToolItem)) - return; - ClientWorld world = Minecraft.getInstance().world; - if (!self) - world.playEvent(2001, pos, Block.getStateId(state)); - ((AbstractToolItem) stack.getItem()).spawnParticles(world, pos, stack, state); - } - } - -} diff --git a/src/main/java/com/simibubi/create/foundation/item/AllToolTypes.java b/src/main/java/com/simibubi/create/foundation/item/AllToolTypes.java deleted file mode 100644 index b5d1c83b3..000000000 --- a/src/main/java/com/simibubi/create/foundation/item/AllToolTypes.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.simibubi.create.foundation.item; - -public enum AllToolTypes { - - SWORD, SHOVEL, PICKAXE, AXE, HOE, SHEARS - -} diff --git a/src/main/java/com/simibubi/create/CreateItemGroupBase.java b/src/main/java/com/simibubi/create/foundation/item/CreateItemGroupBase.java similarity index 88% rename from src/main/java/com/simibubi/create/CreateItemGroupBase.java rename to src/main/java/com/simibubi/create/foundation/item/CreateItemGroupBase.java index 6b8f01a0d..b3262b7eb 100644 --- a/src/main/java/com/simibubi/create/CreateItemGroupBase.java +++ b/src/main/java/com/simibubi/create/foundation/item/CreateItemGroupBase.java @@ -1,10 +1,12 @@ -package com.simibubi.create; +package com.simibubi.create.foundation.item; import java.util.Collection; import java.util.EnumSet; import java.util.stream.Collectors; -import com.simibubi.create.modules.Sections; +import com.simibubi.create.AllItems; +import com.simibubi.create.Create; +import com.simibubi.create.content.AllSections; import com.tterrag.registrate.util.entry.RegistryEntry; import net.minecraft.block.Block; @@ -51,8 +53,8 @@ public abstract class CreateItemGroupBase extends ItemGroup { .collect(Collectors.toList()); } - protected EnumSet getSections() { - return EnumSet.allOf(Sections.class); + protected EnumSet getSections() { + return EnumSet.allOf(AllSections.class); } @OnlyIn(Dist.CLIENT) diff --git a/src/main/java/com/simibubi/create/foundation/item/EffectiveBlocks.java b/src/main/java/com/simibubi/create/foundation/item/EffectiveBlocks.java deleted file mode 100644 index b3d7779cb..000000000 --- a/src/main/java/com/simibubi/create/foundation/item/EffectiveBlocks.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.simibubi.create.foundation.item; - -import java.util.Map; -import java.util.Set; - -import com.google.common.collect.ImmutableMap.Builder; -import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Sets; - -import net.minecraft.block.Block; -import net.minecraft.block.Blocks; - -public class EffectiveBlocks { - - static final Set AXE = Sets.newHashSet(Blocks.OAK_PLANKS, Blocks.SPRUCE_PLANKS, Blocks.BIRCH_PLANKS, - Blocks.JUNGLE_PLANKS, Blocks.ACACIA_PLANKS, Blocks.DARK_OAK_PLANKS, Blocks.BOOKSHELF, Blocks.OAK_WOOD, - Blocks.SPRUCE_WOOD, Blocks.BIRCH_WOOD, Blocks.JUNGLE_WOOD, Blocks.ACACIA_WOOD, Blocks.DARK_OAK_WOOD, - Blocks.OAK_LOG, Blocks.SPRUCE_LOG, Blocks.BIRCH_LOG, Blocks.JUNGLE_LOG, Blocks.ACACIA_LOG, - Blocks.DARK_OAK_LOG, Blocks.CHEST, Blocks.PUMPKIN, Blocks.CARVED_PUMPKIN, Blocks.JACK_O_LANTERN, - Blocks.MELON, Blocks.LADDER, Blocks.SCAFFOLDING, Blocks.OAK_BUTTON, Blocks.SPRUCE_BUTTON, - Blocks.BIRCH_BUTTON, Blocks.JUNGLE_BUTTON, Blocks.DARK_OAK_BUTTON, Blocks.ACACIA_BUTTON, - Blocks.OAK_PRESSURE_PLATE, Blocks.SPRUCE_PRESSURE_PLATE, Blocks.BIRCH_PRESSURE_PLATE, - Blocks.JUNGLE_PRESSURE_PLATE, Blocks.DARK_OAK_PRESSURE_PLATE, Blocks.ACACIA_PRESSURE_PLATE); - - static final Set PICKAXE = ImmutableSet.of(Blocks.ACTIVATOR_RAIL, Blocks.COAL_ORE, Blocks.COBBLESTONE, - Blocks.DETECTOR_RAIL, Blocks.DIAMOND_BLOCK, Blocks.DIAMOND_ORE, Blocks.POWERED_RAIL, Blocks.GOLD_BLOCK, - Blocks.GOLD_ORE, Blocks.ICE, Blocks.IRON_BLOCK, Blocks.IRON_ORE, Blocks.LAPIS_BLOCK, Blocks.LAPIS_ORE, - Blocks.MOSSY_COBBLESTONE, Blocks.NETHERRACK, Blocks.PACKED_ICE, Blocks.BLUE_ICE, Blocks.RAIL, - Blocks.REDSTONE_ORE, Blocks.SANDSTONE, Blocks.CHISELED_SANDSTONE, Blocks.CUT_SANDSTONE, - Blocks.CHISELED_RED_SANDSTONE, Blocks.CUT_RED_SANDSTONE, Blocks.RED_SANDSTONE, Blocks.STONE, Blocks.GRANITE, - Blocks.POLISHED_GRANITE, Blocks.DIORITE, Blocks.POLISHED_DIORITE, Blocks.ANDESITE, Blocks.POLISHED_ANDESITE, - Blocks.STONE_SLAB, Blocks.SMOOTH_STONE_SLAB, Blocks.SANDSTONE_SLAB, Blocks.PETRIFIED_OAK_SLAB, - Blocks.COBBLESTONE_SLAB, Blocks.BRICK_SLAB, Blocks.STONE_BRICK_SLAB, Blocks.NETHER_BRICK_SLAB, - Blocks.QUARTZ_SLAB, Blocks.RED_SANDSTONE_SLAB, Blocks.PURPUR_SLAB, Blocks.SMOOTH_QUARTZ, - Blocks.SMOOTH_RED_SANDSTONE, Blocks.SMOOTH_SANDSTONE, Blocks.SMOOTH_STONE, Blocks.STONE_BUTTON, - Blocks.STONE_PRESSURE_PLATE, Blocks.POLISHED_GRANITE_SLAB, Blocks.SMOOTH_RED_SANDSTONE_SLAB, - Blocks.MOSSY_STONE_BRICK_SLAB, Blocks.POLISHED_DIORITE_SLAB, Blocks.MOSSY_COBBLESTONE_SLAB, - Blocks.END_STONE_BRICK_SLAB, Blocks.SMOOTH_SANDSTONE_SLAB, Blocks.SMOOTH_QUARTZ_SLAB, Blocks.GRANITE_SLAB, - Blocks.ANDESITE_SLAB, Blocks.RED_NETHER_BRICK_SLAB, Blocks.POLISHED_ANDESITE_SLAB, Blocks.DIORITE_SLAB, - Blocks.SHULKER_BOX, Blocks.BLACK_SHULKER_BOX, Blocks.BLUE_SHULKER_BOX, Blocks.BROWN_SHULKER_BOX, - Blocks.CYAN_SHULKER_BOX, Blocks.GRAY_SHULKER_BOX, Blocks.GREEN_SHULKER_BOX, Blocks.LIGHT_BLUE_SHULKER_BOX, - Blocks.LIGHT_GRAY_SHULKER_BOX, Blocks.LIME_SHULKER_BOX, Blocks.MAGENTA_SHULKER_BOX, - Blocks.ORANGE_SHULKER_BOX, Blocks.PINK_SHULKER_BOX, Blocks.PURPLE_SHULKER_BOX, Blocks.RED_SHULKER_BOX, - Blocks.WHITE_SHULKER_BOX, Blocks.YELLOW_SHULKER_BOX); - - static final Set SHOVEL = Sets.newHashSet(Blocks.CLAY, Blocks.DIRT, Blocks.COARSE_DIRT, Blocks.PODZOL, - Blocks.FARMLAND, Blocks.GRASS_BLOCK, Blocks.GRAVEL, Blocks.MYCELIUM, Blocks.SAND, Blocks.RED_SAND, - Blocks.SNOW_BLOCK, Blocks.SNOW, Blocks.SOUL_SAND, Blocks.GRASS_PATH, Blocks.WHITE_CONCRETE_POWDER, - Blocks.ORANGE_CONCRETE_POWDER, Blocks.MAGENTA_CONCRETE_POWDER, Blocks.LIGHT_BLUE_CONCRETE_POWDER, - Blocks.YELLOW_CONCRETE_POWDER, Blocks.LIME_CONCRETE_POWDER, Blocks.PINK_CONCRETE_POWDER, - Blocks.GRAY_CONCRETE_POWDER, Blocks.LIGHT_GRAY_CONCRETE_POWDER, Blocks.CYAN_CONCRETE_POWDER, - Blocks.PURPLE_CONCRETE_POWDER, Blocks.BLUE_CONCRETE_POWDER, Blocks.BROWN_CONCRETE_POWDER, - Blocks.GREEN_CONCRETE_POWDER, Blocks.RED_CONCRETE_POWDER, Blocks.BLACK_CONCRETE_POWDER); - - static final Set PATHABLES = - Sets.newHashSet(Blocks.GRASS_BLOCK, Blocks.DIRT, Blocks.COARSE_DIRT, Blocks.PODZOL); - - static final Map BLOCK_STRIPPING_MAP = (new Builder()) - .put(Blocks.OAK_WOOD, Blocks.STRIPPED_OAK_WOOD).put(Blocks.OAK_LOG, Blocks.STRIPPED_OAK_LOG) - .put(Blocks.DARK_OAK_WOOD, Blocks.STRIPPED_DARK_OAK_WOOD) - .put(Blocks.DARK_OAK_LOG, Blocks.STRIPPED_DARK_OAK_LOG).put(Blocks.ACACIA_WOOD, Blocks.STRIPPED_ACACIA_WOOD) - .put(Blocks.ACACIA_LOG, Blocks.STRIPPED_ACACIA_LOG).put(Blocks.BIRCH_WOOD, Blocks.STRIPPED_BIRCH_WOOD) - .put(Blocks.BIRCH_LOG, Blocks.STRIPPED_BIRCH_LOG).put(Blocks.JUNGLE_WOOD, Blocks.STRIPPED_JUNGLE_WOOD) - .put(Blocks.JUNGLE_LOG, Blocks.STRIPPED_JUNGLE_LOG).put(Blocks.SPRUCE_WOOD, Blocks.STRIPPED_SPRUCE_WOOD) - .put(Blocks.SPRUCE_LOG, Blocks.STRIPPED_SPRUCE_LOG).build(); - -} diff --git a/src/main/java/com/simibubi/create/foundation/item/ItemDescription.java b/src/main/java/com/simibubi/create/foundation/item/ItemDescription.java index ebd4ef93d..2aada3123 100644 --- a/src/main/java/com/simibubi/create/foundation/item/ItemDescription.java +++ b/src/main/java/com/simibubi/create/foundation/item/ItemDescription.java @@ -22,16 +22,16 @@ import java.util.List; import java.util.Map; import com.simibubi.create.AllItems; -import com.simibubi.create.config.AllConfigs; -import com.simibubi.create.config.CKinetics; +import com.simibubi.create.content.contraptions.base.IRotate; +import com.simibubi.create.content.contraptions.base.IRotate.SpeedLevel; +import com.simibubi.create.content.contraptions.base.IRotate.StressImpact; +import com.simibubi.create.content.contraptions.components.fan.EncasedFanBlock; +import com.simibubi.create.content.contraptions.components.flywheel.engine.EngineBlock; +import com.simibubi.create.content.contraptions.components.flywheel.engine.FurnaceEngineBlock; +import com.simibubi.create.content.contraptions.components.waterwheel.WaterWheelBlock; +import com.simibubi.create.foundation.config.AllConfigs; +import com.simibubi.create.foundation.config.CKinetics; import com.simibubi.create.foundation.utility.Lang; -import com.simibubi.create.modules.contraptions.base.IRotate; -import com.simibubi.create.modules.contraptions.base.IRotate.SpeedLevel; -import com.simibubi.create.modules.contraptions.base.IRotate.StressImpact; -import com.simibubi.create.modules.contraptions.components.fan.EncasedFanBlock; -import com.simibubi.create.modules.contraptions.components.flywheel.engine.EngineBlock; -import com.simibubi.create.modules.contraptions.components.flywheel.engine.FurnaceEngineBlock; -import com.simibubi.create.modules.contraptions.components.waterwheel.WaterWheelBlock; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; diff --git a/src/main/java/com/simibubi/create/foundation/item/ItemHelper.java b/src/main/java/com/simibubi/create/foundation/item/ItemHelper.java index 92f049790..59bcbacc4 100644 --- a/src/main/java/com/simibubi/create/foundation/item/ItemHelper.java +++ b/src/main/java/com/simibubi/create/foundation/item/ItemHelper.java @@ -10,7 +10,7 @@ import javax.annotation.Nullable; import org.apache.commons.lang3.mutable.MutableInt; import org.apache.commons.lang3.tuple.Pair; -import com.simibubi.create.config.AllConfigs; +import com.simibubi.create.foundation.config.AllConfigs; import net.minecraft.inventory.InventoryHelper; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/simibubi/create/foundation/item/TooltipHelper.java b/src/main/java/com/simibubi/create/foundation/item/TooltipHelper.java index a31a3d20d..d010625df 100644 --- a/src/main/java/com/simibubi/create/foundation/item/TooltipHelper.java +++ b/src/main/java/com/simibubi/create/foundation/item/TooltipHelper.java @@ -9,13 +9,13 @@ import java.util.Map; import com.mojang.bridge.game.Language; import com.simibubi.create.AllItems; +import com.simibubi.create.content.AllSections; +import com.simibubi.create.content.contraptions.base.IRotate; +import com.simibubi.create.content.contraptions.components.flywheel.engine.EngineBlock; +import com.simibubi.create.content.curiosities.tools.AllToolTiers; +import com.simibubi.create.content.curiosities.tools.SandPaperItem; import com.simibubi.create.foundation.item.ItemDescription.Palette; import com.simibubi.create.foundation.utility.Lang; -import com.simibubi.create.modules.Sections; -import com.simibubi.create.modules.contraptions.base.IRotate; -import com.simibubi.create.modules.contraptions.components.flywheel.engine.EngineBlock; -import com.simibubi.create.modules.curiosities.tools.AllToolTiers; -import com.simibubi.create.modules.curiosities.tools.SandPaperItem; import net.minecraft.client.Minecraft; import net.minecraft.client.entity.player.ClientPlayerEntity; @@ -130,7 +130,7 @@ public class TooltipHelper { } private static ItemDescription buildToolTip(String translationKey, ItemStack stack) { - Sections module = Sections.of(stack); + AllSections module = AllSections.of(stack); if (I18n.format(translationKey).equals("WIP")) return new WipScription(module.getTooltipPalette()); diff --git a/src/main/java/com/simibubi/create/AllPackets.java b/src/main/java/com/simibubi/create/foundation/networking/AllPackets.java similarity index 71% rename from src/main/java/com/simibubi/create/AllPackets.java rename to src/main/java/com/simibubi/create/foundation/networking/AllPackets.java index 45c5adb12..e9612a943 100644 --- a/src/main/java/com/simibubi/create/AllPackets.java +++ b/src/main/java/com/simibubi/create/foundation/networking/AllPackets.java @@ -1,28 +1,26 @@ -package com.simibubi.create; +package com.simibubi.create.foundation.networking; import java.util.function.BiConsumer; import java.util.function.Function; import java.util.function.Supplier; -import com.simibubi.create.foundation.behaviour.filtering.FilteringCountUpdatePacket; -import com.simibubi.create.foundation.behaviour.scrollvalue.ScrollValueUpdatePacket; +import com.simibubi.create.Create; +import com.simibubi.create.content.contraptions.components.structureMovement.CancelPlayerFallPacket; +import com.simibubi.create.content.contraptions.components.structureMovement.ContraptionStallPacket; +import com.simibubi.create.content.contraptions.components.structureMovement.glue.GlueEffectPacket; +import com.simibubi.create.content.contraptions.relays.advanced.sequencer.ConfigureSequencedGearshiftPacket; +import com.simibubi.create.content.curiosities.symmetry.SymmetryEffectPacket; +import com.simibubi.create.content.curiosities.zapper.ZapperBeamPacket; +import com.simibubi.create.content.logistics.item.filter.FilterScreenPacket; +import com.simibubi.create.content.logistics.packet.ConfigureFlexcratePacket; +import com.simibubi.create.content.logistics.packet.ConfigureStockswitchPacket; +import com.simibubi.create.content.schematics.packet.ConfigureSchematicannonPacket; +import com.simibubi.create.content.schematics.packet.SchematicPlacePacket; +import com.simibubi.create.content.schematics.packet.SchematicUploadPacket; import com.simibubi.create.foundation.command.ConfigureConfigPacket; -import com.simibubi.create.foundation.item.AbstractToolItem; -import com.simibubi.create.foundation.packet.NbtPacket; -import com.simibubi.create.foundation.packet.SimplePacketBase; +import com.simibubi.create.foundation.tileEntity.behaviour.filtering.FilteringCountUpdatePacket; +import com.simibubi.create.foundation.tileEntity.behaviour.scrollvalue.ScrollValueUpdatePacket; import com.simibubi.create.foundation.utility.ServerSpeedProvider; -import com.simibubi.create.modules.contraptions.components.contraptions.CancelPlayerFallPacket; -import com.simibubi.create.modules.contraptions.components.contraptions.ContraptionStallPacket; -import com.simibubi.create.modules.contraptions.components.contraptions.glue.GlueEffectPacket; -import com.simibubi.create.modules.contraptions.relays.advanced.sequencer.ConfigureSequencedGearshiftPacket; -import com.simibubi.create.modules.curiosities.symmetry.SymmetryEffectPacket; -import com.simibubi.create.modules.curiosities.zapper.ZapperBeamPacket; -import com.simibubi.create.modules.logistics.item.filter.FilterScreenPacket; -import com.simibubi.create.modules.logistics.packet.ConfigureFlexcratePacket; -import com.simibubi.create.modules.logistics.packet.ConfigureStockswitchPacket; -import com.simibubi.create.modules.schematics.packet.ConfigureSchematicannonPacket; -import com.simibubi.create.modules.schematics.packet.SchematicPlacePacket; -import com.simibubi.create.modules.schematics.packet.SchematicUploadPacket; import net.minecraft.network.PacketBuffer; import net.minecraft.util.ResourceLocation; @@ -51,7 +49,6 @@ public enum AllPackets { BEAM_EFFECT(ZapperBeamPacket.class, ZapperBeamPacket::new), CONFIGURE_CONFIG(ConfigureConfigPacket.class, ConfigureConfigPacket::new), CONTRAPTION_STALL(ContraptionStallPacket.class, ContraptionStallPacket::new), - TOOL_HARVEST(AbstractToolItem.HarvestPacket.class, AbstractToolItem.HarvestPacket::new), GLUE_EFFECT(GlueEffectPacket.class, GlueEffectPacket::new), ; diff --git a/src/main/java/com/simibubi/create/foundation/packet/NbtPacket.java b/src/main/java/com/simibubi/create/foundation/networking/NbtPacket.java similarity index 96% rename from src/main/java/com/simibubi/create/foundation/packet/NbtPacket.java rename to src/main/java/com/simibubi/create/foundation/networking/NbtPacket.java index 490326f10..e03a3fa5c 100644 --- a/src/main/java/com/simibubi/create/foundation/packet/NbtPacket.java +++ b/src/main/java/com/simibubi/create/foundation/networking/NbtPacket.java @@ -1,4 +1,4 @@ -package com.simibubi.create.foundation.packet; +package com.simibubi.create.foundation.networking; import java.util.function.Supplier; diff --git a/src/main/java/com/simibubi/create/foundation/packet/SimplePacketBase.java b/src/main/java/com/simibubi/create/foundation/networking/SimplePacketBase.java similarity index 85% rename from src/main/java/com/simibubi/create/foundation/packet/SimplePacketBase.java rename to src/main/java/com/simibubi/create/foundation/networking/SimplePacketBase.java index 03d6cc064..293bc8dd0 100644 --- a/src/main/java/com/simibubi/create/foundation/packet/SimplePacketBase.java +++ b/src/main/java/com/simibubi/create/foundation/networking/SimplePacketBase.java @@ -1,4 +1,4 @@ -package com.simibubi.create.foundation.packet; +package com.simibubi.create.foundation.networking; import java.util.function.Supplier; diff --git a/src/main/java/com/simibubi/create/foundation/packet/TileEntityConfigurationPacket.java b/src/main/java/com/simibubi/create/foundation/networking/TileEntityConfigurationPacket.java similarity index 92% rename from src/main/java/com/simibubi/create/foundation/packet/TileEntityConfigurationPacket.java rename to src/main/java/com/simibubi/create/foundation/networking/TileEntityConfigurationPacket.java index 7acd40bb5..0d8da4d47 100644 --- a/src/main/java/com/simibubi/create/foundation/packet/TileEntityConfigurationPacket.java +++ b/src/main/java/com/simibubi/create/foundation/networking/TileEntityConfigurationPacket.java @@ -1,8 +1,8 @@ -package com.simibubi.create.foundation.packet; +package com.simibubi.create.foundation.networking; import java.util.function.Supplier; -import com.simibubi.create.foundation.block.SyncedTileEntity; +import com.simibubi.create.foundation.tileEntity.SyncedTileEntity; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.network.PacketBuffer; diff --git a/src/main/java/com/simibubi/create/foundation/behaviour/base/PosBoundSmartTileEntity.java b/src/main/java/com/simibubi/create/foundation/tileEntity/PosBoundSmartTileEntity.java similarity index 96% rename from src/main/java/com/simibubi/create/foundation/behaviour/base/PosBoundSmartTileEntity.java rename to src/main/java/com/simibubi/create/foundation/tileEntity/PosBoundSmartTileEntity.java index 4bd838015..2a3da1db6 100644 --- a/src/main/java/com/simibubi/create/foundation/behaviour/base/PosBoundSmartTileEntity.java +++ b/src/main/java/com/simibubi/create/foundation/tileEntity/PosBoundSmartTileEntity.java @@ -1,4 +1,4 @@ -package com.simibubi.create.foundation.behaviour.base; +package com.simibubi.create.foundation.tileEntity; import net.minecraft.nbt.CompoundNBT; import net.minecraft.tileentity.TileEntityType; diff --git a/src/main/java/com/simibubi/create/foundation/behaviour/base/SmartTileEntity.java b/src/main/java/com/simibubi/create/foundation/tileEntity/SmartTileEntity.java similarity index 96% rename from src/main/java/com/simibubi/create/foundation/behaviour/base/SmartTileEntity.java rename to src/main/java/com/simibubi/create/foundation/tileEntity/SmartTileEntity.java index 5ce414b0e..af552df79 100644 --- a/src/main/java/com/simibubi/create/foundation/behaviour/base/SmartTileEntity.java +++ b/src/main/java/com/simibubi/create/foundation/tileEntity/SmartTileEntity.java @@ -1,4 +1,4 @@ -package com.simibubi.create.foundation.behaviour.base; +package com.simibubi.create.foundation.tileEntity; import java.util.ArrayList; import java.util.HashMap; @@ -6,7 +6,7 @@ import java.util.List; import java.util.Map; import java.util.function.Consumer; -import com.simibubi.create.foundation.block.SyncedTileEntity; +import com.simibubi.create.foundation.tileEntity.behaviour.IBehaviourType; import net.minecraft.nbt.CompoundNBT; import net.minecraft.tileentity.ITickableTileEntity; diff --git a/src/main/java/com/simibubi/create/foundation/block/SyncedTileEntity.java b/src/main/java/com/simibubi/create/foundation/tileEntity/SyncedTileEntity.java similarity index 96% rename from src/main/java/com/simibubi/create/foundation/block/SyncedTileEntity.java rename to src/main/java/com/simibubi/create/foundation/tileEntity/SyncedTileEntity.java index 91b75489d..4d0ce20c5 100644 --- a/src/main/java/com/simibubi/create/foundation/block/SyncedTileEntity.java +++ b/src/main/java/com/simibubi/create/foundation/tileEntity/SyncedTileEntity.java @@ -1,4 +1,4 @@ -package com.simibubi.create.foundation.block; +package com.simibubi.create.foundation.tileEntity; import net.minecraft.nbt.CompoundNBT; import net.minecraft.network.NetworkManager; diff --git a/src/main/java/com/simibubi/create/foundation/behaviour/base/TileEntityBehaviour.java b/src/main/java/com/simibubi/create/foundation/tileEntity/TileEntityBehaviour.java similarity index 94% rename from src/main/java/com/simibubi/create/foundation/behaviour/base/TileEntityBehaviour.java rename to src/main/java/com/simibubi/create/foundation/tileEntity/TileEntityBehaviour.java index a9d8fdfc3..84712ba6b 100644 --- a/src/main/java/com/simibubi/create/foundation/behaviour/base/TileEntityBehaviour.java +++ b/src/main/java/com/simibubi/create/foundation/tileEntity/TileEntityBehaviour.java @@ -1,4 +1,6 @@ -package com.simibubi.create.foundation.behaviour.base; +package com.simibubi.create.foundation.tileEntity; + +import com.simibubi.create.foundation.tileEntity.behaviour.IBehaviourType; import net.minecraft.block.BlockState; import net.minecraft.nbt.CompoundNBT; diff --git a/src/main/java/com/simibubi/create/foundation/behaviour/CenteredSideValueBoxTransform.java b/src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/CenteredSideValueBoxTransform.java similarity index 92% rename from src/main/java/com/simibubi/create/foundation/behaviour/CenteredSideValueBoxTransform.java rename to src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/CenteredSideValueBoxTransform.java index 7198b8553..fa2c343a3 100644 --- a/src/main/java/com/simibubi/create/foundation/behaviour/CenteredSideValueBoxTransform.java +++ b/src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/CenteredSideValueBoxTransform.java @@ -1,4 +1,4 @@ -package com.simibubi.create.foundation.behaviour; +package com.simibubi.create.foundation.tileEntity.behaviour; import java.util.function.BiPredicate; diff --git a/src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/IBehaviourType.java b/src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/IBehaviourType.java new file mode 100644 index 000000000..bc3ff8758 --- /dev/null +++ b/src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/IBehaviourType.java @@ -0,0 +1,7 @@ +package com.simibubi.create.foundation.tileEntity.behaviour; + +import com.simibubi.create.foundation.tileEntity.TileEntityBehaviour; + +public interface IBehaviourType { + +} diff --git a/src/main/java/com/simibubi/create/foundation/behaviour/ValueBox.java b/src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/ValueBox.java similarity index 94% rename from src/main/java/com/simibubi/create/foundation/behaviour/ValueBox.java rename to src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/ValueBox.java index c4c8f7658..0d1d2df50 100644 --- a/src/main/java/com/simibubi/create/foundation/behaviour/ValueBox.java +++ b/src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/ValueBox.java @@ -1,13 +1,13 @@ -package com.simibubi.create.foundation.behaviour; +package com.simibubi.create.foundation.tileEntity.behaviour; import com.mojang.blaze3d.matrix.MatrixStack; -import com.simibubi.create.ScreenResources; -import com.simibubi.create.foundation.behaviour.ValueBoxTransform.Sided; -import com.simibubi.create.foundation.behaviour.scrollvalue.INamedIconOptions; +import com.simibubi.create.content.logistics.item.filter.FilterItem; +import com.simibubi.create.foundation.gui.AllIcons; +import com.simibubi.create.foundation.tileEntity.behaviour.ValueBoxTransform.Sided; +import com.simibubi.create.foundation.tileEntity.behaviour.scrollvalue.INamedIconOptions; import com.simibubi.create.foundation.utility.ColorHelper; import com.simibubi.create.foundation.utility.Lang; import com.simibubi.create.foundation.utility.outliner.ChasingAABBOutline; -import com.simibubi.create.modules.logistics.item.filter.FilterItem; import net.minecraft.block.BlockState; import net.minecraft.client.Minecraft; @@ -181,7 +181,7 @@ public class ValueBox extends ChasingAABBOutline { } public static class IconValueBox extends ValueBox { - ScreenResources icon; + AllIcons icon; public IconValueBox(String label, INamedIconOptions iconValue, AxisAlignedBB bb, BlockPos pos) { super(label, bb, pos); diff --git a/src/main/java/com/simibubi/create/foundation/behaviour/ValueBoxRenderer.java b/src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/ValueBoxRenderer.java similarity index 90% rename from src/main/java/com/simibubi/create/foundation/behaviour/ValueBoxRenderer.java rename to src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/ValueBoxRenderer.java index 3686f35f6..d35672133 100644 --- a/src/main/java/com/simibubi/create/foundation/behaviour/ValueBoxRenderer.java +++ b/src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/ValueBoxRenderer.java @@ -1,8 +1,8 @@ -package com.simibubi.create.foundation.behaviour; +package com.simibubi.create.foundation.tileEntity.behaviour; import com.mojang.blaze3d.matrix.MatrixStack; -import com.simibubi.create.modules.contraptions.relays.elementary.ShaftBlock; -import com.simibubi.create.modules.logistics.item.filter.FilterItem; +import com.simibubi.create.content.contraptions.relays.elementary.ShaftBlock; +import com.simibubi.create.content.logistics.item.filter.FilterItem; import net.minecraft.block.Block; import net.minecraft.block.Blocks; diff --git a/src/main/java/com/simibubi/create/foundation/behaviour/ValueBoxTransform.java b/src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/ValueBoxTransform.java similarity index 98% rename from src/main/java/com/simibubi/create/foundation/behaviour/ValueBoxTransform.java rename to src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/ValueBoxTransform.java index 7aeb9a54a..9097e6a87 100644 --- a/src/main/java/com/simibubi/create/foundation/behaviour/ValueBoxTransform.java +++ b/src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/ValueBoxTransform.java @@ -1,4 +1,4 @@ -package com.simibubi.create.foundation.behaviour; +package com.simibubi.create.foundation.tileEntity.behaviour; import java.util.function.Function; diff --git a/src/main/java/com/simibubi/create/foundation/behaviour/filtering/FilteringBehaviour.java b/src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/filtering/FilteringBehaviour.java similarity index 88% rename from src/main/java/com/simibubi/create/foundation/behaviour/filtering/FilteringBehaviour.java rename to src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/filtering/FilteringBehaviour.java index 7c8b02381..0c18968c2 100644 --- a/src/main/java/com/simibubi/create/foundation/behaviour/filtering/FilteringBehaviour.java +++ b/src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/filtering/FilteringBehaviour.java @@ -1,15 +1,15 @@ -package com.simibubi.create.foundation.behaviour.filtering; +package com.simibubi.create.foundation.tileEntity.behaviour.filtering; import java.util.function.Consumer; import java.util.function.Supplier; -import com.simibubi.create.AllPackets; -import com.simibubi.create.foundation.behaviour.ValueBoxTransform; -import com.simibubi.create.foundation.behaviour.base.IBehaviourType; -import com.simibubi.create.foundation.behaviour.base.SmartTileEntity; -import com.simibubi.create.foundation.behaviour.base.TileEntityBehaviour; +import com.simibubi.create.content.logistics.item.filter.FilterItem; +import com.simibubi.create.foundation.networking.AllPackets; +import com.simibubi.create.foundation.tileEntity.SmartTileEntity; +import com.simibubi.create.foundation.tileEntity.TileEntityBehaviour; +import com.simibubi.create.foundation.tileEntity.behaviour.IBehaviourType; +import com.simibubi.create.foundation.tileEntity.behaviour.ValueBoxTransform; import com.simibubi.create.foundation.utility.VecHelper; -import com.simibubi.create.modules.logistics.item.filter.FilterItem; import net.minecraft.block.BlockState; import net.minecraft.entity.item.ItemEntity; diff --git a/src/main/java/com/simibubi/create/foundation/behaviour/filtering/FilteringCountUpdatePacket.java b/src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/filtering/FilteringCountUpdatePacket.java similarity index 75% rename from src/main/java/com/simibubi/create/foundation/behaviour/filtering/FilteringCountUpdatePacket.java rename to src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/filtering/FilteringCountUpdatePacket.java index 5b8eaa568..e5be66eaf 100644 --- a/src/main/java/com/simibubi/create/foundation/behaviour/filtering/FilteringCountUpdatePacket.java +++ b/src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/filtering/FilteringCountUpdatePacket.java @@ -1,8 +1,8 @@ -package com.simibubi.create.foundation.behaviour.filtering; +package com.simibubi.create.foundation.tileEntity.behaviour.filtering; -import com.simibubi.create.foundation.behaviour.base.SmartTileEntity; -import com.simibubi.create.foundation.behaviour.base.TileEntityBehaviour; -import com.simibubi.create.foundation.packet.TileEntityConfigurationPacket; +import com.simibubi.create.foundation.networking.TileEntityConfigurationPacket; +import com.simibubi.create.foundation.tileEntity.SmartTileEntity; +import com.simibubi.create.foundation.tileEntity.TileEntityBehaviour; import net.minecraft.network.PacketBuffer; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/com/simibubi/create/foundation/behaviour/filtering/FilteringHandler.java b/src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/filtering/FilteringHandler.java similarity index 94% rename from src/main/java/com/simibubi/create/foundation/behaviour/filtering/FilteringHandler.java rename to src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/filtering/FilteringHandler.java index 7e30aab98..b464b7eb9 100644 --- a/src/main/java/com/simibubi/create/foundation/behaviour/filtering/FilteringHandler.java +++ b/src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/filtering/FilteringHandler.java @@ -1,9 +1,9 @@ -package com.simibubi.create.foundation.behaviour.filtering; +package com.simibubi.create.foundation.tileEntity.behaviour.filtering; import com.simibubi.create.AllKeys; -import com.simibubi.create.foundation.behaviour.base.TileEntityBehaviour; +import com.simibubi.create.content.logistics.item.filter.FilterItem; +import com.simibubi.create.foundation.tileEntity.TileEntityBehaviour; import com.simibubi.create.foundation.utility.RaycastHelper; -import com.simibubi.create.modules.logistics.item.filter.FilterItem; import net.minecraft.client.Minecraft; import net.minecraft.client.world.ClientWorld; diff --git a/src/main/java/com/simibubi/create/foundation/behaviour/filtering/FilteringRenderer.java b/src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/filtering/FilteringRenderer.java similarity index 85% rename from src/main/java/com/simibubi/create/foundation/behaviour/filtering/FilteringRenderer.java rename to src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/filtering/FilteringRenderer.java index 26e94492e..a1032566d 100644 --- a/src/main/java/com/simibubi/create/foundation/behaviour/filtering/FilteringRenderer.java +++ b/src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/filtering/FilteringRenderer.java @@ -1,15 +1,15 @@ -package com.simibubi.create.foundation.behaviour.filtering; +package com.simibubi.create.foundation.tileEntity.behaviour.filtering; import com.mojang.blaze3d.matrix.MatrixStack; import com.simibubi.create.AllSpecialTextures; import com.simibubi.create.CreateClient; -import com.simibubi.create.foundation.behaviour.ValueBox; -import com.simibubi.create.foundation.behaviour.ValueBox.ItemValueBox; -import com.simibubi.create.foundation.behaviour.ValueBoxRenderer; -import com.simibubi.create.foundation.behaviour.base.SmartTileEntity; -import com.simibubi.create.foundation.behaviour.base.TileEntityBehaviour; +import com.simibubi.create.content.logistics.item.filter.FilterItem; +import com.simibubi.create.foundation.tileEntity.SmartTileEntity; +import com.simibubi.create.foundation.tileEntity.TileEntityBehaviour; +import com.simibubi.create.foundation.tileEntity.behaviour.ValueBox; +import com.simibubi.create.foundation.tileEntity.behaviour.ValueBox.ItemValueBox; +import com.simibubi.create.foundation.tileEntity.behaviour.ValueBoxRenderer; import com.simibubi.create.foundation.utility.Lang; -import com.simibubi.create.modules.logistics.item.filter.FilterItem; import net.minecraft.block.BlockState; import net.minecraft.client.Minecraft; diff --git a/src/main/java/com/simibubi/create/foundation/behaviour/inventory/AutoExtractingBehaviour.java b/src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/inventory/AutoExtractingBehaviour.java similarity index 89% rename from src/main/java/com/simibubi/create/foundation/behaviour/inventory/AutoExtractingBehaviour.java rename to src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/inventory/AutoExtractingBehaviour.java index 6cd639b3d..4660656b2 100644 --- a/src/main/java/com/simibubi/create/foundation/behaviour/inventory/AutoExtractingBehaviour.java +++ b/src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/inventory/AutoExtractingBehaviour.java @@ -1,4 +1,4 @@ -package com.simibubi.create.foundation.behaviour.inventory; +package com.simibubi.create.foundation.tileEntity.behaviour.inventory; import java.util.List; import java.util.function.Consumer; @@ -6,8 +6,8 @@ import java.util.function.Supplier; import org.apache.commons.lang3.tuple.Pair; -import com.simibubi.create.foundation.behaviour.base.IBehaviourType; -import com.simibubi.create.foundation.behaviour.base.SmartTileEntity; +import com.simibubi.create.foundation.tileEntity.SmartTileEntity; +import com.simibubi.create.foundation.tileEntity.behaviour.IBehaviourType; import net.minecraft.item.ItemStack; import net.minecraft.util.Direction; diff --git a/src/main/java/com/simibubi/create/foundation/behaviour/inventory/ExtractingBehaviour.java b/src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/inventory/ExtractingBehaviour.java similarity index 87% rename from src/main/java/com/simibubi/create/foundation/behaviour/inventory/ExtractingBehaviour.java rename to src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/inventory/ExtractingBehaviour.java index 0b8dce370..c1bdbcf09 100644 --- a/src/main/java/com/simibubi/create/foundation/behaviour/inventory/ExtractingBehaviour.java +++ b/src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/inventory/ExtractingBehaviour.java @@ -1,4 +1,4 @@ -package com.simibubi.create.foundation.behaviour.inventory; +package com.simibubi.create.foundation.tileEntity.behaviour.inventory; import java.util.List; import java.util.function.Consumer; @@ -8,11 +8,11 @@ import java.util.function.Supplier; import org.apache.commons.lang3.tuple.Pair; -import com.simibubi.create.config.AllConfigs; -import com.simibubi.create.foundation.behaviour.base.IBehaviourType; -import com.simibubi.create.foundation.behaviour.base.SmartTileEntity; -import com.simibubi.create.foundation.behaviour.filtering.FilteringBehaviour; +import com.simibubi.create.foundation.config.AllConfigs; import com.simibubi.create.foundation.item.ItemHelper; +import com.simibubi.create.foundation.tileEntity.SmartTileEntity; +import com.simibubi.create.foundation.tileEntity.behaviour.IBehaviourType; +import com.simibubi.create.foundation.tileEntity.behaviour.filtering.FilteringBehaviour; import net.minecraft.item.ItemStack; import net.minecraft.util.Direction; diff --git a/src/main/java/com/simibubi/create/foundation/behaviour/inventory/InsertingBehaviour.java b/src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/inventory/InsertingBehaviour.java similarity index 81% rename from src/main/java/com/simibubi/create/foundation/behaviour/inventory/InsertingBehaviour.java rename to src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/inventory/InsertingBehaviour.java index 17991e023..e865065dc 100644 --- a/src/main/java/com/simibubi/create/foundation/behaviour/inventory/InsertingBehaviour.java +++ b/src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/inventory/InsertingBehaviour.java @@ -1,12 +1,12 @@ -package com.simibubi.create.foundation.behaviour.inventory; +package com.simibubi.create.foundation.tileEntity.behaviour.inventory; import java.util.List; import java.util.function.Supplier; import org.apache.commons.lang3.tuple.Pair; -import com.simibubi.create.foundation.behaviour.base.IBehaviourType; -import com.simibubi.create.foundation.behaviour.base.SmartTileEntity; +import com.simibubi.create.foundation.tileEntity.SmartTileEntity; +import com.simibubi.create.foundation.tileEntity.behaviour.IBehaviourType; import net.minecraft.item.ItemStack; import net.minecraft.util.Direction; diff --git a/src/main/java/com/simibubi/create/foundation/behaviour/inventory/InventoryManagementBehaviour.java b/src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/inventory/InventoryManagementBehaviour.java similarity index 91% rename from src/main/java/com/simibubi/create/foundation/behaviour/inventory/InventoryManagementBehaviour.java rename to src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/inventory/InventoryManagementBehaviour.java index 763d757f9..b44a390c5 100644 --- a/src/main/java/com/simibubi/create/foundation/behaviour/inventory/InventoryManagementBehaviour.java +++ b/src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/inventory/InventoryManagementBehaviour.java @@ -1,4 +1,4 @@ -package com.simibubi.create.foundation.behaviour.inventory; +package com.simibubi.create.foundation.tileEntity.behaviour.inventory; import java.util.ArrayList; import java.util.HashMap; @@ -9,9 +9,9 @@ import java.util.function.Supplier; import org.apache.commons.lang3.tuple.Pair; import com.google.common.collect.ImmutableList; -import com.simibubi.create.foundation.behaviour.base.IBehaviourType; -import com.simibubi.create.foundation.behaviour.base.SmartTileEntity; -import com.simibubi.create.foundation.behaviour.base.TileEntityBehaviour; +import com.simibubi.create.foundation.tileEntity.SmartTileEntity; +import com.simibubi.create.foundation.tileEntity.TileEntityBehaviour; +import com.simibubi.create.foundation.tileEntity.behaviour.IBehaviourType; import net.minecraft.block.BlockState; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/com/simibubi/create/foundation/behaviour/inventory/SingleTargetAutoExtractingBehaviour.java b/src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/inventory/SingleTargetAutoExtractingBehaviour.java similarity index 88% rename from src/main/java/com/simibubi/create/foundation/behaviour/inventory/SingleTargetAutoExtractingBehaviour.java rename to src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/inventory/SingleTargetAutoExtractingBehaviour.java index 86190ca08..be0c8a8e3 100644 --- a/src/main/java/com/simibubi/create/foundation/behaviour/inventory/SingleTargetAutoExtractingBehaviour.java +++ b/src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/inventory/SingleTargetAutoExtractingBehaviour.java @@ -1,10 +1,10 @@ -package com.simibubi.create.foundation.behaviour.inventory; +package com.simibubi.create.foundation.tileEntity.behaviour.inventory; import java.util.function.Consumer; import java.util.function.Supplier; -import com.simibubi.create.foundation.behaviour.base.IBehaviourType; -import com.simibubi.create.foundation.behaviour.base.SmartTileEntity; +import com.simibubi.create.foundation.tileEntity.SmartTileEntity; +import com.simibubi.create.foundation.tileEntity.behaviour.IBehaviourType; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; diff --git a/src/main/java/com/simibubi/create/foundation/behaviour/inventory/SynchronizedExtraction.java b/src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/inventory/SynchronizedExtraction.java similarity index 92% rename from src/main/java/com/simibubi/create/foundation/behaviour/inventory/SynchronizedExtraction.java rename to src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/inventory/SynchronizedExtraction.java index d03a2d93a..39fefa472 100644 --- a/src/main/java/com/simibubi/create/foundation/behaviour/inventory/SynchronizedExtraction.java +++ b/src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/inventory/SynchronizedExtraction.java @@ -1,10 +1,10 @@ -package com.simibubi.create.foundation.behaviour.inventory; +package com.simibubi.create.foundation.tileEntity.behaviour.inventory; import java.util.ArrayList; import java.util.List; -import com.simibubi.create.foundation.behaviour.base.TileEntityBehaviour; -import com.simibubi.create.modules.logistics.block.inventories.CrateBlock; +import com.simibubi.create.content.logistics.block.inventories.CrateBlock; +import com.simibubi.create.foundation.tileEntity.TileEntityBehaviour; import net.minecraft.block.BlockState; import net.minecraft.block.ChestBlock; diff --git a/src/main/java/com/simibubi/create/foundation/behaviour/linked/LinkBehaviour.java b/src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/linked/LinkBehaviour.java similarity index 91% rename from src/main/java/com/simibubi/create/foundation/behaviour/linked/LinkBehaviour.java rename to src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/linked/LinkBehaviour.java index 10677554e..685d2c66e 100644 --- a/src/main/java/com/simibubi/create/foundation/behaviour/linked/LinkBehaviour.java +++ b/src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/linked/LinkBehaviour.java @@ -1,4 +1,4 @@ -package com.simibubi.create.foundation.behaviour.linked; +package com.simibubi.create.foundation.tileEntity.behaviour.linked; import java.util.function.Consumer; import java.util.function.Function; @@ -7,12 +7,12 @@ import java.util.function.Supplier; import org.apache.commons.lang3.tuple.Pair; import com.simibubi.create.Create; -import com.simibubi.create.foundation.behaviour.ValueBoxTransform; -import com.simibubi.create.foundation.behaviour.base.IBehaviourType; -import com.simibubi.create.foundation.behaviour.base.SmartTileEntity; -import com.simibubi.create.foundation.behaviour.base.TileEntityBehaviour; -import com.simibubi.create.modules.logistics.RedstoneLinkNetworkHandler; -import com.simibubi.create.modules.logistics.RedstoneLinkNetworkHandler.Frequency; +import com.simibubi.create.content.logistics.RedstoneLinkNetworkHandler; +import com.simibubi.create.content.logistics.RedstoneLinkNetworkHandler.Frequency; +import com.simibubi.create.foundation.tileEntity.SmartTileEntity; +import com.simibubi.create.foundation.tileEntity.TileEntityBehaviour; +import com.simibubi.create.foundation.tileEntity.behaviour.IBehaviourType; +import com.simibubi.create.foundation.tileEntity.behaviour.ValueBoxTransform; import net.minecraft.block.BlockState; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/simibubi/create/foundation/behaviour/linked/LinkHandler.java b/src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/linked/LinkHandler.java similarity index 92% rename from src/main/java/com/simibubi/create/foundation/behaviour/linked/LinkHandler.java rename to src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/linked/LinkHandler.java index 3edc16be4..b7538fdd7 100644 --- a/src/main/java/com/simibubi/create/foundation/behaviour/linked/LinkHandler.java +++ b/src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/linked/LinkHandler.java @@ -1,8 +1,8 @@ -package com.simibubi.create.foundation.behaviour.linked; +package com.simibubi.create.foundation.tileEntity.behaviour.linked; import java.util.Arrays; -import com.simibubi.create.foundation.behaviour.base.TileEntityBehaviour; +import com.simibubi.create.foundation.tileEntity.TileEntityBehaviour; import com.simibubi.create.foundation.utility.RaycastHelper; import net.minecraft.entity.player.PlayerEntity; diff --git a/src/main/java/com/simibubi/create/foundation/behaviour/linked/LinkRenderer.java b/src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/linked/LinkRenderer.java similarity index 86% rename from src/main/java/com/simibubi/create/foundation/behaviour/linked/LinkRenderer.java rename to src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/linked/LinkRenderer.java index 013c3a239..64e5d6862 100644 --- a/src/main/java/com/simibubi/create/foundation/behaviour/linked/LinkRenderer.java +++ b/src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/linked/LinkRenderer.java @@ -1,14 +1,14 @@ -package com.simibubi.create.foundation.behaviour.linked; +package com.simibubi.create.foundation.tileEntity.behaviour.linked; import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.datafixers.util.Pair; import com.simibubi.create.AllSpecialTextures; import com.simibubi.create.CreateClient; -import com.simibubi.create.foundation.behaviour.ValueBox; -import com.simibubi.create.foundation.behaviour.ValueBoxRenderer; -import com.simibubi.create.foundation.behaviour.ValueBoxTransform; -import com.simibubi.create.foundation.behaviour.base.SmartTileEntity; -import com.simibubi.create.foundation.behaviour.base.TileEntityBehaviour; +import com.simibubi.create.foundation.tileEntity.SmartTileEntity; +import com.simibubi.create.foundation.tileEntity.TileEntityBehaviour; +import com.simibubi.create.foundation.tileEntity.behaviour.ValueBox; +import com.simibubi.create.foundation.tileEntity.behaviour.ValueBoxRenderer; +import com.simibubi.create.foundation.tileEntity.behaviour.ValueBoxTransform; import com.simibubi.create.foundation.utility.Iterate; import com.simibubi.create.foundation.utility.Lang; diff --git a/src/main/java/com/simibubi/create/foundation/behaviour/scrollvalue/BulkScrollValueBehaviour.java b/src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/scrollvalue/BulkScrollValueBehaviour.java similarity index 70% rename from src/main/java/com/simibubi/create/foundation/behaviour/scrollvalue/BulkScrollValueBehaviour.java rename to src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/scrollvalue/BulkScrollValueBehaviour.java index c1f188c7d..70cca31c8 100644 --- a/src/main/java/com/simibubi/create/foundation/behaviour/scrollvalue/BulkScrollValueBehaviour.java +++ b/src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/scrollvalue/BulkScrollValueBehaviour.java @@ -1,10 +1,10 @@ -package com.simibubi.create.foundation.behaviour.scrollvalue; +package com.simibubi.create.foundation.tileEntity.behaviour.scrollvalue; import java.util.List; import java.util.function.Function; -import com.simibubi.create.foundation.behaviour.ValueBoxTransform; -import com.simibubi.create.foundation.behaviour.base.SmartTileEntity; +import com.simibubi.create.foundation.tileEntity.SmartTileEntity; +import com.simibubi.create.foundation.tileEntity.behaviour.ValueBoxTransform; public class BulkScrollValueBehaviour extends ScrollValueBehaviour { diff --git a/src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/scrollvalue/INamedIconOptions.java b/src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/scrollvalue/INamedIconOptions.java new file mode 100644 index 000000000..b43fc801d --- /dev/null +++ b/src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/scrollvalue/INamedIconOptions.java @@ -0,0 +1,8 @@ +package com.simibubi.create.foundation.tileEntity.behaviour.scrollvalue; + +import com.simibubi.create.foundation.gui.AllIcons; + +public interface INamedIconOptions { + AllIcons getIcon(); + String getTranslationKey(); +} \ No newline at end of file diff --git a/src/main/java/com/simibubi/create/foundation/behaviour/scrollvalue/ScrollOptionBehaviour.java b/src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/scrollvalue/ScrollOptionBehaviour.java similarity index 69% rename from src/main/java/com/simibubi/create/foundation/behaviour/scrollvalue/ScrollOptionBehaviour.java rename to src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/scrollvalue/ScrollOptionBehaviour.java index 337bfec24..808cb8257 100644 --- a/src/main/java/com/simibubi/create/foundation/behaviour/scrollvalue/ScrollOptionBehaviour.java +++ b/src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/scrollvalue/ScrollOptionBehaviour.java @@ -1,7 +1,7 @@ -package com.simibubi.create.foundation.behaviour.scrollvalue; +package com.simibubi.create.foundation.tileEntity.behaviour.scrollvalue; -import com.simibubi.create.foundation.behaviour.ValueBoxTransform; -import com.simibubi.create.foundation.behaviour.base.SmartTileEntity; +import com.simibubi.create.foundation.tileEntity.SmartTileEntity; +import com.simibubi.create.foundation.tileEntity.behaviour.ValueBoxTransform; public class ScrollOptionBehaviour & INamedIconOptions> extends ScrollValueBehaviour { diff --git a/src/main/java/com/simibubi/create/foundation/behaviour/scrollvalue/ScrollValueBehaviour.java b/src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/scrollvalue/ScrollValueBehaviour.java similarity index 90% rename from src/main/java/com/simibubi/create/foundation/behaviour/scrollvalue/ScrollValueBehaviour.java rename to src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/scrollvalue/ScrollValueBehaviour.java index 0edd3989f..59be89235 100644 --- a/src/main/java/com/simibubi/create/foundation/behaviour/scrollvalue/ScrollValueBehaviour.java +++ b/src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/scrollvalue/ScrollValueBehaviour.java @@ -1,13 +1,13 @@ -package com.simibubi.create.foundation.behaviour.scrollvalue; +package com.simibubi.create.foundation.tileEntity.behaviour.scrollvalue; import java.util.function.Consumer; import java.util.function.Function; -import com.simibubi.create.AllPackets; -import com.simibubi.create.foundation.behaviour.ValueBoxTransform; -import com.simibubi.create.foundation.behaviour.base.IBehaviourType; -import com.simibubi.create.foundation.behaviour.base.SmartTileEntity; -import com.simibubi.create.foundation.behaviour.base.TileEntityBehaviour; +import com.simibubi.create.foundation.networking.AllPackets; +import com.simibubi.create.foundation.tileEntity.SmartTileEntity; +import com.simibubi.create.foundation.tileEntity.TileEntityBehaviour; +import com.simibubi.create.foundation.tileEntity.behaviour.IBehaviourType; +import com.simibubi.create.foundation.tileEntity.behaviour.ValueBoxTransform; import net.minecraft.block.BlockState; import net.minecraft.nbt.CompoundNBT; diff --git a/src/main/java/com/simibubi/create/foundation/behaviour/scrollvalue/ScrollValueHandler.java b/src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/scrollvalue/ScrollValueHandler.java similarity index 86% rename from src/main/java/com/simibubi/create/foundation/behaviour/scrollvalue/ScrollValueHandler.java rename to src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/scrollvalue/ScrollValueHandler.java index 93eafae06..6e684f351 100644 --- a/src/main/java/com/simibubi/create/foundation/behaviour/scrollvalue/ScrollValueHandler.java +++ b/src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/scrollvalue/ScrollValueHandler.java @@ -1,11 +1,11 @@ -package com.simibubi.create.foundation.behaviour.scrollvalue; +package com.simibubi.create.foundation.tileEntity.behaviour.scrollvalue; import com.simibubi.create.AllItems; import com.simibubi.create.AllKeys; -import com.simibubi.create.foundation.behaviour.ValueBoxTransform.Sided; -import com.simibubi.create.foundation.behaviour.base.SmartTileEntity; -import com.simibubi.create.foundation.behaviour.base.TileEntityBehaviour; -import com.simibubi.create.foundation.behaviour.scrollvalue.ScrollValueBehaviour.StepContext; +import com.simibubi.create.foundation.tileEntity.SmartTileEntity; +import com.simibubi.create.foundation.tileEntity.TileEntityBehaviour; +import com.simibubi.create.foundation.tileEntity.behaviour.ValueBoxTransform.Sided; +import com.simibubi.create.foundation.tileEntity.behaviour.scrollvalue.ScrollValueBehaviour.StepContext; import net.minecraft.client.Minecraft; import net.minecraft.client.world.ClientWorld; diff --git a/src/main/java/com/simibubi/create/foundation/behaviour/scrollvalue/ScrollValueRenderer.java b/src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/scrollvalue/ScrollValueRenderer.java similarity index 85% rename from src/main/java/com/simibubi/create/foundation/behaviour/scrollvalue/ScrollValueRenderer.java rename to src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/scrollvalue/ScrollValueRenderer.java index 287a35aad..45bf64d2c 100644 --- a/src/main/java/com/simibubi/create/foundation/behaviour/scrollvalue/ScrollValueRenderer.java +++ b/src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/scrollvalue/ScrollValueRenderer.java @@ -1,13 +1,13 @@ -package com.simibubi.create.foundation.behaviour.scrollvalue; +package com.simibubi.create.foundation.tileEntity.behaviour.scrollvalue; import com.simibubi.create.AllItems; import com.simibubi.create.AllKeys; import com.simibubi.create.CreateClient; -import com.simibubi.create.foundation.behaviour.ValueBox; -import com.simibubi.create.foundation.behaviour.ValueBox.IconValueBox; -import com.simibubi.create.foundation.behaviour.ValueBox.TextValueBox; -import com.simibubi.create.foundation.behaviour.base.SmartTileEntity; -import com.simibubi.create.foundation.behaviour.base.TileEntityBehaviour; +import com.simibubi.create.foundation.tileEntity.SmartTileEntity; +import com.simibubi.create.foundation.tileEntity.TileEntityBehaviour; +import com.simibubi.create.foundation.tileEntity.behaviour.ValueBox; +import com.simibubi.create.foundation.tileEntity.behaviour.ValueBox.IconValueBox; +import com.simibubi.create.foundation.tileEntity.behaviour.ValueBox.TextValueBox; import com.simibubi.create.foundation.utility.Lang; import net.minecraft.client.Minecraft; diff --git a/src/main/java/com/simibubi/create/foundation/behaviour/scrollvalue/ScrollValueUpdatePacket.java b/src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/scrollvalue/ScrollValueUpdatePacket.java similarity index 73% rename from src/main/java/com/simibubi/create/foundation/behaviour/scrollvalue/ScrollValueUpdatePacket.java rename to src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/scrollvalue/ScrollValueUpdatePacket.java index f444c8968..88f7433d9 100644 --- a/src/main/java/com/simibubi/create/foundation/behaviour/scrollvalue/ScrollValueUpdatePacket.java +++ b/src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/scrollvalue/ScrollValueUpdatePacket.java @@ -1,8 +1,8 @@ -package com.simibubi.create.foundation.behaviour.scrollvalue; +package com.simibubi.create.foundation.tileEntity.behaviour.scrollvalue; -import com.simibubi.create.foundation.behaviour.base.SmartTileEntity; -import com.simibubi.create.foundation.behaviour.base.TileEntityBehaviour; -import com.simibubi.create.foundation.packet.TileEntityConfigurationPacket; +import com.simibubi.create.foundation.networking.TileEntityConfigurationPacket; +import com.simibubi.create.foundation.tileEntity.SmartTileEntity; +import com.simibubi.create.foundation.tileEntity.TileEntityBehaviour; import net.minecraft.network.PacketBuffer; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/com/simibubi/create/foundation/behaviour/simple/DeferralBehaviour.java b/src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/simple/DeferralBehaviour.java similarity index 76% rename from src/main/java/com/simibubi/create/foundation/behaviour/simple/DeferralBehaviour.java rename to src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/simple/DeferralBehaviour.java index 23d845c7d..9650fbe92 100644 --- a/src/main/java/com/simibubi/create/foundation/behaviour/simple/DeferralBehaviour.java +++ b/src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/simple/DeferralBehaviour.java @@ -1,10 +1,10 @@ -package com.simibubi.create.foundation.behaviour.simple; +package com.simibubi.create.foundation.tileEntity.behaviour.simple; import java.util.function.Supplier; -import com.simibubi.create.foundation.behaviour.base.IBehaviourType; -import com.simibubi.create.foundation.behaviour.base.SmartTileEntity; -import com.simibubi.create.foundation.behaviour.base.TileEntityBehaviour; +import com.simibubi.create.foundation.tileEntity.SmartTileEntity; +import com.simibubi.create.foundation.tileEntity.TileEntityBehaviour; +import com.simibubi.create.foundation.tileEntity.behaviour.IBehaviourType; import net.minecraft.nbt.CompoundNBT; diff --git a/src/main/java/com/simibubi/create/foundation/block/render/ColoredOverlayTileEntityRenderer.java b/src/main/java/com/simibubi/create/foundation/tileEntity/renderer/ColoredOverlayTileEntityRenderer.java similarity index 92% rename from src/main/java/com/simibubi/create/foundation/block/render/ColoredOverlayTileEntityRenderer.java rename to src/main/java/com/simibubi/create/foundation/tileEntity/renderer/ColoredOverlayTileEntityRenderer.java index b3b1bb92e..b8bc4b733 100644 --- a/src/main/java/com/simibubi/create/foundation/block/render/ColoredOverlayTileEntityRenderer.java +++ b/src/main/java/com/simibubi/create/foundation/tileEntity/renderer/ColoredOverlayTileEntityRenderer.java @@ -1,7 +1,6 @@ -package com.simibubi.create.foundation.block.render; +package com.simibubi.create.foundation.tileEntity.renderer; import com.mojang.blaze3d.matrix.MatrixStack; -import com.simibubi.create.foundation.block.SafeTileEntityRenderer; import com.simibubi.create.foundation.utility.SuperByteBuffer; import net.minecraft.block.BlockState; diff --git a/src/main/java/com/simibubi/create/foundation/block/SafeTileEntityRenderer.java b/src/main/java/com/simibubi/create/foundation/tileEntity/renderer/SafeTileEntityRenderer.java similarity index 94% rename from src/main/java/com/simibubi/create/foundation/block/SafeTileEntityRenderer.java rename to src/main/java/com/simibubi/create/foundation/tileEntity/renderer/SafeTileEntityRenderer.java index 3dc646f49..b20554d9b 100644 --- a/src/main/java/com/simibubi/create/foundation/block/SafeTileEntityRenderer.java +++ b/src/main/java/com/simibubi/create/foundation/tileEntity/renderer/SafeTileEntityRenderer.java @@ -1,4 +1,4 @@ -package com.simibubi.create.foundation.block; +package com.simibubi.create.foundation.tileEntity.renderer; import com.mojang.blaze3d.matrix.MatrixStack; diff --git a/src/main/java/com/simibubi/create/foundation/behaviour/base/SmartTileEntityRenderer.java b/src/main/java/com/simibubi/create/foundation/tileEntity/renderer/SmartTileEntityRenderer.java similarity index 71% rename from src/main/java/com/simibubi/create/foundation/behaviour/base/SmartTileEntityRenderer.java rename to src/main/java/com/simibubi/create/foundation/tileEntity/renderer/SmartTileEntityRenderer.java index da30d9de7..7dfbf60ff 100644 --- a/src/main/java/com/simibubi/create/foundation/behaviour/base/SmartTileEntityRenderer.java +++ b/src/main/java/com/simibubi/create/foundation/tileEntity/renderer/SmartTileEntityRenderer.java @@ -1,9 +1,9 @@ -package com.simibubi.create.foundation.behaviour.base; +package com.simibubi.create.foundation.tileEntity.renderer; import com.mojang.blaze3d.matrix.MatrixStack; -import com.simibubi.create.foundation.behaviour.filtering.FilteringRenderer; -import com.simibubi.create.foundation.behaviour.linked.LinkRenderer; -import com.simibubi.create.foundation.block.SafeTileEntityRenderer; +import com.simibubi.create.foundation.tileEntity.SmartTileEntity; +import com.simibubi.create.foundation.tileEntity.behaviour.filtering.FilteringRenderer; +import com.simibubi.create.foundation.tileEntity.behaviour.linked.LinkRenderer; import net.minecraft.client.renderer.IRenderTypeBuffer; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; diff --git a/src/main/java/com/simibubi/create/foundation/type/CombinedCountedItemsList.java b/src/main/java/com/simibubi/create/foundation/type/CombinedCountedItemsList.java deleted file mode 100644 index c020e360e..000000000 --- a/src/main/java/com/simibubi/create/foundation/type/CombinedCountedItemsList.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.simibubi.create.foundation.type; - -import java.util.HashMap; -import java.util.Map; - -public class CombinedCountedItemsList { - - protected Map lists = new HashMap<>(); - protected CountedItemsList combined = new CountedItemsList(); - boolean combinedListDirty = true; - - public void add(T key, CountedItemsList list) { - lists.put(key, list); - combinedListDirty = true; - } - - public void remove(T key) { - lists.remove(key); - combinedListDirty = true; - } - - public void clear() { - lists.clear(); - combinedListDirty = true; - } - - public CountedItemsList get() { - if (combinedListDirty) { - combined = new CountedItemsList(); - lists.values().forEach(list -> list.getFlattenedList().forEach(combined::add)); - combinedListDirty = false; - } - return combined; - } - -} diff --git a/src/main/java/com/simibubi/create/foundation/type/CountedItemsList.java b/src/main/java/com/simibubi/create/foundation/type/CountedItemsList.java deleted file mode 100644 index b4814fdee..000000000 --- a/src/main/java/com/simibubi/create/foundation/type/CountedItemsList.java +++ /dev/null @@ -1,182 +0,0 @@ -package com.simibubi.create.foundation.type; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.PriorityQueue; -import java.util.Set; - -import com.google.common.collect.Sets; - -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; -import net.minecraftforge.items.IItemHandler; -import net.minecraftforge.items.ItemHandlerHelper; - -public class CountedItemsList { - - Map> items = new HashMap<>(); - - Collection flattenedList = new PriorityQueue<>(); - boolean flattenedListDirty = true; - - public CountedItemsList() { - } - - public CountedItemsList(IItemHandler inventory) { - for (int slot = 0; slot < inventory.getSlots(); slot++) - add(inventory.extractItem(slot, inventory.getSlotLimit(slot), true)); - } - - public List getStacksToUpdate(CountedItemsList newList) { - List changes = new ArrayList<>(); - for (Item key : Sets.union(items.keySet(), newList.items.keySet())) { - Set currentSet = items.get(key); - Set newSet = newList.items.get(key); - - if (currentSet == null) { - changes.addAll(newSet); - continue; - } - if (newSet == null) { - currentSet.forEach(entry -> changes.add(new ItemStackEntry(entry.stack, 0))); - continue; - } - - Set remainderNew = new HashSet<>(newSet); - OuterLoop: for (ItemStackEntry entry : currentSet) { - for (ItemStackEntry newEntry : newSet) { - if (!entry.matches(newEntry.stack)) - continue; - remainderNew.remove(newEntry); - if (entry.amount != newEntry.amount) - changes.add(newEntry); - continue OuterLoop; - } - changes.add(new ItemStackEntry(entry.stack, 0)); - } - changes.addAll(remainderNew); - } - - return changes; - } - - public void add(ItemStack stack) { - add(stack, stack.getCount()); - } - - public void add(ItemStackEntry entry) { - add(entry.stack, entry.amount); - } - - public void add(ItemStack stack, int amount) { - if (stack.isEmpty()) - return; - - Set stackSet = getOrCreateItemSet(stack); - for (ItemStackEntry entry : stackSet) { - if (!entry.matches(stack)) - continue; - entry.amount += amount; - return; - } - stackSet.add(new ItemStackEntry(stack, amount)); - flattenedListDirty = true; - } - - public boolean contains(ItemStack stack) { - return getItemCount(stack) != 0; - } - - public int getItemCount(ItemStack stack) { - Set stackSet = getItemSet(stack); - if (stackSet == null) - return 0; - for (ItemStackEntry entry : stackSet) { - if (!entry.matches(stack)) - continue; - return entry.amount; - } - return 0; - } - - public void setItemCount(ItemStack stack, int amount) { - remove(stack); - add(stack, amount); - } - - public void remove(ItemStack stack) { - Set stackSet = getItemSet(stack); - if (stackSet == null) - return; - - for (Iterator iterator = stackSet.iterator(); iterator.hasNext();) { - ItemStackEntry entry = iterator.next(); - if (entry.matches(stack)) { - iterator.remove(); - flattenedListDirty = true; - return; - } - } - } - - public Collection getFlattenedList() { - if (flattenedListDirty) { - flattenedList.clear(); - items.values().forEach(set -> flattenedList.addAll(set)); - flattenedListDirty = false; - } - return flattenedList; - } - - private Set getItemSet(ItemStack stack) { - return items.get(stack.getItem()); - } - - private Set getOrCreateItemSet(ItemStack stack) { - if (!items.containsKey(stack.getItem())) - items.put(stack.getItem(), new HashSet<>()); - return getItemSet(stack); - } - - public static class ItemStackEntry implements Comparable { - public ItemStack stack; - public int amount; - - public ItemStackEntry(ItemStack stack) { - this(stack, stack.getCount()); - } - - public ItemStackEntry(CompoundNBT nbt) { - this(ItemStack.read(nbt.getCompound("Item")), nbt.getInt("Amount")); - } - - public ItemStackEntry(ItemStack stack, int amount) { - this.stack = stack.copy(); - this.amount = amount; - } - - public boolean matches(ItemStack other) { - return ItemHandlerHelper.canItemStacksStack(other, stack); - } - - public CompoundNBT serializeNBT() { - CompoundNBT nbt = new CompoundNBT(); - nbt.put("Item", stack.serializeNBT()); - nbt.putInt("Amount", amount); - return nbt; - } - - @Override - public int compareTo(ItemStackEntry o) { - return amount - o.amount; - } - - } - -} diff --git a/src/main/java/com/simibubi/create/foundation/type/Cuboid.java b/src/main/java/com/simibubi/create/foundation/type/Cuboid.java deleted file mode 100644 index a95594a03..000000000 --- a/src/main/java/com/simibubi/create/foundation/type/Cuboid.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.simibubi.create.foundation.type; - -import net.minecraft.util.math.BlockPos; - -public class Cuboid { - - public int x; - public int y; - public int z; - public int width; - public int height; - public int length; - - public Cuboid() { - this(BlockPos.ZERO, 0, 0, 0); - } - - public Cuboid(BlockPos origin, BlockPos size) { - this(origin, size.getX(), size.getY(), size.getZ()); - } - - public Cuboid(BlockPos origin, int width, int height, int length) { - this.x = origin.getX() + ((width < 0) ? width : 0); - this.y = origin.getY() + ((height < 0) ? height : 0); - this.z = origin.getZ() + ((length < 0) ? length : 0); - this.width = Math.abs(width); - this.height = Math.abs(height); - this.length = Math.abs(length); - } - - public BlockPos getOrigin() { - return new BlockPos(x, y, z); - } - - public BlockPos getSize() { - return new BlockPos(width, height, length); - } - - public Cuboid clone() { - return new Cuboid(new BlockPos(x, y, z), width, height, length); - } - - public void move(int x, int y, int z) { - this.x += x; - this.y += y; - this.z += z; - } - - public void centerHorizontallyOn(BlockPos pos) { - x = pos.getX() - (width / 2); - y = pos.getY(); - z = pos.getZ() - (length / 2); - } - - public boolean intersects(Cuboid other) { - return !(other.x >= x + width || other.z >= z + length || other.x + other.width <= x - || other.z + other.length <= z); - } - - public boolean contains(BlockPos pos) { - return (pos.getX() >= x && pos.getX() < x + width) && (pos.getY() >= y && pos.getY() < y + height) - && (pos.getZ() >= z && pos.getZ() < z + length); - } - - public BlockPos getCenter() { - return getOrigin().add(width / 2, height / 2, length / 2); - } - - @Override - public boolean equals(Object obj) { - return obj instanceof Cuboid && ((Cuboid) obj).getOrigin().equals(getOrigin()) - && ((Cuboid) obj).getSize().equals(getSize()); - } - -} \ No newline at end of file diff --git a/src/main/java/com/simibubi/create/foundation/type/DimensionPos.java b/src/main/java/com/simibubi/create/foundation/type/DimensionPos.java deleted file mode 100644 index 38cd7e240..000000000 --- a/src/main/java/com/simibubi/create/foundation/type/DimensionPos.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.simibubi.create.foundation.type; - -import net.minecraft.entity.player.ServerPlayerEntity; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -public class DimensionPos { - public World world; - public BlockPos pos; - - public DimensionPos(ServerPlayerEntity player, BlockPos pos) { - this.world = player.world; - this.pos = pos; - } -} \ No newline at end of file diff --git a/src/main/java/com/simibubi/create/foundation/utility/Debug.java b/src/main/java/com/simibubi/create/foundation/utility/Debug.java index d1843ba95..f42e7bd27 100644 --- a/src/main/java/com/simibubi/create/foundation/utility/Debug.java +++ b/src/main/java/com/simibubi/create/foundation/utility/Debug.java @@ -9,29 +9,33 @@ import net.minecraftforge.fml.common.thread.EffectiveSide; /** Deprecated so simi doensn't forget to remove debug calls **/ @OnlyIn(value = Dist.CLIENT) -@Deprecated public class Debug { + @Deprecated public static void debugChat(String message) { if (Minecraft.getInstance().player != null) Minecraft.getInstance().player.sendStatusMessage(new StringTextComponent(message), false); } + @Deprecated public static void debugChatAndShowStack(String message, int depth) { if (Minecraft.getInstance().player != null) Minecraft.getInstance().player .sendStatusMessage(new StringTextComponent(message + " @" + debugStack(depth)), false); } + @Deprecated public static void debugMessage(String message) { if (Minecraft.getInstance().player != null) Minecraft.getInstance().player.sendStatusMessage(new StringTextComponent(message), true); } + @Deprecated public static String getLogicalSide() { return EffectiveSide.get().isClient() ? "CL" : "SV"; } + @Deprecated public static String debugStack(int depth) { StackTraceElement[] stackTraceElements = Thread.currentThread().getStackTrace(); String text = "[" + TextFormatting.GOLD + getLogicalSide() + TextFormatting.WHITE + "] "; @@ -44,6 +48,7 @@ public class Debug { return text + TextFormatting.GRAY + " ..."; } + @Deprecated public static void markTemporary() {}; } diff --git a/src/main/java/com/simibubi/create/foundation/utility/ServerSpeedProvider.java b/src/main/java/com/simibubi/create/foundation/utility/ServerSpeedProvider.java index b378eca67..2e3599132 100644 --- a/src/main/java/com/simibubi/create/foundation/utility/ServerSpeedProvider.java +++ b/src/main/java/com/simibubi/create/foundation/utility/ServerSpeedProvider.java @@ -2,10 +2,10 @@ package com.simibubi.create.foundation.utility; import java.util.function.Supplier; -import com.simibubi.create.AllPackets; -import com.simibubi.create.config.AllConfigs; +import com.simibubi.create.foundation.config.AllConfigs; import com.simibubi.create.foundation.gui.widgets.InterpolatedChasingValue; -import com.simibubi.create.foundation.packet.SimplePacketBase; +import com.simibubi.create.foundation.networking.AllPackets; +import com.simibubi.create.foundation.networking.SimplePacketBase; import net.minecraft.client.Minecraft; import net.minecraft.network.PacketBuffer; diff --git a/src/main/java/com/simibubi/create/foundation/utility/IndependentShadowRenderer.java b/src/main/java/com/simibubi/create/foundation/utility/ShadowRenderHelper.java similarity index 98% rename from src/main/java/com/simibubi/create/foundation/utility/IndependentShadowRenderer.java rename to src/main/java/com/simibubi/create/foundation/utility/ShadowRenderHelper.java index 5f112388f..0a8f5349a 100644 --- a/src/main/java/com/simibubi/create/foundation/utility/IndependentShadowRenderer.java +++ b/src/main/java/com/simibubi/create/foundation/utility/ShadowRenderHelper.java @@ -20,7 +20,7 @@ import net.minecraft.world.IWorldReader; /** * Stolen from EntityRendererManager */ -public class IndependentShadowRenderer { +public class ShadowRenderHelper { private static final RenderType SHADOW_LAYER = RenderType.getEntityNoOutline(new ResourceLocation("textures/misc/shadow.png")); @@ -55,6 +55,7 @@ public class IndependentShadowRenderer { if (blockstate.isFullCube(p_229092_2_, blockpos)) { VoxelShape voxelshape = blockstate.getShape(p_229092_2_, p_229092_3_.down()); if (!voxelshape.isEmpty()) { + @SuppressWarnings("deprecation") float f = (float) (((double) p_229092_11_ - (p_229092_6_ - (double) p_229092_3_.getY()) / 2.0D) * 0.5D * (double) p_229092_2_.getBrightness(p_229092_3_)); if (f >= 0.0F) { diff --git a/src/main/java/com/simibubi/create/foundation/utility/render/StructureRenderer.java b/src/main/java/com/simibubi/create/foundation/utility/TileEntityRenderHelper.java similarity index 93% rename from src/main/java/com/simibubi/create/foundation/utility/render/StructureRenderer.java rename to src/main/java/com/simibubi/create/foundation/utility/TileEntityRenderHelper.java index dd26d6b16..9ea079310 100644 --- a/src/main/java/com/simibubi/create/foundation/utility/render/StructureRenderer.java +++ b/src/main/java/com/simibubi/create/foundation/utility/TileEntityRenderHelper.java @@ -1,4 +1,4 @@ -package com.simibubi.create.foundation.utility.render; +package com.simibubi.create.foundation.utility; import java.util.Iterator; @@ -7,9 +7,8 @@ import org.lwjgl.opengl.GL13; import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.systems.RenderSystem; import com.simibubi.create.Create; -import com.simibubi.create.config.AllConfigs; -import com.simibubi.create.foundation.utility.VecHelper; -import com.simibubi.create.foundation.utility.WrappedWorld; +import com.simibubi.create.foundation.config.AllConfigs; +import com.simibubi.create.foundation.utility.worldWrappers.WrappedWorld; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.IRenderTypeBuffer; @@ -23,7 +22,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; -public class StructureRenderer { +public class TileEntityRenderHelper { protected static LightingWorld lightingWorld; diff --git a/src/main/java/com/simibubi/create/foundation/utility/outliner/Outliner.java b/src/main/java/com/simibubi/create/foundation/utility/outliner/Outliner.java index 367972582..282836a24 100644 --- a/src/main/java/com/simibubi/create/foundation/utility/outliner/Outliner.java +++ b/src/main/java/com/simibubi/create/foundation/utility/outliner/Outliner.java @@ -7,7 +7,7 @@ import java.util.Optional; import java.util.Set; import com.mojang.blaze3d.matrix.MatrixStack; -import com.simibubi.create.foundation.behaviour.ValueBox; +import com.simibubi.create.foundation.tileEntity.behaviour.ValueBox; import com.simibubi.create.foundation.utility.outliner.Outline.OutlineParams; import net.minecraft.client.Minecraft; diff --git a/src/main/java/com/simibubi/create/foundation/utility/recipe/RecipeConditions.java b/src/main/java/com/simibubi/create/foundation/utility/recipe/RecipeConditions.java index ea894fee7..adc080537 100644 --- a/src/main/java/com/simibubi/create/foundation/utility/recipe/RecipeConditions.java +++ b/src/main/java/com/simibubi/create/foundation/utility/recipe/RecipeConditions.java @@ -1,7 +1,7 @@ package com.simibubi.create.foundation.utility.recipe; import com.google.common.base.Predicate; -import com.simibubi.create.foundation.behaviour.filtering.FilteringBehaviour; +import com.simibubi.create.foundation.tileEntity.behaviour.filtering.FilteringBehaviour; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; diff --git a/src/main/java/com/simibubi/create/foundation/utility/PlacementSimulationServerWorld.java b/src/main/java/com/simibubi/create/foundation/utility/worldWrappers/PlacementSimulationServerWorld.java similarity index 95% rename from src/main/java/com/simibubi/create/foundation/utility/PlacementSimulationServerWorld.java rename to src/main/java/com/simibubi/create/foundation/utility/worldWrappers/PlacementSimulationServerWorld.java index 942b8917f..121d645b2 100644 --- a/src/main/java/com/simibubi/create/foundation/utility/PlacementSimulationServerWorld.java +++ b/src/main/java/com/simibubi/create/foundation/utility/worldWrappers/PlacementSimulationServerWorld.java @@ -1,4 +1,4 @@ -package com.simibubi.create.foundation.utility; +package com.simibubi.create.foundation.utility.worldWrappers; import java.util.HashMap; import java.util.function.Predicate; diff --git a/src/main/java/com/simibubi/create/foundation/utility/PlacementSimulationWorld.java b/src/main/java/com/simibubi/create/foundation/utility/worldWrappers/PlacementSimulationWorld.java similarity index 95% rename from src/main/java/com/simibubi/create/foundation/utility/PlacementSimulationWorld.java rename to src/main/java/com/simibubi/create/foundation/utility/worldWrappers/PlacementSimulationWorld.java index 8d60868b3..c01cc95c6 100644 --- a/src/main/java/com/simibubi/create/foundation/utility/PlacementSimulationWorld.java +++ b/src/main/java/com/simibubi/create/foundation/utility/worldWrappers/PlacementSimulationWorld.java @@ -1,4 +1,4 @@ -package com.simibubi.create.foundation.utility; +package com.simibubi.create.foundation.utility.worldWrappers; import java.util.HashMap; import java.util.function.Predicate; diff --git a/src/main/java/com/simibubi/create/foundation/utility/RayTraceWorld.java b/src/main/java/com/simibubi/create/foundation/utility/worldWrappers/RayTraceWorld.java similarity index 93% rename from src/main/java/com/simibubi/create/foundation/utility/RayTraceWorld.java rename to src/main/java/com/simibubi/create/foundation/utility/worldWrappers/RayTraceWorld.java index 858da32eb..45843916e 100644 --- a/src/main/java/com/simibubi/create/foundation/utility/RayTraceWorld.java +++ b/src/main/java/com/simibubi/create/foundation/utility/worldWrappers/RayTraceWorld.java @@ -1,4 +1,4 @@ -package com.simibubi.create.foundation.utility; +package com.simibubi.create.foundation.utility.worldWrappers; import java.util.function.BiFunction; diff --git a/src/main/java/com/simibubi/create/foundation/utility/WrappedServerWorld.java b/src/main/java/com/simibubi/create/foundation/utility/worldWrappers/WrappedServerWorld.java similarity index 98% rename from src/main/java/com/simibubi/create/foundation/utility/WrappedServerWorld.java rename to src/main/java/com/simibubi/create/foundation/utility/worldWrappers/WrappedServerWorld.java index b85ef584d..c656b67cb 100644 --- a/src/main/java/com/simibubi/create/foundation/utility/WrappedServerWorld.java +++ b/src/main/java/com/simibubi/create/foundation/utility/worldWrappers/WrappedServerWorld.java @@ -1,4 +1,4 @@ -package com.simibubi.create.foundation.utility; +package com.simibubi.create.foundation.utility.worldWrappers; import java.util.Collections; import java.util.List; diff --git a/src/main/java/com/simibubi/create/foundation/utility/WrappedWorld.java b/src/main/java/com/simibubi/create/foundation/utility/worldWrappers/WrappedWorld.java similarity index 98% rename from src/main/java/com/simibubi/create/foundation/utility/WrappedWorld.java rename to src/main/java/com/simibubi/create/foundation/utility/worldWrappers/WrappedWorld.java index c4142811d..b198db079 100644 --- a/src/main/java/com/simibubi/create/foundation/utility/WrappedWorld.java +++ b/src/main/java/com/simibubi/create/foundation/utility/worldWrappers/WrappedWorld.java @@ -1,4 +1,4 @@ -package com.simibubi.create.foundation.utility; +package com.simibubi.create.foundation.utility.worldWrappers; import java.util.Collections; import java.util.List; diff --git a/src/main/java/com/simibubi/create/foundation/world/AllWorldFeatures.java b/src/main/java/com/simibubi/create/foundation/worldgen/AllWorldFeatures.java similarity index 97% rename from src/main/java/com/simibubi/create/foundation/world/AllWorldFeatures.java rename to src/main/java/com/simibubi/create/foundation/worldgen/AllWorldFeatures.java index ed9a4e833..994d58a02 100644 --- a/src/main/java/com/simibubi/create/foundation/world/AllWorldFeatures.java +++ b/src/main/java/com/simibubi/create/foundation/worldgen/AllWorldFeatures.java @@ -1,4 +1,4 @@ -package com.simibubi.create.foundation.world; +package com.simibubi.create.foundation.worldgen; import static net.minecraft.world.biome.Biome.Category.DESERT; import static net.minecraft.world.biome.Biome.Category.OCEAN; @@ -9,8 +9,8 @@ import java.util.Map; import java.util.Optional; import com.simibubi.create.AllBlocks; +import com.simibubi.create.content.palettes.AllPaletteBlocks; import com.simibubi.create.foundation.utility.Lang; -import com.simibubi.create.modules.palettes.AllPaletteBlocks; import net.minecraft.world.biome.Biome; import net.minecraft.world.biome.Biomes; diff --git a/src/main/java/com/simibubi/create/foundation/world/ChanceOreFeature.java b/src/main/java/com/simibubi/create/foundation/worldgen/ChanceOreFeature.java similarity index 94% rename from src/main/java/com/simibubi/create/foundation/world/ChanceOreFeature.java rename to src/main/java/com/simibubi/create/foundation/worldgen/ChanceOreFeature.java index be7012d30..815517bcc 100644 --- a/src/main/java/com/simibubi/create/foundation/world/ChanceOreFeature.java +++ b/src/main/java/com/simibubi/create/foundation/worldgen/ChanceOreFeature.java @@ -1,4 +1,4 @@ -package com.simibubi.create.foundation.world; +package com.simibubi.create.foundation.worldgen; import org.apache.commons.lang3.tuple.Pair; diff --git a/src/main/java/com/simibubi/create/foundation/world/CountedOreFeature.java b/src/main/java/com/simibubi/create/foundation/worldgen/CountedOreFeature.java similarity index 94% rename from src/main/java/com/simibubi/create/foundation/world/CountedOreFeature.java rename to src/main/java/com/simibubi/create/foundation/worldgen/CountedOreFeature.java index 0bf98ec02..128acec63 100644 --- a/src/main/java/com/simibubi/create/foundation/world/CountedOreFeature.java +++ b/src/main/java/com/simibubi/create/foundation/worldgen/CountedOreFeature.java @@ -1,4 +1,4 @@ -package com.simibubi.create.foundation.world; +package com.simibubi.create.foundation.worldgen; import org.apache.commons.lang3.tuple.Pair; diff --git a/src/main/java/com/simibubi/create/foundation/world/IFeature.java b/src/main/java/com/simibubi/create/foundation/worldgen/IFeature.java similarity index 90% rename from src/main/java/com/simibubi/create/foundation/world/IFeature.java rename to src/main/java/com/simibubi/create/foundation/worldgen/IFeature.java index 5a56918d4..f4137500b 100644 --- a/src/main/java/com/simibubi/create/foundation/world/IFeature.java +++ b/src/main/java/com/simibubi/create/foundation/worldgen/IFeature.java @@ -1,4 +1,4 @@ -package com.simibubi.create.foundation.world; +package com.simibubi.create.foundation.worldgen; import java.util.Optional; diff --git a/src/main/java/com/simibubi/create/foundation/world/OreFeature.java b/src/main/java/com/simibubi/create/foundation/worldgen/OreFeature.java similarity index 94% rename from src/main/java/com/simibubi/create/foundation/world/OreFeature.java rename to src/main/java/com/simibubi/create/foundation/worldgen/OreFeature.java index 6dc8132de..77064a594 100644 --- a/src/main/java/com/simibubi/create/foundation/world/OreFeature.java +++ b/src/main/java/com/simibubi/create/foundation/worldgen/OreFeature.java @@ -1,11 +1,11 @@ -package com.simibubi.create.foundation.world; +package com.simibubi.create.foundation.worldgen; import java.util.Optional; import org.apache.commons.lang3.tuple.Pair; -import com.simibubi.create.config.AllConfigs; -import com.simibubi.create.config.ConfigBase; +import com.simibubi.create.foundation.config.AllConfigs; +import com.simibubi.create.foundation.config.ConfigBase; import com.tterrag.registrate.util.nullness.NonNullSupplier; import net.minecraft.block.Block; diff --git a/src/main/java/com/simibubi/create/foundation/world/OxidizingBlock.java b/src/main/java/com/simibubi/create/foundation/worldgen/OxidizingBlock.java similarity index 97% rename from src/main/java/com/simibubi/create/foundation/world/OxidizingBlock.java rename to src/main/java/com/simibubi/create/foundation/worldgen/OxidizingBlock.java index 3fc064305..d93f8a9e2 100644 --- a/src/main/java/com/simibubi/create/foundation/world/OxidizingBlock.java +++ b/src/main/java/com/simibubi/create/foundation/worldgen/OxidizingBlock.java @@ -1,4 +1,4 @@ -package com.simibubi.create.foundation.world; +package com.simibubi.create.foundation.worldgen; import java.util.LinkedList; import java.util.OptionalDouble; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/bearing/IBearingTileEntity.java b/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/bearing/IBearingTileEntity.java deleted file mode 100644 index 97b3e060e..000000000 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/bearing/IBearingTileEntity.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.simibubi.create.modules.contraptions.components.contraptions.bearing; - -import com.simibubi.create.modules.contraptions.components.contraptions.IControlContraption; - -public interface IBearingTileEntity extends IControlContraption { - - float getInterpolatedAngle(float partialTicks); - -} diff --git a/src/main/java/com/simibubi/create/modules/curiosities/zapper/terrainzapper/PlacementOptions.java b/src/main/java/com/simibubi/create/modules/curiosities/zapper/terrainzapper/PlacementOptions.java deleted file mode 100644 index b443495ef..000000000 --- a/src/main/java/com/simibubi/create/modules/curiosities/zapper/terrainzapper/PlacementOptions.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.simibubi.create.modules.curiosities.zapper.terrainzapper; - -import com.simibubi.create.ScreenResources; -import com.simibubi.create.foundation.utility.Lang; - -public enum PlacementOptions { - - Merged(ScreenResources.I_CENTERED), - Attached(ScreenResources.I_ATTACHED), - Inserted(ScreenResources.I_INSERTED); - - public String translationKey; - public ScreenResources icon; - - private PlacementOptions(ScreenResources icon) { - this.translationKey = Lang.asId(name()); - this.icon = icon; - } - -}