mirrors/Flywheel
0
0
Fork 0
mirror of https://github.com/Jozufozu/Flywheel.git synced 2025-02-24 19:05:34 +01:00
Code Issues Projects Releases Packages Wiki Activity

Re-organized packages and utilities

Browse source
This commit is contained in:
simibubi 2020-05-23 14:02:38 +02:00
parent 029b7e2123
commit 78ad674c22
554 changed files with 2560 additions and 3168 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

199
src/main/java/com/simibubi/create/AllBlocks.java
View file

@ -1,102 +1,103 @@
package com.simibubi.create; package com.simibubi.create;
import static com.simibubi.create.foundation.registrate.CreateRegistrate.connectedTextures; import static com.simibubi.create.content.AllSections.SCHEMATICS;
import static com.simibubi.create.foundation.utility.data.BlockStateGen.oxidizedBlockstate; import static com.simibubi.create.foundation.data.BlockStateGen.oxidizedBlockstate;
import static com.simibubi.create.foundation.utility.data.ModelGen.customItemModel; import static com.simibubi.create.foundation.data.CreateRegistrate.connectedTextures;
import static com.simibubi.create.foundation.utility.data.ModelGen.oxidizedItemModel; import static com.simibubi.create.foundation.data.ModelGen.customItemModel;
import static com.simibubi.create.modules.Sections.SCHEMATICS; import static com.simibubi.create.foundation.data.ModelGen.oxidizedItemModel;
import com.simibubi.create.config.StressConfigDefaults; import com.simibubi.create.content.AllSections;
import com.simibubi.create.foundation.registrate.CreateRegistrate; import com.simibubi.create.content.contraptions.base.CasingBlock;
import com.simibubi.create.foundation.utility.data.AssetLookup; import com.simibubi.create.content.contraptions.components.actors.DrillBlock;
import com.simibubi.create.foundation.utility.data.BlockStateGen; import com.simibubi.create.content.contraptions.components.actors.HarvesterBlock;
import com.simibubi.create.foundation.utility.data.BuilderTransformers; import com.simibubi.create.content.contraptions.components.actors.PloughBlock;
import com.simibubi.create.foundation.utility.data.ModelGen; import com.simibubi.create.content.contraptions.components.actors.PortableStorageInterfaceBlock;
import com.simibubi.create.foundation.world.OxidizingBlock; import com.simibubi.create.content.contraptions.components.clock.CuckooClockBlock;
import com.simibubi.create.modules.Sections; import com.simibubi.create.content.contraptions.components.crafter.MechanicalCrafterBlock;
import com.simibubi.create.modules.contraptions.CasingBlock; import com.simibubi.create.content.contraptions.components.crank.HandCrankBlock;
import com.simibubi.create.modules.contraptions.components.actors.DrillBlock; import com.simibubi.create.content.contraptions.components.crusher.CrushingWheelBlock;
import com.simibubi.create.modules.contraptions.components.actors.HarvesterBlock; import com.simibubi.create.content.contraptions.components.crusher.CrushingWheelControllerBlock;
import com.simibubi.create.modules.contraptions.components.actors.PloughBlock; import com.simibubi.create.content.contraptions.components.deployer.DeployerBlock;
import com.simibubi.create.modules.contraptions.components.actors.PortableStorageInterfaceBlock; import com.simibubi.create.content.contraptions.components.fan.EncasedFanBlock;
import com.simibubi.create.modules.contraptions.components.clock.CuckooClockBlock; import com.simibubi.create.content.contraptions.components.fan.NozzleBlock;
import com.simibubi.create.modules.contraptions.components.contraptions.bearing.ClockworkBearingBlock; import com.simibubi.create.content.contraptions.components.flywheel.FlywheelBlock;
import com.simibubi.create.modules.contraptions.components.contraptions.bearing.MechanicalBearingBlock; import com.simibubi.create.content.contraptions.components.flywheel.FlywheelGenerator;
import com.simibubi.create.modules.contraptions.components.contraptions.chassis.LinearChassisBlock; import com.simibubi.create.content.contraptions.components.flywheel.engine.FurnaceEngineBlock;
import com.simibubi.create.modules.contraptions.components.contraptions.chassis.LinearChassisBlock.ChassisCTBehaviour; import com.simibubi.create.content.contraptions.components.millstone.MillstoneBlock;
import com.simibubi.create.modules.contraptions.components.contraptions.chassis.RadialChassisBlock; import com.simibubi.create.content.contraptions.components.mixer.BasinOperatorBlockItem;
import com.simibubi.create.modules.contraptions.components.contraptions.mounted.CartAssemblerBlock; import com.simibubi.create.content.contraptions.components.mixer.MechanicalMixerBlock;
import com.simibubi.create.modules.contraptions.components.contraptions.mounted.CartAssemblerBlock.MinecartAnchorBlock; import com.simibubi.create.content.contraptions.components.motor.MotorBlock;
import com.simibubi.create.modules.contraptions.components.contraptions.piston.MechanicalPistonBlock; import com.simibubi.create.content.contraptions.components.motor.MotorGenerator;
import com.simibubi.create.modules.contraptions.components.contraptions.piston.MechanicalPistonHeadBlock; import com.simibubi.create.content.contraptions.components.press.MechanicalPressBlock;
import com.simibubi.create.modules.contraptions.components.contraptions.piston.PistonExtensionPoleBlock; import com.simibubi.create.content.contraptions.components.saw.SawBlock;
import com.simibubi.create.modules.contraptions.components.contraptions.pulley.PulleyBlock; import com.simibubi.create.content.contraptions.components.saw.SawGenerator;
import com.simibubi.create.modules.contraptions.components.crafter.MechanicalCrafterBlock; import com.simibubi.create.content.contraptions.components.structureMovement.bearing.ClockworkBearingBlock;
import com.simibubi.create.modules.contraptions.components.crank.HandCrankBlock; import com.simibubi.create.content.contraptions.components.structureMovement.bearing.MechanicalBearingBlock;
import com.simibubi.create.modules.contraptions.components.crusher.CrushingWheelBlock; import com.simibubi.create.content.contraptions.components.structureMovement.chassis.LinearChassisBlock;
import com.simibubi.create.modules.contraptions.components.crusher.CrushingWheelControllerBlock; import com.simibubi.create.content.contraptions.components.structureMovement.chassis.RadialChassisBlock;
import com.simibubi.create.modules.contraptions.components.deployer.DeployerBlock; import com.simibubi.create.content.contraptions.components.structureMovement.chassis.LinearChassisBlock.ChassisCTBehaviour;
import com.simibubi.create.modules.contraptions.components.fan.EncasedFanBlock; import com.simibubi.create.content.contraptions.components.structureMovement.mounted.CartAssemblerBlock;
import com.simibubi.create.modules.contraptions.components.fan.NozzleBlock; import com.simibubi.create.content.contraptions.components.structureMovement.mounted.CartAssemblerBlock.MinecartAnchorBlock;
import com.simibubi.create.modules.contraptions.components.flywheel.FlywheelBlock; import com.simibubi.create.content.contraptions.components.structureMovement.piston.MechanicalPistonBlock;
import com.simibubi.create.modules.contraptions.components.flywheel.FlywheelGenerator; import com.simibubi.create.content.contraptions.components.structureMovement.piston.MechanicalPistonHeadBlock;
import com.simibubi.create.modules.contraptions.components.flywheel.engine.FurnaceEngineBlock; import com.simibubi.create.content.contraptions.components.structureMovement.piston.PistonExtensionPoleBlock;
import com.simibubi.create.modules.contraptions.components.millstone.MillstoneBlock; import com.simibubi.create.content.contraptions.components.structureMovement.pulley.PulleyBlock;
import com.simibubi.create.modules.contraptions.components.mixer.BasinOperatorBlockItem; import com.simibubi.create.content.contraptions.components.turntable.TurntableBlock;
import com.simibubi.create.modules.contraptions.components.mixer.MechanicalMixerBlock; import com.simibubi.create.content.contraptions.components.waterwheel.WaterWheelBlock;
import com.simibubi.create.modules.contraptions.components.motor.MotorBlock; import com.simibubi.create.content.contraptions.processing.BasinBlock;
import com.simibubi.create.modules.contraptions.components.motor.MotorGenerator; import com.simibubi.create.content.contraptions.relays.advanced.SpeedControllerBlock;
import com.simibubi.create.modules.contraptions.components.press.MechanicalPressBlock; import com.simibubi.create.content.contraptions.relays.advanced.sequencer.SequencedGearshiftBlock;
import com.simibubi.create.modules.contraptions.components.saw.SawBlock; import com.simibubi.create.content.contraptions.relays.advanced.sequencer.SequencedGearshiftGenerator;
import com.simibubi.create.modules.contraptions.components.saw.SawGenerator; import com.simibubi.create.content.contraptions.relays.belt.BeltBlock;
import com.simibubi.create.modules.contraptions.components.turntable.TurntableBlock; import com.simibubi.create.content.contraptions.relays.belt.BeltGenerator;
import com.simibubi.create.modules.contraptions.components.waterwheel.WaterWheelBlock; import com.simibubi.create.content.contraptions.relays.elementary.CogWheelBlock;
import com.simibubi.create.modules.contraptions.processing.BasinBlock; import com.simibubi.create.content.contraptions.relays.elementary.CogwheelBlockItem;
import com.simibubi.create.modules.contraptions.redstone.AnalogLeverBlock; import com.simibubi.create.content.contraptions.relays.elementary.ShaftBlock;
import com.simibubi.create.modules.contraptions.redstone.RedstoneContactBlock; import com.simibubi.create.content.contraptions.relays.encased.AdjustablePulleyBlock;
import com.simibubi.create.modules.contraptions.relays.advanced.SpeedControllerBlock; import com.simibubi.create.content.contraptions.relays.encased.ClutchBlock;
import com.simibubi.create.modules.contraptions.relays.advanced.sequencer.SequencedGearshiftBlock; import com.simibubi.create.content.contraptions.relays.encased.EncasedBeltBlock;
import com.simibubi.create.modules.contraptions.relays.advanced.sequencer.SequencedGearshiftGenerator; import com.simibubi.create.content.contraptions.relays.encased.EncasedBeltGenerator;
import com.simibubi.create.modules.contraptions.relays.belt.BeltBlock; import com.simibubi.create.content.contraptions.relays.encased.EncasedShaftBlock;
import com.simibubi.create.modules.contraptions.relays.belt.BeltGenerator; import com.simibubi.create.content.contraptions.relays.encased.GearshiftBlock;
import com.simibubi.create.modules.contraptions.relays.elementary.CogWheelBlock; import com.simibubi.create.content.contraptions.relays.gauge.GaugeBlock;
import com.simibubi.create.modules.contraptions.relays.elementary.CogwheelBlockItem; import com.simibubi.create.content.contraptions.relays.gauge.GaugeGenerator;
import com.simibubi.create.modules.contraptions.relays.elementary.ShaftBlock; import com.simibubi.create.content.contraptions.relays.gearbox.GearboxBlock;
import com.simibubi.create.modules.contraptions.relays.encased.AdjustablePulleyBlock; import com.simibubi.create.content.logistics.block.belts.observer.BeltObserverBlock;
import com.simibubi.create.modules.contraptions.relays.encased.ClutchBlock; import com.simibubi.create.content.logistics.block.belts.tunnel.BeltTunnelBlock;
import com.simibubi.create.modules.contraptions.relays.encased.EncasedBeltBlock; import com.simibubi.create.content.logistics.block.diodes.AbstractDiodeGenerator;
import com.simibubi.create.modules.contraptions.relays.encased.EncasedBeltGenerator; import com.simibubi.create.content.logistics.block.diodes.AdjustableRepeaterBlock;
import com.simibubi.create.modules.contraptions.relays.encased.EncasedShaftBlock; import com.simibubi.create.content.logistics.block.diodes.AdjustableRepeaterGenerator;
import com.simibubi.create.modules.contraptions.relays.encased.GearshiftBlock; import com.simibubi.create.content.logistics.block.diodes.PoweredLatchBlock;
import com.simibubi.create.modules.contraptions.relays.gauge.GaugeBlock; import com.simibubi.create.content.logistics.block.diodes.PoweredLatchGenerator;
import com.simibubi.create.modules.contraptions.relays.gauge.GaugeGenerator; import com.simibubi.create.content.logistics.block.diodes.PulseRepeaterBlock;
import com.simibubi.create.modules.contraptions.relays.gearbox.GearboxBlock; import com.simibubi.create.content.logistics.block.diodes.PulseRepeaterGenerator;
import com.simibubi.create.modules.logistics.block.RedstoneLinkBlock; import com.simibubi.create.content.logistics.block.diodes.ToggleLatchBlock;
import com.simibubi.create.modules.logistics.block.RedstoneLinkGenerator; import com.simibubi.create.content.logistics.block.diodes.ToggleLatchGenerator;
import com.simibubi.create.modules.logistics.block.StockpileSwitchBlock; import com.simibubi.create.content.logistics.block.extractor.ExtractorBlock;
import com.simibubi.create.modules.logistics.block.belts.observer.BeltObserverBlock; import com.simibubi.create.content.logistics.block.extractor.LinkedExtractorBlock;
import com.simibubi.create.modules.logistics.block.belts.tunnel.BeltTunnelBlock; import com.simibubi.create.content.logistics.block.extractor.VerticalExtractorGenerator;
import com.simibubi.create.modules.logistics.block.diodes.AbstractDiodeGenerator; import com.simibubi.create.content.logistics.block.funnel.FunnelBlock;
import com.simibubi.create.modules.logistics.block.diodes.AdjustableRepeaterBlock; import com.simibubi.create.content.logistics.block.funnel.VerticalFunnelGenerator;
import com.simibubi.create.modules.logistics.block.diodes.AdjustableRepeaterGenerator; import com.simibubi.create.content.logistics.block.inventories.AdjustableCrateBlock;
import com.simibubi.create.modules.logistics.block.diodes.PoweredLatchBlock; import com.simibubi.create.content.logistics.block.inventories.CreativeCrateBlock;
import com.simibubi.create.modules.logistics.block.diodes.PoweredLatchGenerator; import com.simibubi.create.content.logistics.block.redstone.AnalogLeverBlock;
import com.simibubi.create.modules.logistics.block.diodes.PulseRepeaterBlock; import com.simibubi.create.content.logistics.block.redstone.RedstoneContactBlock;
import com.simibubi.create.modules.logistics.block.diodes.PulseRepeaterGenerator; import com.simibubi.create.content.logistics.block.redstone.RedstoneLinkBlock;
import com.simibubi.create.modules.logistics.block.diodes.ToggleLatchBlock; import com.simibubi.create.content.logistics.block.redstone.RedstoneLinkGenerator;
import com.simibubi.create.modules.logistics.block.diodes.ToggleLatchGenerator; import com.simibubi.create.content.logistics.block.redstone.StockpileSwitchBlock;
import com.simibubi.create.modules.logistics.block.extractor.ExtractorBlock; import com.simibubi.create.content.logistics.block.transposer.LinkedTransposerBlock;
import com.simibubi.create.modules.logistics.block.extractor.LinkedExtractorBlock; import com.simibubi.create.content.logistics.block.transposer.TransposerBlock;
import com.simibubi.create.modules.logistics.block.extractor.VerticalExtractorGenerator; import com.simibubi.create.content.logistics.block.transposer.VerticalTransposerGenerator;
import com.simibubi.create.modules.logistics.block.funnel.FunnelBlock; import com.simibubi.create.content.schematics.block.SchematicTableBlock;
import com.simibubi.create.modules.logistics.block.funnel.VerticalFunnelGenerator; import com.simibubi.create.content.schematics.block.SchematicannonBlock;
import com.simibubi.create.modules.logistics.block.inventories.AdjustableCrateBlock; import com.simibubi.create.foundation.config.StressConfigDefaults;
import com.simibubi.create.modules.logistics.block.inventories.CreativeCrateBlock; import com.simibubi.create.foundation.data.AssetLookup;
import com.simibubi.create.modules.logistics.block.transposer.LinkedTransposerBlock; import com.simibubi.create.foundation.data.BlockStateGen;
import com.simibubi.create.modules.logistics.block.transposer.TransposerBlock; import com.simibubi.create.foundation.data.BuilderTransformers;
import com.simibubi.create.modules.logistics.block.transposer.VerticalTransposerGenerator; import com.simibubi.create.foundation.data.CreateRegistrate;
import com.simibubi.create.modules.schematics.block.SchematicTableBlock; import com.simibubi.create.foundation.data.ModelGen;
import com.simibubi.create.modules.schematics.block.SchematicannonBlock; 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.BlockBuilder;
import com.tterrag.registrate.builders.ItemBuilder; import com.tterrag.registrate.builders.ItemBuilder;
import com.tterrag.registrate.util.DataIngredient; import com.tterrag.registrate.util.DataIngredient;
@ -150,7 +151,7 @@ public class AllBlocks {
// Kinetics // Kinetics
static { static {
REGISTRATE.startSection(Sections.KINETICS); REGISTRATE.startSection(AllSections.KINETICS);
} }
public static final BlockEntry<ShaftBlock> SHAFT = REGISTRATE.block("shaft", ShaftBlock::new) public static final BlockEntry<ShaftBlock> SHAFT = REGISTRATE.block("shaft", ShaftBlock::new)
@ -591,7 +592,7 @@ public class AllBlocks {
// Logistics // Logistics
static { static {
REGISTRATE.startSection(Sections.LOGISTICS); REGISTRATE.startSection(AllSections.LOGISTICS);
} }
public static final BlockEntry<RedstoneContactBlock> REDSTONE_CONTACT = public static final BlockEntry<RedstoneContactBlock> REDSTONE_CONTACT =
@ -781,7 +782,7 @@ public class AllBlocks {
// Materials // Materials
static { static {
REGISTRATE.startSection(Sections.MATERIALS); REGISTRATE.startSection(AllSections.MATERIALS);
} }
public static final BlockEntry<OxidizingBlock> COPPER_ORE = public static final BlockEntry<OxidizingBlock> COPPER_ORE =

28
src/main/java/com/simibubi/create/AllContainers.java → src/main/java/com/simibubi/create/AllContainerTypes.java
View file

@ -1,16 +1,16 @@
package com.simibubi.create; 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.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.IHasContainer;
import net.minecraft.client.gui.ScreenManager; import net.minecraft.client.gui.ScreenManager;
@ -25,7 +25,7 @@ import net.minecraftforge.api.distmarker.OnlyIn;
import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.event.RegistryEvent;
import net.minecraftforge.fml.network.IContainerFactory; import net.minecraftforge.fml.network.IContainerFactory;
public enum AllContainers { public enum AllContainerTypes {
SCHEMATIC_TABLE(SchematicTableContainer::new), SCHEMATIC_TABLE(SchematicTableContainer::new),
SCHEMATICANNON(SchematicannonContainer::new), SCHEMATICANNON(SchematicannonContainer::new),
@ -38,12 +38,12 @@ public enum AllContainers {
public ContainerType<? extends Container> type; public ContainerType<? extends Container> type;
private IFactory<?> factory; private IFactory<?> factory;
private <C extends Container> AllContainers(IContainerFactory<C> factory) { private <C extends Container> AllContainerTypes(IContainerFactory<C> factory) {
this.factory = factory; this.factory = factory;
} }
public static void register(RegistryEvent.Register<ContainerType<?>> event) { public static void register(RegistryEvent.Register<ContainerType<?>> event) {
for (AllContainers container : values()) { for (AllContainerTypes container : values()) {
container.type = new ContainerType<>(container.factory) container.type = new ContainerType<>(container.factory)
.setRegistryName(new ResourceLocation(Create.ID, Lang.asId(container.name()))); .setRegistryName(new ResourceLocation(Create.ID, Lang.asId(container.name())));
event.getRegistry().register(container.type); event.getRegistry().register(container.type);
@ -61,7 +61,7 @@ public enum AllContainers {
@OnlyIn(Dist.CLIENT) @OnlyIn(Dist.CLIENT)
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
private static <C extends Container, S extends Screen & IHasContainer<C>> void bind(AllContainers c, private static <C extends Container, S extends Screen & IHasContainer<C>> void bind(AllContainerTypes c,
IScreenFactory<C, S> factory) { IScreenFactory<C, S> factory) {
ScreenManager.registerFactory((ContainerType<C>) c.type, factory); ScreenManager.registerFactory((ContainerType<C>) c.type, factory);
} }

14
src/main/java/com/simibubi/create/AllEntities.java → src/main/java/com/simibubi/create/AllEntityTypes.java
View file

@ -2,11 +2,11 @@ package com.simibubi.create;
import java.util.function.Function; 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.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.Entity;
import net.minecraft.entity.EntityClassification; import net.minecraft.entity.EntityClassification;
@ -19,7 +19,7 @@ import net.minecraftforge.api.distmarker.OnlyIn;
import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.event.RegistryEvent;
import net.minecraftforge.fml.client.registry.RenderingRegistry; import net.minecraftforge.fml.client.registry.RenderingRegistry;
public enum AllEntities { public enum AllEntityTypes {
CONTRAPTION(ContraptionEntity::new, EntityClassification.MISC, 5, 3, true, ContraptionEntity::build), CONTRAPTION(ContraptionEntity::new, EntityClassification.MISC, 5, 3, true, ContraptionEntity::build),
STATIONARY_CONTRAPTION(ContraptionEntity::new, EntityClassification.MISC, 20, 40, false, ContraptionEntity::build), STATIONARY_CONTRAPTION(ContraptionEntity::new, EntityClassification.MISC, 20, 40, false, ContraptionEntity::build),
@ -36,7 +36,7 @@ public enum AllEntities {
public EntityType<? extends Entity> type; public EntityType<? extends Entity> type;
private AllEntities(IFactory<?> factory, EntityClassification group, int range, int updateFrequency, private AllEntityTypes(IFactory<?> factory, EntityClassification group, int range, int updateFrequency,
boolean sendVelocity, boolean sendVelocity,
Function<EntityType.Builder<? extends Entity>, EntityType.Builder<? extends Entity>> propertyBuilder) { Function<EntityType.Builder<? extends Entity>, EntityType.Builder<? extends Entity>> propertyBuilder) {
this.factory = factory; this.factory = factory;
@ -48,7 +48,7 @@ public enum AllEntities {
} }
public static void register(final RegistryEvent.Register<EntityType<?>> event) { public static void register(final RegistryEvent.Register<EntityType<?>> event) {
for (AllEntities entity : values()) { for (AllEntityTypes entity : values()) {
String id = Lang.asId(entity.name()); String id = Lang.asId(entity.name());
ResourceLocation resourceLocation = new ResourceLocation(Create.ID, id); ResourceLocation resourceLocation = new ResourceLocation(Create.ID, id);
Builder<? extends Entity> builder = EntityType.Builder Builder<? extends Entity> builder = EntityType.Builder

56
src/main/java/com/simibubi/create/AllItems.java
View file

@ -4,29 +4,29 @@ import java.util.HashSet;
import java.util.Set; import java.util.Set;
import java.util.function.Function; 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.IHaveCustomItemModel;
import com.simibubi.create.foundation.item.IItemWithColorHandler; import com.simibubi.create.foundation.item.IItemWithColorHandler;
import com.simibubi.create.foundation.utility.Lang; 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.Minecraft;
import net.minecraft.client.renderer.color.ItemColors; import net.minecraft.client.renderer.color.ItemColors;
@ -47,7 +47,7 @@ import net.minecraftforge.registries.IForgeRegistry;
@EventBusSubscriber(value = Dist.CLIENT, bus = Bus.MOD) @EventBusSubscriber(value = Dist.CLIENT, bus = Bus.MOD)
public enum AllItems { public enum AllItems {
_1_(Sections.MATERIALS), _1_(AllSections.MATERIALS),
COPPER_NUGGET((TaggedItem) new TaggedItem().withForgeTags("nuggets/copper")), COPPER_NUGGET((TaggedItem) new TaggedItem().withForgeTags("nuggets/copper")),
ZINC_NUGGET((TaggedItem) new TaggedItem().withForgeTags("nuggets/zinc")), ZINC_NUGGET((TaggedItem) new TaggedItem().withForgeTags("nuggets/zinc")),
@ -80,7 +80,7 @@ public enum AllItems {
ELECTRON_TUBE, ELECTRON_TUBE,
INTEGRATED_CIRCUIT, INTEGRATED_CIRCUIT,
_2_(Sections.KINETICS), _2_(AllSections.KINETICS),
BELT_CONNECTOR(BeltConnectorItem::new), BELT_CONNECTOR(BeltConnectorItem::new),
VERTICAL_GEARBOX(VerticalGearboxItem::new), VERTICAL_GEARBOX(VerticalGearboxItem::new),
@ -96,12 +96,12 @@ public enum AllItems {
MINECART_CONTRAPTION(p -> new MinecartContraptionItem(Type.RIDEABLE, p)), MINECART_CONTRAPTION(p -> new MinecartContraptionItem(Type.RIDEABLE, p)),
FURNACE_MINECART_CONTRAPTION(p -> new MinecartContraptionItem(Type.FURNACE, p)), FURNACE_MINECART_CONTRAPTION(p -> new MinecartContraptionItem(Type.FURNACE, p)),
_3_(Sections.LOGISTICS), _3_(AllSections.LOGISTICS),
FILTER(FilterItem::new), FILTER(FilterItem::new),
PROPERTY_FILTER(FilterItem::new), PROPERTY_FILTER(FilterItem::new),
_4_(Sections.CURIOSITIES), _4_(AllSections.CURIOSITIES),
TREE_FERTILIZER(TreeFertilizerItem::new), TREE_FERTILIZER(TreeFertilizerItem::new),
PLACEMENT_HANDGUN(BlockzapperItem::new), PLACEMENT_HANDGUN(BlockzapperItem::new),
@ -109,7 +109,7 @@ public enum AllItems {
DEFORESTER(DeforesterItem::new), DEFORESTER(DeforesterItem::new),
SYMMETRY_WAND(SymmetryWandItem::new), SYMMETRY_WAND(SymmetryWandItem::new),
_5_(Sections.SCHEMATICS), _5_(AllSections.SCHEMATICS),
EMPTY_BLUEPRINT(Item::new, stackSize(1)), EMPTY_BLUEPRINT(Item::new, stackSize(1)),
BLUEPRINT_AND_QUILL(SchematicAndQuillItem::new, stackSize(1)), BLUEPRINT_AND_QUILL(SchematicAndQuillItem::new, stackSize(1)),
@ -118,17 +118,17 @@ public enum AllItems {
; ;
private static class SectionTracker { private static class SectionTracker {
static Sections currentSection; static AllSections currentSection;
} }
// Common // Common
public Sections section; public AllSections section;
private Function<Properties, Properties> specialProperties; private Function<Properties, Properties> specialProperties;
private TaggedItem taggedItem; private TaggedItem taggedItem;
private Item item; private Item item;
AllItems(Sections section) { AllItems(AllSections section) {
SectionTracker.currentSection = section; SectionTracker.currentSection = section;
taggedItem = new TaggedItem(null); taggedItem = new TaggedItem(null);
} }

14
src/main/java/com/simibubi/create/AllParticles.java → src/main/java/com/simibubi/create/AllParticleTypes.java
View file

@ -2,10 +2,10 @@ package com.simibubi.create;
import java.util.function.Supplier; 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.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.Minecraft;
import net.minecraft.client.particle.ParticleManager; import net.minecraft.client.particle.ParticleManager;
@ -18,7 +18,7 @@ import net.minecraftforge.client.event.ParticleFactoryRegisterEvent;
import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.event.RegistryEvent;
import net.minecraftforge.registries.IForgeRegistry; import net.minecraftforge.registries.IForgeRegistry;
public enum AllParticles { public enum AllParticleTypes {
ROTATION_INDICATOR(RotationIndicatorParticleData::new), ROTATION_INDICATOR(RotationIndicatorParticleData::new),
AIR_FLOW(AirFlowParticleData::new), AIR_FLOW(AirFlowParticleData::new),
@ -27,20 +27,20 @@ public enum AllParticles {
private ParticleEntry<?> entry; private ParticleEntry<?> entry;
private <D extends IParticleData> AllParticles(Supplier<? extends ICustomParticle<D>> typeFactory) { private <D extends IParticleData> AllParticleTypes(Supplier<? extends ICustomParticle<D>> typeFactory) {
String asId = Lang.asId(this.name()); String asId = Lang.asId(this.name());
entry = new ParticleEntry<D>(new ResourceLocation(Create.ID, asId), typeFactory); entry = new ParticleEntry<D>(new ResourceLocation(Create.ID, asId), typeFactory);
} }
public static void register(RegistryEvent.Register<ParticleType<?>> event) { public static void register(RegistryEvent.Register<ParticleType<?>> event) {
for (AllParticles particle : values()) for (AllParticleTypes particle : values())
particle.entry.register(event.getRegistry()); particle.entry.register(event.getRegistry());
} }
@OnlyIn(Dist.CLIENT) @OnlyIn(Dist.CLIENT)
public static void registerFactories(ParticleFactoryRegisterEvent event) { public static void registerFactories(ParticleFactoryRegisterEvent event) {
ParticleManager particles = Minecraft.getInstance().particles; ParticleManager particles = Minecraft.getInstance().particles;
for (AllParticles particle : values()) for (AllParticleTypes particle : values())
particle.entry.registerFactory(particles); particle.entry.registerFactory(particles);
} }

32
src/main/java/com/simibubi/create/AllRecipes.java → src/main/java/com/simibubi/create/AllRecipeTypes.java
View file

@ -3,19 +3,19 @@ package com.simibubi.create;
import java.util.function.Supplier; import java.util.function.Supplier;
import com.simibubi.create.compat.jei.ConversionRecipe; 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.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.inventory.IInventory;
import net.minecraft.item.crafting.IRecipe; import net.minecraft.item.crafting.IRecipe;
@ -26,7 +26,7 @@ import net.minecraft.util.ResourceLocation;
import net.minecraft.util.registry.Registry; import net.minecraft.util.registry.Registry;
import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.event.RegistryEvent;
public enum AllRecipes { public enum AllRecipeTypes {
BLOCKZAPPER_UPGRADE(BlockzapperUpgradeRecipe.Serializer::new, IRecipeType.CRAFTING), BLOCKZAPPER_UPGRADE(BlockzapperUpgradeRecipe.Serializer::new, IRecipeType.CRAFTING),
MECHANICAL_CRAFTING(MechanicalCraftingRecipe.Serializer::new), MECHANICAL_CRAFTING(MechanicalCraftingRecipe.Serializer::new),
@ -50,11 +50,11 @@ public enum AllRecipes {
return (T) type; return (T) type;
} }
private AllRecipes(Supplier<IRecipeSerializer<?>> supplier) { private AllRecipeTypes(Supplier<IRecipeSerializer<?>> supplier) {
this(supplier, null); this(supplier, null);
} }
private AllRecipes(Supplier<IRecipeSerializer<?>> supplier, private AllRecipeTypes(Supplier<IRecipeSerializer<?>> supplier,
IRecipeType<? extends IRecipe<? extends IInventory>> existingType) { IRecipeType<? extends IRecipe<? extends IInventory>> existingType) {
this.supplier = supplier; this.supplier = supplier;
this.type = existingType; this.type = existingType;
@ -63,7 +63,7 @@ public enum AllRecipes {
public static void register(RegistryEvent.Register<IRecipeSerializer<?>> event) { public static void register(RegistryEvent.Register<IRecipeSerializer<?>> event) {
ShapedRecipe.setCraftingSize(9, 9); ShapedRecipe.setCraftingSize(9, 9);
for (AllRecipes r : AllRecipes.values()) { for (AllRecipeTypes r : AllRecipeTypes.values()) {
if (r.type == null) if (r.type == null)
r.type = customType(Lang.asId(r.name())); r.type = customType(Lang.asId(r.name()));

4
src/main/java/com/simibubi/create/foundation/utility/AllShapes.java → src/main/java/com/simibubi/create/AllShapes.java
View file

@ -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.NORTH;
import static net.minecraft.util.Direction.SOUTH; import static net.minecraft.util.Direction.SOUTH;
@ -6,6 +6,8 @@ import static net.minecraft.util.Direction.UP;
import java.util.function.BiFunction; import java.util.function.BiFunction;
import com.simibubi.create.foundation.utility.VoxelShaper;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.Blocks; import net.minecraft.block.Blocks;
import net.minecraft.block.DirectionalBlock; import net.minecraft.block.DirectionalBlock;

6
src/main/java/com/simibubi/create/AllSpriteShifts.java
View file

@ -8,14 +8,14 @@ import static com.simibubi.create.foundation.block.connected.CTSpriteShifter.CTT
import java.util.IdentityHashMap; import java.util.IdentityHashMap;
import java.util.Map; 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.CTSpriteShiftEntry;
import com.simibubi.create.foundation.block.connected.CTSpriteShifter.CTType; import com.simibubi.create.foundation.block.connected.CTSpriteShifter.CTType;
import com.simibubi.create.foundation.block.render.SpriteShiftEntry; import com.simibubi.create.foundation.block.render.SpriteShiftEntry;
import com.simibubi.create.foundation.block.render.SpriteShifter; import com.simibubi.create.foundation.block.render.SpriteShifter;
import com.simibubi.create.foundation.utility.Lang; 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; import net.minecraft.block.WoodType;

170
src/main/java/com/simibubi/create/AllTileEntities.java
View file

@ -3,92 +3,92 @@ package com.simibubi.create;
import java.util.function.Function; import java.util.function.Function;
import java.util.function.Supplier; 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.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.block.Block;
import net.minecraft.client.renderer.tileentity.TileEntityRenderer; import net.minecraft.client.renderer.tileentity.TileEntityRenderer;

16
src/main/java/com/simibubi/create/ClientEvents.java
View file

@ -4,17 +4,17 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.matrix.MatrixStack;
import com.simibubi.create.config.AllConfigs; import com.simibubi.create.content.contraptions.KineticDebugger;
import com.simibubi.create.foundation.behaviour.filtering.FilteringHandler; import com.simibubi.create.content.contraptions.base.KineticTileEntityRenderer;
import com.simibubi.create.foundation.behaviour.scrollvalue.ScrollValueHandler; 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.gui.ScreenOpener;
import com.simibubi.create.foundation.item.TooltipHelper; 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.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.Minecraft;
import net.minecraft.client.renderer.ActiveRenderInfo; import net.minecraft.client.renderer.ActiveRenderInfo;

2
src/main/java/com/simibubi/create/Events.java → src/main/java/com/simibubi/create/CommonEvents.java
View file

@ -11,7 +11,7 @@ import net.minecraftforge.fml.common.Mod.EventBusSubscriber;
import net.minecraftforge.fml.event.server.FMLServerStoppingEvent; import net.minecraftforge.fml.event.server.FMLServerStoppingEvent;
@EventBusSubscriber @EventBusSubscriber
public class Events { public class CommonEvents {
@SubscribeEvent @SubscribeEvent
public static void onTick(ServerTickEvent event) { public static void onTick(ServerTickEvent event) {

30
src/main/java/com/simibubi/create/Create.java
View file

@ -3,17 +3,19 @@ package com.simibubi.create;
import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger; 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.advancement.AllTriggers;
import com.simibubi.create.foundation.command.CreateCommand; import com.simibubi.create.foundation.command.CreateCommand;
import com.simibubi.create.foundation.command.ServerLagger; import com.simibubi.create.foundation.command.ServerLagger;
import com.simibubi.create.foundation.registrate.CreateRegistrate; import com.simibubi.create.foundation.config.AllConfigs;
import com.simibubi.create.foundation.world.AllWorldFeatures; import com.simibubi.create.foundation.data.CreateRegistrate;
import com.simibubi.create.modules.contraptions.TorquePropagator; import com.simibubi.create.foundation.networking.AllPackets;
import com.simibubi.create.modules.logistics.RedstoneLinkNetworkHandler; import com.simibubi.create.foundation.worldgen.AllWorldFeatures;
import com.simibubi.create.modules.palettes.AllPaletteBlocks;
import com.simibubi.create.modules.palettes.PalettesItemGroup;
import com.simibubi.create.modules.schematics.ServerSchematicLoader;
import com.tterrag.registrate.util.NonNullLazyValue; import com.tterrag.registrate.util.NonNullLazyValue;
import net.minecraft.entity.EntityType; import net.minecraft.entity.EntityType;
@ -58,17 +60,17 @@ public class Create {
AllBlocks.register(); AllBlocks.register();
AllPaletteBlocks.register(); AllPaletteBlocks.register();
// modEventBus.addGenericListener(Block.class, AllBlocks::register);
modEventBus.addGenericListener(Item.class, AllItems::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(TileEntityType.class, AllTileEntities::register);
modEventBus.addGenericListener(ContainerType.class, AllContainers::register); modEventBus.addGenericListener(ContainerType.class, AllContainerTypes::register);
modEventBus.addGenericListener(EntityType.class, AllEntities::register); modEventBus.addGenericListener(EntityType.class, AllEntityTypes::register);
modEventBus.addGenericListener(ParticleType.class, AllParticles::register); modEventBus.addGenericListener(ParticleType.class, AllParticleTypes::register);
modEventBus.addGenericListener(SoundEvent.class, AllSoundEvents::register); modEventBus.addGenericListener(SoundEvent.class, AllSoundEvents::register);
modEventBus.addListener(AllConfigs::onLoad); modEventBus.addListener(AllConfigs::onLoad);
modEventBus.addListener(AllConfigs::onReload); modEventBus.addListener(AllConfigs::onReload);
CreateClient.addListeners(modEventBus); CreateClient.addListeners(modEventBus);
AllConfigs.registerClientCommon(); AllConfigs.registerClientCommon();
} }

25
src/main/java/com/simibubi/create/CreateClient.java
View file

@ -5,21 +5,22 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.function.Function; import java.util.function.Function;
import com.simibubi.create.foundation.behaviour.filtering.FilteringRenderer; import com.simibubi.create.content.contraptions.base.KineticTileEntityRenderer;
import com.simibubi.create.foundation.behaviour.linked.LinkRenderer; import com.simibubi.create.content.contraptions.components.structureMovement.ChassisRangeDisplay;
import com.simibubi.create.foundation.behaviour.scrollvalue.ScrollValueRenderer; 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.IHaveColorHandler;
import com.simibubi.create.foundation.block.render.CustomBlockModels; import com.simibubi.create.foundation.block.render.CustomBlockModels;
import com.simibubi.create.foundation.block.render.SpriteShifter; import com.simibubi.create.foundation.block.render.SpriteShifter;
import com.simibubi.create.foundation.item.IHaveCustomItemModel; 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.SuperByteBufferCache;
import com.simibubi.create.foundation.utility.outliner.Outliner; 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 com.tterrag.registrate.util.entry.RegistryEntry;
import net.minecraft.block.Block; import net.minecraft.block.Block;
@ -57,7 +58,7 @@ public class CreateClient {
modEventBus.addListener(CreateClient::onModelBake); modEventBus.addListener(CreateClient::onModelBake);
modEventBus.addListener(CreateClient::onModelRegistry); modEventBus.addListener(CreateClient::onModelRegistry);
modEventBus.addListener(CreateClient::onTextureStitch); modEventBus.addListener(CreateClient::onTextureStitch);
modEventBus.addListener(AllParticles::registerFactories); modEventBus.addListener(AllParticleTypes::registerFactories);
}); });
} }
@ -72,10 +73,10 @@ public class CreateClient {
bufferCache.registerCompartment(ContraptionRenderer.CONTRAPTION, 20); bufferCache.registerCompartment(ContraptionRenderer.CONTRAPTION, 20);
AllKeys.register(); AllKeys.register();
AllContainers.registerScreenFactories(); AllContainerTypes.registerScreenFactories();
AllTileEntities.registerRenderers(); AllTileEntities.registerRenderers();
AllItems.registerColorHandlers(); AllItems.registerColorHandlers();
AllEntities.registerRenderers(); AllEntityTypes.registerRenderers();
registerColorHandlers(); registerColorHandlers();
IResourceManager resourceManager = Minecraft.getInstance() IResourceManager resourceManager = Minecraft.getInstance()

10
src/main/java/com/simibubi/create/compat/jei/ConversionRecipe.java
View file

@ -3,11 +3,11 @@ package com.simibubi.create.compat.jei;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import com.simibubi.create.AllRecipes; import com.simibubi.create.AllRecipeTypes;
import com.simibubi.create.Create; import com.simibubi.create.Create;
import com.simibubi.create.modules.contraptions.processing.ProcessingIngredient; import com.simibubi.create.content.contraptions.processing.ProcessingIngredient;
import com.simibubi.create.modules.contraptions.processing.ProcessingOutput; import com.simibubi.create.content.contraptions.processing.ProcessingOutput;
import com.simibubi.create.modules.contraptions.processing.ProcessingRecipe; import com.simibubi.create.content.contraptions.processing.ProcessingRecipe;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.Ingredient; import net.minecraft.item.crafting.Ingredient;
@ -25,7 +25,7 @@ public class ConversionRecipe extends ProcessingRecipe<RecipeWrapper> {
public ConversionRecipe(ResourceLocation id, String group, List<ProcessingIngredient> ingredients, public ConversionRecipe(ResourceLocation id, String group, List<ProcessingIngredient> ingredients,
List<ProcessingOutput> results, int processingDuration) { List<ProcessingOutput> results, int processingDuration) {
super(AllRecipes.CONVERSION, id, group, ingredients, results, processingDuration); super(AllRecipeTypes.CONVERSION, id, group, ingredients, results, processingDuration);
} }
static int counter = 0; static int counter = 0;

34
src/main/java/com/simibubi/create/compat/jei/CreateJEI.java
View file

@ -6,11 +6,15 @@ import java.util.stream.Collectors;
import com.google.common.base.Predicate; import com.google.common.base.Predicate;
import com.simibubi.create.AllBlocks; import com.simibubi.create.AllBlocks;
import com.simibubi.create.AllItems; import com.simibubi.create.AllItems;
import com.simibubi.create.AllRecipes; import com.simibubi.create.AllRecipeTypes;
import com.simibubi.create.Create; import com.simibubi.create.Create;
import com.simibubi.create.compat.jei.category.BlastingViaFanCategory; import com.simibubi.create.compat.jei.category.BlastingViaFanCategory;
import com.simibubi.create.compat.jei.category.BlockCuttingCategory; import com.simibubi.create.compat.jei.category.BlockCuttingCategory;
import com.simibubi.create.compat.jei.category.BlockCuttingCategory.CondensedBlockCuttingRecipe; 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.BlockzapperUpgradeCategory;
import com.simibubi.create.compat.jei.category.CrushingCategory; import com.simibubi.create.compat.jei.category.CrushingCategory;
import com.simibubi.create.compat.jei.category.MechanicalCraftingCategory; 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.SmokingViaFanCategory;
import com.simibubi.create.compat.jei.category.SplashingCategory; import com.simibubi.create.compat.jei.category.SplashingCategory;
import com.simibubi.create.foundation.utility.Lang; 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.IModPlugin;
import mezz.jei.api.JeiPlugin; import mezz.jei.api.JeiPlugin;
@ -105,35 +105,35 @@ public class CreateJEI implements IModPlugin {
@Override @Override
public void registerRecipes(IRecipeRegistration registration) { public void registerRecipes(IRecipeRegistration registration) {
registration.addRecipes(findRecipes(AllRecipes.MILLING), millingCategory.getUid()); registration.addRecipes(findRecipes(AllRecipeTypes.MILLING), millingCategory.getUid());
registration.addRecipes(findRecipes(AllRecipes.CRUSHING), crushingCategory.getUid()); registration.addRecipes(findRecipes(AllRecipeTypes.CRUSHING), crushingCategory.getUid());
registration.addRecipes(findRecipesByTypeExcluding(AllRecipes.MILLING.getType(), AllRecipes.CRUSHING.getType()), registration.addRecipes(findRecipesByTypeExcluding(AllRecipeTypes.MILLING.getType(), AllRecipeTypes.CRUSHING.getType()),
crushingCategory.getUid()); crushingCategory.getUid());
registration.addRecipes(findRecipes(AllRecipes.SPLASHING), splashingCategory.getUid()); registration.addRecipes(findRecipes(AllRecipeTypes.SPLASHING), splashingCategory.getUid());
registration.addRecipes(findRecipes(AllRecipes.PRESSING), pressingCategory.getUid()); registration.addRecipes(findRecipes(AllRecipeTypes.PRESSING), pressingCategory.getUid());
registration.addRecipes(findRecipesById(AllRecipes.BLOCKZAPPER_UPGRADE.serializer.getRegistryName()), registration.addRecipes(findRecipesById(AllRecipeTypes.BLOCKZAPPER_UPGRADE.serializer.getRegistryName()),
blockzapperCategory.getUid()); blockzapperCategory.getUid());
registration.addRecipes(findRecipesByType(IRecipeType.SMOKING), smokingCategory.getUid()); registration.addRecipes(findRecipesByType(IRecipeType.SMOKING), smokingCategory.getUid());
registration.addRecipes(findRecipesByTypeExcluding(IRecipeType.SMELTING, IRecipeType.SMOKING), registration.addRecipes(findRecipesByTypeExcluding(IRecipeType.SMELTING, IRecipeType.SMOKING),
blastingCategory.getUid()); 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 registration.addRecipes(findRecipes(r -> r.getSerializer() == IRecipeSerializer.CRAFTING_SHAPELESS
&& !MechanicalPressTileEntity.canCompress(r.getIngredients())).stream().map(MixingRecipe::of) && !MechanicalPressTileEntity.canCompress(r.getIngredients())).stream().map(MixingRecipe::of)
.collect(Collectors.toList()), .collect(Collectors.toList()),
mixingCategory.getUid()); mixingCategory.getUid());
registration.addRecipes(findRecipes(AllRecipes.CUTTING), sawingCategory.getUid()); registration.addRecipes(findRecipes(AllRecipeTypes.CUTTING), sawingCategory.getUid());
registration.addRecipes( registration.addRecipes(
CondensedBlockCuttingRecipe.condenseRecipes(findRecipesByType(IRecipeType.STONECUTTING)), CondensedBlockCuttingRecipe.condenseRecipes(findRecipesByType(IRecipeType.STONECUTTING)),
blockCuttingCategory.getUid()); blockCuttingCategory.getUid());
registration.addRecipes(findRecipes( registration.addRecipes(findRecipes(
r -> (r instanceof ICraftingRecipe) && MechanicalPressTileEntity.canCompress(r.getIngredients())), r -> (r instanceof ICraftingRecipe) && MechanicalPressTileEntity.canCompress(r.getIngredients())),
packingCategory.getUid()); 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(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()); mechanicalCraftingCategory.getUid());
registration.addRecipes(findRecipes(r -> (r.getType() == IRecipeType.CRAFTING 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()); mechanicalCraftingCategory.getUid());
} }
@ -180,7 +180,7 @@ public class CreateJEI implements IModPlugin {
registration.addGuiContainerHandler(SchematicannonScreen.class, new SlotMover<>()); registration.addGuiContainerHandler(SchematicannonScreen.class, new SlotMover<>());
} }
private static List<IRecipe<?>> findRecipes(AllRecipes recipe) { private static List<IRecipe<?>> findRecipes(AllRecipeTypes recipe) {
return findRecipesByType(recipe.type); return findRecipesByType(recipe.type);
} }

6
src/main/java/com/simibubi/create/compat/jei/ScreenResourceWrapper.java
View file

@ -1,15 +1,15 @@
package com.simibubi.create.compat.jei; 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 mezz.jei.api.gui.drawable.IDrawable;
import net.minecraft.client.gui.AbstractGui; import net.minecraft.client.gui.AbstractGui;
public class ScreenResourceWrapper implements IDrawable { public class ScreenResourceWrapper implements IDrawable {
private ScreenResources resource; private AllGuiTextures resource;
public ScreenResourceWrapper(ScreenResources resource) { public ScreenResourceWrapper(AllGuiTextures resource) {
this.resource = resource; this.resource = resource;
} }

8
src/main/java/com/simibubi/create/compat/jei/category/BlockCuttingCategory.java
View file

@ -5,9 +5,9 @@ import java.util.Arrays;
import java.util.List; import java.util.List;
import com.simibubi.create.AllBlocks; 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.BlockCuttingCategory.CondensedBlockCuttingRecipe;
import com.simibubi.create.compat.jei.category.animations.AnimatedSaw; import com.simibubi.create.compat.jei.category.animations.AnimatedSaw;
import com.simibubi.create.foundation.gui.AllGuiTextures;
import com.simibubi.create.foundation.item.ItemHelper; import com.simibubi.create.foundation.item.ItemHelper;
import mezz.jei.api.constants.VanillaTypes; import mezz.jei.api.constants.VanillaTypes;
@ -58,14 +58,14 @@ public class BlockCuttingCategory extends CreateRecipeCategory<CondensedBlockCut
@Override @Override
public void draw(CondensedBlockCuttingRecipe recipe, double mouseX, double mouseY) { public void draw(CondensedBlockCuttingRecipe recipe, double mouseX, double mouseY) {
ScreenResources.JEI_SLOT.draw(4, 4); AllGuiTextures.JEI_SLOT.draw(4, 4);
int size = recipe.getOutputs().size(); int size = recipe.getOutputs().size();
for (int i = 0; i < size; i++) { for (int i = 0; i < size; i++) {
int xOffset = (i % 5) * 19; int xOffset = (i % 5) * 19;
int yOffset = (i / 5) * -19; int yOffset = (i / 5) * -19;
ScreenResources.JEI_SLOT.draw(77 + xOffset, 47 + yOffset); AllGuiTextures.JEI_SLOT.draw(77 + xOffset, 47 + yOffset);
} }
ScreenResources.JEI_DOWN_ARROW.draw(31, 6); AllGuiTextures.JEI_DOWN_ARROW.draw(31, 6);
saw.draw(33, 37); saw.draw(33, 37);
} }

4
src/main/java/com/simibubi/create/compat/jei/category/BlockzapperUpgradeCategory.java
View file

@ -1,6 +1,6 @@
package com.simibubi.create.compat.jei.category; package com.simibubi.create.compat.jei.category;
import static com.simibubi.create.ScreenResources.BLOCKZAPPER_UPGRADE_RECIPE; import static com.simibubi.create.foundation.gui.AllGuiTextures.BLOCKZAPPER_UPGRADE_RECIPE;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
@ -10,9 +10,9 @@ import java.util.stream.Collectors;
import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.systems.RenderSystem;
import com.simibubi.create.AllItems; import com.simibubi.create.AllItems;
import com.simibubi.create.compat.jei.ScreenResourceWrapper; import com.simibubi.create.compat.jei.ScreenResourceWrapper;
import com.simibubi.create.content.curiosities.zapper.blockzapper.BlockzapperUpgradeRecipe;
import com.simibubi.create.foundation.gui.GuiGameElement; import com.simibubi.create.foundation.gui.GuiGameElement;
import com.simibubi.create.foundation.utility.Lang; import com.simibubi.create.foundation.utility.Lang;
import com.simibubi.create.modules.curiosities.zapper.blockzapper.BlockzapperUpgradeRecipe;
import mezz.jei.api.constants.VanillaTypes; import mezz.jei.api.constants.VanillaTypes;
import mezz.jei.api.gui.IRecipeLayout; import mezz.jei.api.gui.IRecipeLayout;

12
src/main/java/com/simibubi/create/compat/jei/category/CreateRecipeCategory.java
View file

@ -4,12 +4,12 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import com.simibubi.create.Create; import com.simibubi.create.Create;
import com.simibubi.create.ScreenResources;
import com.simibubi.create.compat.jei.DoubleItemIcon; import com.simibubi.create.compat.jei.DoubleItemIcon;
import com.simibubi.create.compat.jei.EmptyBackground; import com.simibubi.create.compat.jei.EmptyBackground;
import com.simibubi.create.content.contraptions.processing.ProcessingOutput;
import com.simibubi.create.content.contraptions.processing.ProcessingRecipe;
import com.simibubi.create.foundation.gui.AllGuiTextures;
import com.simibubi.create.foundation.utility.Lang; import com.simibubi.create.foundation.utility.Lang;
import com.simibubi.create.modules.contraptions.processing.ProcessingOutput;
import com.simibubi.create.modules.contraptions.processing.ProcessingRecipe;
import mezz.jei.api.gui.drawable.IDrawable; import mezz.jei.api.gui.drawable.IDrawable;
import mezz.jei.api.gui.ingredient.IGuiItemStackGroup; import mezz.jei.api.gui.ingredient.IGuiItemStackGroup;
@ -54,8 +54,8 @@ public abstract class CreateRecipeCategory<T extends IRecipe<?>> implements IRec
return background; return background;
} }
protected static ScreenResources getRenderedSlot(IRecipe<?> recipe, int index) { protected static AllGuiTextures getRenderedSlot(IRecipe<?> recipe, int index) {
ScreenResources jeiSlot = ScreenResources.JEI_SLOT; AllGuiTextures jeiSlot = AllGuiTextures.JEI_SLOT;
if (!(recipe instanceof ProcessingRecipe)) if (!(recipe instanceof ProcessingRecipe))
return jeiSlot; return jeiSlot;
ProcessingRecipe<?> processingRecipe = (ProcessingRecipe<?>) recipe; ProcessingRecipe<?> processingRecipe = (ProcessingRecipe<?>) recipe;
@ -64,7 +64,7 @@ public abstract class CreateRecipeCategory<T extends IRecipe<?>> implements IRec
return jeiSlot; return jeiSlot;
if (processingRecipe.getRollableResults().get(index).getChance() == 1) if (processingRecipe.getRollableResults().get(index).getChance() == 1)
return jeiSlot; return jeiSlot;
return ScreenResources.JEI_CHANCE_SLOT; return AllGuiTextures.JEI_CHANCE_SLOT;
} }
protected static IDrawable emptyBackground(int width, int height) { protected static IDrawable emptyBackground(int width, int height) {

10
src/main/java/com/simibubi/create/compat/jei/category/CrushingCategory.java
View file

@ -5,10 +5,10 @@ import java.util.List;
import com.simibubi.create.AllBlocks; import com.simibubi.create.AllBlocks;
import com.simibubi.create.AllItems; import com.simibubi.create.AllItems;
import com.simibubi.create.ScreenResources;
import com.simibubi.create.compat.jei.category.animations.AnimatedCrushingWheels; import com.simibubi.create.compat.jei.category.animations.AnimatedCrushingWheels;
import com.simibubi.create.modules.contraptions.components.crusher.AbstractCrushingRecipe; import com.simibubi.create.content.contraptions.components.crusher.AbstractCrushingRecipe;
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.constants.VanillaTypes;
import mezz.jei.api.gui.IRecipeLayout; import mezz.jei.api.gui.IRecipeLayout;
@ -55,8 +55,8 @@ public class CrushingCategory extends CreateRecipeCategory<AbstractCrushingRecip
@Override @Override
public void draw(AbstractCrushingRecipe recipe, double mouseX, double mouseY) { public void draw(AbstractCrushingRecipe recipe, double mouseX, double mouseY) {
List<ProcessingOutput> results = recipe.getRollableResults(); List<ProcessingOutput> results = recipe.getRollableResults();
ScreenResources.JEI_SLOT.draw(50, 2); AllGuiTextures.JEI_SLOT.draw(50, 2);
ScreenResources.JEI_DOWN_ARROW.draw(72, 7); AllGuiTextures.JEI_DOWN_ARROW.draw(72, 7);
int size = results.size(); int size = results.size();
int offset = -size * 19 / 2; int offset = -size * 19 / 2;

8
src/main/java/com/simibubi/create/compat/jei/category/MechanicalCraftingCategory.java
View file

@ -7,8 +7,8 @@ import java.util.stream.Collectors;
import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.systems.RenderSystem;
import com.simibubi.create.AllBlocks; import com.simibubi.create.AllBlocks;
import com.simibubi.create.ScreenResources;
import com.simibubi.create.compat.jei.category.animations.AnimatedCrafter; 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.constants.VanillaTypes;
import mezz.jei.api.gui.IRecipeLayout; import mezz.jei.api.gui.IRecipeLayout;
@ -160,14 +160,14 @@ public class MechanicalCraftingCategory extends CreateRecipeCategory<ShapedRecip
RenderSystem.pushMatrix(); RenderSystem.pushMatrix();
RenderSystem.translated((int) col * 19 * scale, (int) row * 19 * scale, 0); RenderSystem.translated((int) col * 19 * scale, (int) row * 19 * scale, 0);
RenderSystem.scaled(scale, scale, scale); RenderSystem.scaled(scale, scale, scale);
ScreenResources.JEI_SLOT.draw(0, 0); AllGuiTextures.JEI_SLOT.draw(0, 0);
RenderSystem.popMatrix(); RenderSystem.popMatrix();
} }
RenderSystem.popMatrix(); RenderSystem.popMatrix();
ScreenResources.JEI_SLOT.draw(133, 80); AllGuiTextures.JEI_SLOT.draw(133, 80);
ScreenResources.JEI_DOWN_ARROW.draw(128, 59); AllGuiTextures.JEI_DOWN_ARROW.draw(128, 59);
crafter.draw(129, 25); crafter.draw(129, 25);
RenderSystem.pushMatrix(); RenderSystem.pushMatrix();

12
src/main/java/com/simibubi/create/compat/jei/category/MillingCategory.java
View file

@ -5,10 +5,10 @@ import java.util.List;
import com.simibubi.create.AllBlocks; import com.simibubi.create.AllBlocks;
import com.simibubi.create.AllItems; import com.simibubi.create.AllItems;
import com.simibubi.create.ScreenResources;
import com.simibubi.create.compat.jei.category.animations.AnimatedMillstone; import com.simibubi.create.compat.jei.category.animations.AnimatedMillstone;
import com.simibubi.create.modules.contraptions.components.crusher.AbstractCrushingRecipe; import com.simibubi.create.content.contraptions.components.crusher.AbstractCrushingRecipe;
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.constants.VanillaTypes;
import mezz.jei.api.gui.IRecipeLayout; import mezz.jei.api.gui.IRecipeLayout;
@ -57,9 +57,9 @@ public class MillingCategory extends CreateRecipeCategory<AbstractCrushingRecipe
public void draw(AbstractCrushingRecipe recipe, double mouseX, double mouseY) { public void draw(AbstractCrushingRecipe recipe, double mouseX, double mouseY) {
int size = recipe.getPossibleOutputs().size(); int size = recipe.getPossibleOutputs().size();
ScreenResources.JEI_SLOT.draw(14, 8); AllGuiTextures.JEI_SLOT.draw(14, 8);
ScreenResources.JEI_ARROW.draw(85, 32); AllGuiTextures.JEI_ARROW.draw(85, 32);
ScreenResources.JEI_DOWN_ARROW.draw(43, 4); AllGuiTextures.JEI_DOWN_ARROW.draw(43, 4);
millstone.draw(48, 27); millstone.draw(48, 27);
if (size == 1) { if (size == 1) {

16
src/main/java/com/simibubi/create/compat/jei/category/MixingCategory.java
View file

@ -10,11 +10,11 @@ import org.apache.commons.lang3.mutable.MutableInt;
import org.apache.commons.lang3.tuple.Pair; import org.apache.commons.lang3.tuple.Pair;
import com.simibubi.create.AllBlocks; import com.simibubi.create.AllBlocks;
import com.simibubi.create.ScreenResources;
import com.simibubi.create.compat.jei.category.animations.AnimatedMixer; import com.simibubi.create.compat.jei.category.animations.AnimatedMixer;
import com.simibubi.create.content.contraptions.components.mixer.MixingRecipe;
import com.simibubi.create.content.contraptions.processing.ProcessingIngredient;
import com.simibubi.create.foundation.gui.AllGuiTextures;
import com.simibubi.create.foundation.item.ItemHelper; import com.simibubi.create.foundation.item.ItemHelper;
import com.simibubi.create.modules.contraptions.components.mixer.MixingRecipe;
import com.simibubi.create.modules.contraptions.processing.ProcessingIngredient;
import mezz.jei.api.constants.VanillaTypes; import mezz.jei.api.constants.VanillaTypes;
import mezz.jei.api.gui.IRecipeLayout; import mezz.jei.api.gui.IRecipeLayout;
@ -90,19 +90,19 @@ public class MixingCategory extends CreateRecipeCategory<MixingRecipe> {
int size = actualIngredients.size(); int size = actualIngredients.size();
int xOffset = size < 3 ? (3 - size) * 19 / 2 : 0; int xOffset = size < 3 ? (3 - size) * 19 / 2 : 0;
for (int i = 0; i < size; i++) { for (int i = 0; i < size; i++) {
ScreenResources jeiSlot = ScreenResources.JEI_SLOT; AllGuiTextures jeiSlot = AllGuiTextures.JEI_SLOT;
for (ProcessingIngredient processingIngredient : recipe.getRollableIngredients()) { for (ProcessingIngredient processingIngredient : recipe.getRollableIngredients()) {
if (processingIngredient.isCatalyst() && ItemHelper if (processingIngredient.isCatalyst() && ItemHelper
.matchIngredients(processingIngredient.getIngredient(), actualIngredients.get(i).getKey())) { .matchIngredients(processingIngredient.getIngredient(), actualIngredients.get(i).getKey())) {
jeiSlot = ScreenResources.JEI_CATALYST_SLOT; jeiSlot = AllGuiTextures.JEI_CATALYST_SLOT;
break; break;
} }
} }
jeiSlot.draw(16 + xOffset + (i % 3) * 19, 50 - (i / 3) * 19); jeiSlot.draw(16 + xOffset + (i % 3) * 19, 50 - (i / 3) * 19);
} }
ScreenResources.JEI_SLOT.draw(141, 50); AllGuiTextures.JEI_SLOT.draw(141, 50);
ScreenResources.JEI_DOWN_ARROW.draw(136, 32); AllGuiTextures.JEI_DOWN_ARROW.draw(136, 32);
ScreenResources.JEI_SHADOW.draw(81, 57); AllGuiTextures.JEI_SHADOW.draw(81, 57);
mixer.draw(getBackground().getWidth() / 2 + 3, 25); mixer.draw(getBackground().getWidth() / 2 + 3, 25);
} }

12
src/main/java/com/simibubi/create/compat/jei/category/MysteriousItemConversionCategory.java
View file

@ -5,9 +5,9 @@ import java.util.Arrays;
import java.util.List; import java.util.List;
import com.simibubi.create.AllItems; import com.simibubi.create.AllItems;
import com.simibubi.create.ScreenResources;
import com.simibubi.create.compat.jei.ConversionRecipe; 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.constants.VanillaTypes;
import mezz.jei.api.gui.IRecipeLayout; import mezz.jei.api.gui.IRecipeLayout;
@ -50,10 +50,10 @@ public class MysteriousItemConversionCategory extends CreateRecipeCategory<Conve
@Override @Override
public void draw(ConversionRecipe recipe, double mouseX, double mouseY) { public void draw(ConversionRecipe recipe, double mouseX, double mouseY) {
ScreenResources.JEI_SLOT.draw(26, 16); AllGuiTextures.JEI_SLOT.draw(26, 16);
ScreenResources.JEI_SLOT.draw(131, 16); AllGuiTextures.JEI_SLOT.draw(131, 16);
ScreenResources.JEI_LONG_ARROW.draw(52, 20); AllGuiTextures.JEI_LONG_ARROW.draw(52, 20);
ScreenResources.JEI_QUESTION_MARK.draw(77, 5); AllGuiTextures.JEI_QUESTION_MARK.draw(77, 5);
} }
} }

10
src/main/java/com/simibubi/create/compat/jei/category/PackingCategory.java
View file

@ -3,8 +3,8 @@ package com.simibubi.create.compat.jei.category;
import java.util.Arrays; import java.util.Arrays;
import com.simibubi.create.AllBlocks; import com.simibubi.create.AllBlocks;
import com.simibubi.create.ScreenResources;
import com.simibubi.create.compat.jei.category.animations.AnimatedPress; import com.simibubi.create.compat.jei.category.animations.AnimatedPress;
import com.simibubi.create.foundation.gui.AllGuiTextures;
import mezz.jei.api.constants.VanillaTypes; import mezz.jei.api.constants.VanillaTypes;
import mezz.jei.api.gui.IRecipeLayout; import mezz.jei.api.gui.IRecipeLayout;
@ -60,11 +60,11 @@ public class PackingCategory extends CreateRecipeCategory<IRecipe<?>> {
int size = ingredients2.size(); int size = ingredients2.size();
int rows = size == 4 ? 2 : 3; int rows = size == 4 ? 2 : 3;
for (int i = 0; i < size; i++) { 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); AllGuiTextures.JEI_SLOT.draw(141, 50);
ScreenResources.JEI_DOWN_ARROW.draw(136, 32); AllGuiTextures.JEI_DOWN_ARROW.draw(136, 32);
ScreenResources.JEI_SHADOW.draw(81, 57); AllGuiTextures.JEI_SHADOW.draw(81, 57);
press.draw(getBackground().getWidth() / 2 + 6, 30); press.draw(getBackground().getWidth() / 2 + 6, 30);
} }

12
src/main/java/com/simibubi/create/compat/jei/category/PolishingCategory.java
View file

@ -5,9 +5,9 @@ import java.util.List;
import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.systems.RenderSystem;
import com.simibubi.create.AllItems; import com.simibubi.create.AllItems;
import com.simibubi.create.ScreenResources; import com.simibubi.create.content.contraptions.processing.ProcessingOutput;
import com.simibubi.create.modules.contraptions.processing.ProcessingOutput; import com.simibubi.create.content.curiosities.tools.SandPaperPolishingRecipe;
import com.simibubi.create.modules.curiosities.tools.SandPaperPolishingRecipe; import com.simibubi.create.foundation.gui.AllGuiTextures;
import mezz.jei.api.constants.VanillaTypes; import mezz.jei.api.constants.VanillaTypes;
import mezz.jei.api.gui.IRecipeLayout; import mezz.jei.api.gui.IRecipeLayout;
@ -55,10 +55,10 @@ public class PolishingCategory extends CreateRecipeCategory<SandPaperPolishingRe
@Override @Override
public void draw(SandPaperPolishingRecipe recipe, double mouseX, double mouseY) { public void draw(SandPaperPolishingRecipe recipe, double mouseX, double mouseY) {
ScreenResources.JEI_SLOT.draw(26, 28); AllGuiTextures.JEI_SLOT.draw(26, 28);
getRenderedSlot(recipe, 0).draw(131, 28); getRenderedSlot(recipe, 0).draw(131, 28);
ScreenResources.JEI_SHADOW.draw(61, 21); AllGuiTextures.JEI_SHADOW.draw(61, 21);
ScreenResources.JEI_LONG_ARROW.draw(52, 32); AllGuiTextures.JEI_LONG_ARROW.draw(52, 32);
NonNullList<Ingredient> ingredients = recipe.getIngredients(); NonNullList<Ingredient> ingredients = recipe.getIngredients();
ItemStack[] matchingStacks = ingredients.get(0).getMatchingStacks(); ItemStack[] matchingStacks = ingredients.get(0).getMatchingStacks();

12
src/main/java/com/simibubi/create/compat/jei/category/PressingCategory.java
View file

@ -5,10 +5,10 @@ import java.util.List;
import com.simibubi.create.AllBlocks; import com.simibubi.create.AllBlocks;
import com.simibubi.create.AllItems; import com.simibubi.create.AllItems;
import com.simibubi.create.ScreenResources;
import com.simibubi.create.compat.jei.category.animations.AnimatedPress; import com.simibubi.create.compat.jei.category.animations.AnimatedPress;
import com.simibubi.create.modules.contraptions.components.press.PressingRecipe; import com.simibubi.create.content.contraptions.components.press.PressingRecipe;
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.constants.VanillaTypes;
import mezz.jei.api.gui.IRecipeLayout; import mezz.jei.api.gui.IRecipeLayout;
@ -52,12 +52,12 @@ public class PressingCategory extends CreateRecipeCategory<PressingRecipe> {
@Override @Override
public void draw(PressingRecipe recipe, double mouseX, double mouseY) { 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); getRenderedSlot(recipe, 0).draw(131, 50);
if (recipe.getRollableResults().size() > 1) if (recipe.getRollableResults().size() > 1)
getRenderedSlot(recipe, 1).draw(131 + 19, 50); getRenderedSlot(recipe, 1).draw(131 + 19, 50);
ScreenResources.JEI_SHADOW.draw(61, 41); AllGuiTextures.JEI_SHADOW.draw(61, 41);
ScreenResources.JEI_LONG_ARROW.draw(52, 54); AllGuiTextures.JEI_LONG_ARROW.draw(52, 54);
press.draw(getBackground().getWidth() / 2 - 17, 22); press.draw(getBackground().getWidth() / 2 - 17, 22);
} }

12
src/main/java/com/simibubi/create/compat/jei/category/ProcessingViaFanCategory.java
View file

@ -5,8 +5,8 @@ import java.util.Arrays;
import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.systems.RenderSystem;
import com.simibubi.create.AllBlockPartials; import com.simibubi.create.AllBlockPartials;
import com.simibubi.create.AllBlocks; import com.simibubi.create.AllBlocks;
import com.simibubi.create.ScreenResources;
import com.simibubi.create.compat.jei.category.animations.AnimatedKinetics; import com.simibubi.create.compat.jei.category.animations.AnimatedKinetics;
import com.simibubi.create.foundation.gui.AllGuiTextures;
import com.simibubi.create.foundation.gui.GuiGameElement; import com.simibubi.create.foundation.gui.GuiGameElement;
import mezz.jei.api.constants.VanillaTypes; import mezz.jei.api.constants.VanillaTypes;
@ -41,11 +41,11 @@ public abstract class ProcessingViaFanCategory<T extends IRecipe<?>> extends Cre
} }
protected void renderWidgets(T recipe, double mouseX, double mouseY) { protected void renderWidgets(T recipe, double mouseX, double mouseY) {
ScreenResources.JEI_SLOT.draw(20, 47); AllGuiTextures.JEI_SLOT.draw(20, 47);
ScreenResources.JEI_SLOT.draw(139, 47); AllGuiTextures.JEI_SLOT.draw(139, 47);
ScreenResources.JEI_SHADOW.draw(47, 29); AllGuiTextures.JEI_SHADOW.draw(47, 29);
ScreenResources.JEI_LIGHT.draw(66, 39); AllGuiTextures.JEI_LIGHT.draw(66, 39);
ScreenResources.JEI_LONG_ARROW.draw(53, 51); AllGuiTextures.JEI_LONG_ARROW.draw(53, 51);
} }
@Override @Override

10
src/main/java/com/simibubi/create/compat/jei/category/SawingCategory.java
View file

@ -4,10 +4,10 @@ import java.util.Arrays;
import java.util.List; import java.util.List;
import com.simibubi.create.AllBlocks; import com.simibubi.create.AllBlocks;
import com.simibubi.create.ScreenResources;
import com.simibubi.create.compat.jei.category.animations.AnimatedSaw; import com.simibubi.create.compat.jei.category.animations.AnimatedSaw;
import com.simibubi.create.modules.contraptions.components.saw.CuttingRecipe; import com.simibubi.create.content.contraptions.components.saw.CuttingRecipe;
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.constants.VanillaTypes;
import mezz.jei.api.gui.IRecipeLayout; import mezz.jei.api.gui.IRecipeLayout;
@ -54,14 +54,14 @@ public class SawingCategory extends CreateRecipeCategory<CuttingRecipe> {
@Override @Override
public void draw(CuttingRecipe recipe, double mouseX, double mouseY) { 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(); int size = recipe.getRollableResults().size();
for (int i = 0; i < size; i++) { for (int i = 0; i < size; i++) {
int xOffset = i % 2 == 0 ? 0 : 19; int xOffset = i % 2 == 0 ? 0 : 19;
int yOffset = (i / 2) * -19; int yOffset = (i / 2) * -19;
getRenderedSlot(recipe, i).draw(117 + xOffset, 47 + yOffset); 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); saw.draw(72, 42);
} }

14
src/main/java/com/simibubi/create/compat/jei/category/SplashingCategory.java
View file

@ -5,10 +5,10 @@ import java.util.List;
import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.systems.RenderSystem;
import com.simibubi.create.AllItems; 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.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.constants.VanillaTypes;
import mezz.jei.api.gui.IRecipeLayout; import mezz.jei.api.gui.IRecipeLayout;
@ -61,10 +61,10 @@ public class SplashingCategory extends ProcessingViaFanCategory<SplashingRecipe>
int size = recipe.getPossibleOutputs() int size = recipe.getPossibleOutputs()
.size(); .size();
ScreenResources.JEI_SLOT.draw(20, 47); AllGuiTextures.JEI_SLOT.draw(20, 47);
ScreenResources.JEI_SHADOW.draw(47, 29); AllGuiTextures.JEI_SHADOW.draw(47, 29);
ScreenResources.JEI_SHADOW.draw(66, 39); AllGuiTextures.JEI_SHADOW.draw(66, 39);
ScreenResources.JEI_LONG_ARROW.draw(53, 51); AllGuiTextures.JEI_LONG_ARROW.draw(53, 51);
if (size == 1) { if (size == 1) {
getRenderedSlot(recipe, 0).draw(139, 47); getRenderedSlot(recipe, 0).draw(139, 47);

4
src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedCrafter.java
View file

@ -2,7 +2,7 @@ package com.simibubi.create.compat.jei.category.animations;
import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.systems.RenderSystem;
import com.simibubi.create.AllBlocks; import com.simibubi.create.AllBlocks;
import com.simibubi.create.ScreenResources; import com.simibubi.create.foundation.gui.AllGuiTextures;
import com.simibubi.create.foundation.gui.GuiGameElement; import com.simibubi.create.foundation.gui.GuiGameElement;
public class AnimatedCrafter extends AnimatedKinetics { public class AnimatedCrafter extends AnimatedKinetics {
@ -11,7 +11,7 @@ public class AnimatedCrafter extends AnimatedKinetics {
public void draw(int xOffset, int yOffset) { public void draw(int xOffset, int yOffset) {
RenderSystem.pushMatrix(); RenderSystem.pushMatrix();
RenderSystem.translatef(xOffset, yOffset, 0); RenderSystem.translatef(xOffset, yOffset, 0);
ScreenResources.JEI_SHADOW.draw(-16, 13); AllGuiTextures.JEI_SHADOW.draw(-16, 13);
RenderSystem.translatef(3, 16, 0); RenderSystem.translatef(3, 16, 0);
RenderSystem.rotatef(-12.5f, 1, 0, 0); RenderSystem.rotatef(-12.5f, 1, 0, 0);

4
src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedMillstone.java
View file

@ -3,7 +3,7 @@ package com.simibubi.create.compat.jei.category.animations;
import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.systems.RenderSystem;
import com.simibubi.create.AllBlockPartials; import com.simibubi.create.AllBlockPartials;
import com.simibubi.create.AllBlocks; import com.simibubi.create.AllBlocks;
import com.simibubi.create.ScreenResources; import com.simibubi.create.foundation.gui.AllGuiTextures;
import com.simibubi.create.foundation.gui.GuiGameElement; import com.simibubi.create.foundation.gui.GuiGameElement;
public class AnimatedMillstone extends AnimatedKinetics { public class AnimatedMillstone extends AnimatedKinetics {
@ -12,7 +12,7 @@ public class AnimatedMillstone extends AnimatedKinetics {
public void draw(int xOffset, int yOffset) { public void draw(int xOffset, int yOffset) {
RenderSystem.pushMatrix(); RenderSystem.pushMatrix();
RenderSystem.translatef(xOffset, yOffset, 0); RenderSystem.translatef(xOffset, yOffset, 0);
ScreenResources.JEI_SHADOW.draw(-16, 13); AllGuiTextures.JEI_SHADOW.draw(-16, 13);
RenderSystem.translatef(-2, 18, 0); RenderSystem.translatef(-2, 18, 0);
int scale = 22; int scale = 22;

6
src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedSaw.java
View file

@ -2,9 +2,9 @@ package com.simibubi.create.compat.jei.category.animations;
import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.systems.RenderSystem;
import com.simibubi.create.AllBlocks; 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.foundation.gui.GuiGameElement;
import com.simibubi.create.modules.contraptions.components.saw.SawBlock;
import net.minecraft.util.Direction; import net.minecraft.util.Direction;
import net.minecraft.util.Direction.Axis; import net.minecraft.util.Direction.Axis;
@ -15,7 +15,7 @@ public class AnimatedSaw extends AnimatedKinetics {
public void draw(int xOffset, int yOffset) { public void draw(int xOffset, int yOffset) {
RenderSystem.pushMatrix(); RenderSystem.pushMatrix();
RenderSystem.translatef(xOffset, yOffset, 0); RenderSystem.translatef(xOffset, yOffset, 0);
ScreenResources.JEI_SHADOW.draw(-16, 13); AllGuiTextures.JEI_SHADOW.draw(-16, 13);
RenderSystem.translatef(0, 0, 200); RenderSystem.translatef(0, 0, 200);
RenderSystem.translatef(-6, 19, 0); RenderSystem.translatef(-6, 19, 0);

12
src/main/java/com/simibubi/create/modules/Sections.java → src/main/java/com/simibubi/create/content/AllSections.java
View file

@ -1,4 +1,4 @@
package com.simibubi.create.modules; package com.simibubi.create.content;
import com.simibubi.create.AllItems; import com.simibubi.create.AllItems;
import com.simibubi.create.Create; import com.simibubi.create.Create;
@ -9,7 +9,7 @@ import net.minecraft.item.BlockItem;
import net.minecraft.item.Item; import net.minecraft.item.Item;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
public enum Sections { public enum AllSections {
/** Create's kinetic mechanisms */ /** Create's kinetic mechanisms */
KINETICS(Palette.Red), KINETICS(Palette.Red),
@ -36,7 +36,7 @@ public enum Sections {
private Palette tooltipPalette; private Palette tooltipPalette;
private Sections(Palette tooltipPalette) { private AllSections(Palette tooltipPalette) {
this.tooltipPalette = tooltipPalette; this.tooltipPalette = tooltipPalette;
} }
@ -44,21 +44,21 @@ public enum Sections {
return tooltipPalette; return tooltipPalette;
} }
public static Sections of(ItemStack stack) { public static AllSections of(ItemStack stack) {
Item item = stack.getItem(); Item item = stack.getItem();
if (item instanceof BlockItem) if (item instanceof BlockItem)
return ofBlock(((BlockItem) item).getBlock()); return ofBlock(((BlockItem) item).getBlock());
return ofItem(item); return ofItem(item);
} }
static Sections ofItem(Item item) { static AllSections ofItem(Item item) {
for (AllItems allItems : AllItems.values()) for (AllItems allItems : AllItems.values())
if (allItems.get() == item) if (allItems.get() == item)
return allItems.section; return allItems.section;
return UNASSIGNED; return UNASSIGNED;
} }
static Sections ofBlock(Block block) { static AllSections ofBlock(Block block) {
return Create.registrate().getSection(block); return Create.registrate().getSection(block);
} }

9
src/main/java/com/simibubi/create/CreateItemGroup.java → src/main/java/com/simibubi/create/content/CreateItemGroup.java
View file

@ -1,8 +1,9 @@
package com.simibubi.create; package com.simibubi.create.content;
import java.util.EnumSet; 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; import net.minecraft.item.ItemStack;
@ -13,8 +14,8 @@ public class CreateItemGroup extends CreateItemGroupBase {
} }
@Override @Override
protected EnumSet<Sections> getSections() { protected EnumSet<AllSections> getSections() {
return EnumSet.complementOf(EnumSet.of(Sections.PALETTES)); return EnumSet.complementOf(EnumSet.of(AllSections.PALETTES));
} }
@Override @Override

8
src/main/java/com/simibubi/create/modules/contraptions/KineticDebugger.java → src/main/java/com/simibubi/create/content/contraptions/KineticDebugger.java
View file

@ -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.matrix.MatrixStack;
import com.mojang.blaze3d.vertex.IVertexBuilder; import com.mojang.blaze3d.vertex.IVertexBuilder;
import com.simibubi.create.config.AllConfigs; import com.simibubi.create.content.contraptions.base.IRotate;
import com.simibubi.create.modules.contraptions.base.IRotate; import com.simibubi.create.content.contraptions.base.KineticTileEntity;
import com.simibubi.create.modules.contraptions.base.KineticTileEntity; import com.simibubi.create.foundation.config.AllConfigs;
import net.minecraft.block.BlockState; import net.minecraft.block.BlockState;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;

4
src/main/java/com/simibubi/create/modules/contraptions/KineticNetwork.java → src/main/java/com/simibubi/create/content/contraptions/KineticNetwork.java
View file

@ -1,10 +1,10 @@
package com.simibubi.create.modules.contraptions; package com.simibubi.create.content.contraptions;
import java.util.HashMap; import java.util.HashMap;
import java.util.Iterator; import java.util.Iterator;
import java.util.Map; import java.util.Map;
import com.simibubi.create.modules.contraptions.base.KineticTileEntity; import com.simibubi.create.content.contraptions.base.KineticTileEntity;
public class KineticNetwork { public class KineticNetwork {

22
src/main/java/com/simibubi/create/modules/contraptions/RotationPropagator.java → src/main/java/com/simibubi/create/content/contraptions/RotationPropagator.java
View file

@ -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 static net.minecraft.state.properties.BlockStateProperties.AXIS;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
import com.simibubi.create.AllBlocks; import com.simibubi.create.AllBlocks;
import com.simibubi.create.config.AllConfigs; import com.simibubi.create.content.contraptions.base.IRotate;
import com.simibubi.create.modules.contraptions.base.IRotate; import com.simibubi.create.content.contraptions.base.KineticTileEntity;
import com.simibubi.create.modules.contraptions.base.KineticTileEntity; import com.simibubi.create.content.contraptions.relays.advanced.SpeedControllerTileEntity;
import com.simibubi.create.modules.contraptions.relays.advanced.SpeedControllerTileEntity; import com.simibubi.create.content.contraptions.relays.belt.BeltTileEntity;
import com.simibubi.create.modules.contraptions.relays.belt.BeltTileEntity; import com.simibubi.create.content.contraptions.relays.encased.DirectionalShaftHalvesTileEntity;
import com.simibubi.create.modules.contraptions.relays.encased.DirectionalShaftHalvesTileEntity; import com.simibubi.create.content.contraptions.relays.encased.EncasedBeltBlock;
import com.simibubi.create.modules.contraptions.relays.encased.EncasedBeltBlock; import com.simibubi.create.content.contraptions.relays.encased.SplitShaftTileEntity;
import com.simibubi.create.modules.contraptions.relays.encased.SplitShaftTileEntity; import com.simibubi.create.content.contraptions.relays.gearbox.GearboxTileEntity;
import com.simibubi.create.modules.contraptions.relays.gearbox.GearboxTileEntity; import com.simibubi.create.foundation.config.AllConfigs;
import net.minecraft.block.BlockState; import net.minecraft.block.BlockState;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;

4
src/main/java/com/simibubi/create/modules/contraptions/TorquePropagator.java → src/main/java/com/simibubi/create/content/contraptions/TorquePropagator.java
View file

@ -1,10 +1,10 @@
package com.simibubi.create.modules.contraptions; package com.simibubi.create.content.contraptions;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import com.simibubi.create.Create; 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; import net.minecraft.world.IWorld;

4
src/main/java/com/simibubi/create/modules/contraptions/CasingBlock.java → src/main/java/com/simibubi/create/content/contraptions/base/CasingBlock.java
View file

@ -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.Block;
import net.minecraft.block.BlockState; import net.minecraft.block.BlockState;

2
src/main/java/com/simibubi/create/modules/contraptions/base/DirectionalAxisKineticBlock.java → src/main/java/com/simibubi/create/content/contraptions/base/DirectionalAxisKineticBlock.java
View file

@ -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.Block;
import net.minecraft.block.BlockState; import net.minecraft.block.BlockState;

2
src/main/java/com/simibubi/create/modules/contraptions/base/DirectionalKineticBlock.java → src/main/java/com/simibubi/create/content/contraptions/base/DirectionalKineticBlock.java
View file

@ -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.Block;
import net.minecraft.block.BlockState; import net.minecraft.block.BlockState;

8
src/main/java/com/simibubi/create/modules/contraptions/base/GeneratingKineticTileEntity.java → src/main/java/com/simibubi/create/content/contraptions/base/GeneratingKineticTileEntity.java
View file

@ -1,11 +1,11 @@
package com.simibubi.create.modules.contraptions.base; package com.simibubi.create.content.contraptions.base;
import java.util.List; 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.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.TileEntity;
import net.minecraft.tileentity.TileEntityType; import net.minecraft.tileentity.TileEntityType;

2
src/main/java/com/simibubi/create/modules/contraptions/base/HorizontalAxisKineticBlock.java → src/main/java/com/simibubi/create/content/contraptions/base/HorizontalAxisKineticBlock.java
View file

@ -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.Block;
import net.minecraft.block.BlockState; import net.minecraft.block.BlockState;

2
src/main/java/com/simibubi/create/modules/contraptions/base/HorizontalKineticBlock.java → src/main/java/com/simibubi/create/content/contraptions/base/HorizontalKineticBlock.java
View file

@ -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.Block;
import net.minecraft.block.BlockState; import net.minecraft.block.BlockState;

8
src/main/java/com/simibubi/create/modules/contraptions/base/IRotate.java → src/main/java/com/simibubi/create/content/contraptions/base/IRotate.java
View file

@ -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.item.ItemDescription;
import com.simibubi.create.foundation.utility.Lang; 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.block.BlockState;
import net.minecraft.util.Direction; import net.minecraft.util.Direction;

2
src/main/java/com/simibubi/create/modules/contraptions/base/KineticBlock.java → src/main/java/com/simibubi/create/content/contraptions/base/KineticBlock.java
View file

@ -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; import com.simibubi.create.foundation.item.ItemDescription.Palette;

6
src/main/java/com/simibubi/create/modules/contraptions/base/KineticEffectHandler.java → src/main/java/com/simibubi/create/content/contraptions/base/KineticEffectHandler.java
View file

@ -1,11 +1,11 @@
package com.simibubi.create.modules.contraptions.base; package com.simibubi.create.content.contraptions.base;
import java.util.Random; 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.advancement.AllTriggers;
import com.simibubi.create.foundation.utility.VecHelper; 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.Block;
import net.minecraft.block.BlockState; import net.minecraft.block.BlockState;

20
src/main/java/com/simibubi/create/modules/contraptions/base/KineticTileEntity.java → src/main/java/com/simibubi/create/content/contraptions/base/KineticTileEntity.java
View file

@ -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.GOLD;
import static net.minecraft.util.text.TextFormatting.GRAY; import static net.minecraft.util.text.TextFormatting.GRAY;
@ -8,18 +8,18 @@ import java.util.List;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import com.simibubi.create.Create; 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.advancement.AllTriggers;
import com.simibubi.create.foundation.behaviour.base.SmartTileEntity; import com.simibubi.create.foundation.config.AllConfigs;
import com.simibubi.create.foundation.behaviour.base.TileEntityBehaviour;
import com.simibubi.create.foundation.item.TooltipHelper; 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.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.block.BlockState;
import net.minecraft.client.resources.I18n; import net.minecraft.client.resources.I18n;

8
src/main/java/com/simibubi/create/modules/contraptions/base/KineticTileEntityRenderer.java → src/main/java/com/simibubi/create/content/contraptions/base/KineticTileEntityRenderer.java
View file

@ -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.matrix.MatrixStack;
import com.mojang.blaze3d.vertex.IVertexBuilder; import com.mojang.blaze3d.vertex.IVertexBuilder;
import com.simibubi.create.AllBlocks; import com.simibubi.create.AllBlocks;
import com.simibubi.create.CreateClient; 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.AnimationTickHolder;
import com.simibubi.create.foundation.utility.ColorHelper; import com.simibubi.create.foundation.utility.ColorHelper;
import com.simibubi.create.foundation.utility.SuperByteBuffer; import com.simibubi.create.foundation.utility.SuperByteBuffer;
import com.simibubi.create.foundation.utility.SuperByteBufferCache.Compartment; 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.block.BlockState;
import net.minecraft.client.renderer.IRenderTypeBuffer; import net.minecraft.client.renderer.IRenderTypeBuffer;

2
src/main/java/com/simibubi/create/modules/contraptions/base/RotatedPillarKineticBlock.java → src/main/java/com/simibubi/create/content/contraptions/base/RotatedPillarKineticBlock.java
View file

@ -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.Block;
import net.minecraft.block.BlockState; import net.minecraft.block.BlockState;

8
src/main/java/com/simibubi/create/modules/contraptions/components/actors/AttachedActorBlock.java → src/main/java/com/simibubi/create/content/contraptions/components/actors/AttachedActorBlock.java
View file

@ -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.AllShapes;
import com.simibubi.create.modules.contraptions.IWrenchable; import com.simibubi.create.content.contraptions.components.structureMovement.IPortableBlock;
import com.simibubi.create.modules.contraptions.components.contraptions.IPortableBlock; import com.simibubi.create.content.contraptions.wrench.IWrenchable;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.BlockState; import net.minecraft.block.BlockState;

4
src/main/java/com/simibubi/create/modules/contraptions/components/actors/BlockBreakingKineticTileEntity.java → src/main/java/com/simibubi/create/content/contraptions/components/actors/BlockBreakingKineticTileEntity.java
View file

@ -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 java.util.concurrent.atomic.AtomicInteger;
import com.simibubi.create.content.contraptions.base.KineticTileEntity;
import com.simibubi.create.foundation.utility.VecHelper; import com.simibubi.create.foundation.utility.VecHelper;
import com.simibubi.create.modules.contraptions.base.KineticTileEntity;
import net.minecraft.block.AirBlock; import net.minecraft.block.AirBlock;
import net.minecraft.block.Block; import net.minecraft.block.Block;

8
src/main/java/com/simibubi/create/modules/contraptions/components/actors/BlockBreakingMovementBehaviour.java → src/main/java/com/simibubi/create/content/contraptions/components/actors/BlockBreakingMovementBehaviour.java
View file

@ -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.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.BlockState;
import net.minecraft.block.FallingBlock; import net.minecraft.block.FallingBlock;

10
src/main/java/com/simibubi/create/modules/contraptions/components/actors/DrillBlock.java → src/main/java/com/simibubi/create/content/contraptions/components/actors/DrillBlock.java
View file

@ -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.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.Block;
import net.minecraft.block.BlockState; import net.minecraft.block.BlockState;

4
src/main/java/com/simibubi/create/modules/contraptions/components/actors/DrillMovementBehaviour.java → src/main/java/com/simibubi/create/content/contraptions/components/actors/DrillMovementBehaviour.java
View file

@ -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.SuperByteBuffer;
import com.simibubi.create.foundation.utility.VecHelper; import com.simibubi.create.foundation.utility.VecHelper;
import com.simibubi.create.modules.contraptions.components.contraptions.MovementContext;
import net.minecraft.block.BlockState; import net.minecraft.block.BlockState;
import net.minecraft.util.DamageSource; import net.minecraft.util.DamageSource;

2
src/main/java/com/simibubi/create/modules/contraptions/components/actors/DrillTileEntity.java → src/main/java/com/simibubi/create/content/contraptions/components/actors/DrillTileEntity.java
View file

@ -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; import com.simibubi.create.AllTileEntities;

10
src/main/java/com/simibubi/create/modules/contraptions/components/actors/DrillTileEntityRenderer.java → src/main/java/com/simibubi/create/content/contraptions/components/actors/DrillTileEntityRenderer.java
View file

@ -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 static net.minecraft.state.properties.BlockStateProperties.FACING;
import com.simibubi.create.AllBlockPartials; 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.AnimationTickHolder;
import com.simibubi.create.foundation.utility.SuperByteBuffer; import com.simibubi.create.foundation.utility.SuperByteBuffer;
import com.simibubi.create.foundation.utility.VecHelper; 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.block.BlockState;
import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher;

6
src/main/java/com/simibubi/create/modules/contraptions/components/actors/HarvesterBlock.java → src/main/java/com/simibubi/create/content/contraptions/components/actors/HarvesterBlock.java
View file

@ -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.content.contraptions.components.structureMovement.IPortableBlock;
import com.simibubi.create.modules.contraptions.components.contraptions.MovementBehaviour; import com.simibubi.create.content.contraptions.components.structureMovement.MovementBehaviour;
import net.minecraft.block.BlockState; import net.minecraft.block.BlockState;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;

6
src/main/java/com/simibubi/create/modules/contraptions/components/actors/HarvesterMovementBehaviour.java → src/main/java/com/simibubi/create/content/contraptions/components/actors/HarvesterMovementBehaviour.java
View file

@ -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 static net.minecraft.block.HorizontalBlock.HORIZONTAL_FACING;
import org.apache.commons.lang3.mutable.MutableBoolean; 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.BlockHelper;
import com.simibubi.create.foundation.utility.SuperByteBuffer; import com.simibubi.create.foundation.utility.SuperByteBuffer;
import com.simibubi.create.foundation.utility.VecHelper; 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.BlockState;
import net.minecraft.block.Blocks; import net.minecraft.block.Blocks;

6
src/main/java/com/simibubi/create/modules/contraptions/components/actors/HarvesterRenderer.java → src/main/java/com/simibubi/create/content/contraptions/components/actors/HarvesterRenderer.java
View file

@ -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 static net.minecraft.state.properties.BlockStateProperties.HORIZONTAL_FACING;
import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.matrix.MatrixStack;
import com.simibubi.create.AllBlockPartials; 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.AnimationTickHolder;
import com.simibubi.create.foundation.utility.SuperByteBuffer; import com.simibubi.create.foundation.utility.SuperByteBuffer;
import com.simibubi.create.foundation.utility.VecHelper; import com.simibubi.create.foundation.utility.VecHelper;
import com.simibubi.create.modules.contraptions.components.contraptions.MovementContext;
import net.minecraft.block.BlockState; import net.minecraft.block.BlockState;
import net.minecraft.client.renderer.IRenderTypeBuffer; import net.minecraft.client.renderer.IRenderTypeBuffer;

4
src/main/java/com/simibubi/create/modules/contraptions/components/actors/HarvesterTileEntity.java → src/main/java/com/simibubi/create/content/contraptions/components/actors/HarvesterTileEntity.java
View file

@ -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.AllTileEntities;
import com.simibubi.create.foundation.block.SyncedTileEntity; import com.simibubi.create.foundation.tileEntity.SyncedTileEntity;
public class HarvesterTileEntity extends SyncedTileEntity { public class HarvesterTileEntity extends SyncedTileEntity {

4
src/main/java/com/simibubi/create/modules/contraptions/components/actors/PloughBlock.java → src/main/java/com/simibubi/create/content/contraptions/components/actors/PloughBlock.java
View file

@ -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 java.util.UUID;
import com.mojang.authlib.GameProfile; 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.minecraft.world.server.ServerWorld;
import net.minecraftforge.common.util.FakePlayer; import net.minecraftforge.common.util.FakePlayer;

6
src/main/java/com/simibubi/create/modules/contraptions/components/actors/PloughMovementBehaviour.java → src/main/java/com/simibubi/create/content/contraptions/components/actors/PloughMovementBehaviour.java
View file

@ -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 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.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.BlockState;
import net.minecraft.block.FlowingFluidBlock; import net.minecraft.block.FlowingFluidBlock;

8
src/main/java/com/simibubi/create/modules/contraptions/components/actors/PortableStorageInterfaceBlock.java → src/main/java/com/simibubi/create/content/contraptions/components/actors/PortableStorageInterfaceBlock.java
View file

@ -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.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.block.BlockState;
import net.minecraft.item.BlockItemUseContext; import net.minecraft.item.BlockItemUseContext;

8
src/main/java/com/simibubi/create/modules/contraptions/components/actors/SawMovementBehaviour.java → src/main/java/com/simibubi/create/content/contraptions/components/actors/SawMovementBehaviour.java
View file

@ -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.BlockHelper;
import com.simibubi.create.foundation.utility.TreeCutter; import com.simibubi.create.foundation.utility.TreeCutter;
import com.simibubi.create.foundation.utility.TreeCutter.Tree; import com.simibubi.create.foundation.utility.TreeCutter.Tree;
import com.simibubi.create.foundation.utility.VecHelper; 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.block.BlockState;
import net.minecraft.entity.item.ItemEntity; import net.minecraft.entity.item.ItemEntity;

18
src/main/java/com/simibubi/create/modules/contraptions/components/actors/StorageInterfaceMovement.java → src/main/java/com/simibubi/create/content/contraptions/components/actors/StorageInterfaceMovement.java
View file

@ -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 java.util.function.Predicate;
import com.simibubi.create.config.AllConfigs; import com.simibubi.create.content.contraptions.components.structureMovement.MovementBehaviour;
import com.simibubi.create.foundation.behaviour.base.TileEntityBehaviour; import com.simibubi.create.content.contraptions.components.structureMovement.MovementContext;
import com.simibubi.create.foundation.behaviour.filtering.FilteringBehaviour; import com.simibubi.create.content.logistics.block.transposer.TransposerBlock;
import com.simibubi.create.foundation.behaviour.inventory.SingleTargetAutoExtractingBehaviour; 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.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.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.item.ItemStack;
import net.minecraft.nbt.NBTUtil; import net.minecraft.nbt.NBTUtil;

6
src/main/java/com/simibubi/create/modules/contraptions/components/clock/CuckooClockBlock.java → src/main/java/com/simibubi/create/content/contraptions/components/clock/CuckooClockBlock.java
View file

@ -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.AllShapes;
import com.simibubi.create.modules.contraptions.base.HorizontalKineticBlock; import com.simibubi.create.content.contraptions.base.HorizontalKineticBlock;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.BlockState; import net.minecraft.block.BlockState;

8
src/main/java/com/simibubi/create/modules/contraptions/components/clock/CuckooClockRenderer.java → src/main/java/com/simibubi/create/content/contraptions/components/clock/CuckooClockRenderer.java
View file

@ -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.matrix.MatrixStack;
import com.mojang.blaze3d.vertex.IVertexBuilder; import com.mojang.blaze3d.vertex.IVertexBuilder;
import com.simibubi.create.AllBlockPartials; 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.AngleHelper;
import com.simibubi.create.foundation.utility.SuperByteBuffer; 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.block.BlockState;
import net.minecraft.client.renderer.IRenderTypeBuffer; import net.minecraft.client.renderer.IRenderTypeBuffer;

4
src/main/java/com/simibubi/create/modules/contraptions/components/clock/CuckooClockTileEntity.java → src/main/java/com/simibubi/create/content/contraptions/components/clock/CuckooClockTileEntity.java
View file

@ -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.deg;
import static com.simibubi.create.foundation.utility.AngleHelper.getShortestAngleDiff; import static com.simibubi.create.foundation.utility.AngleHelper.getShortestAngleDiff;
import static com.simibubi.create.foundation.utility.AngleHelper.rad; import static com.simibubi.create.foundation.utility.AngleHelper.rad;
import com.simibubi.create.AllTileEntities; 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.InterpolatedChasingValue;
import com.simibubi.create.foundation.gui.widgets.InterpolatedValue; import com.simibubi.create.foundation.gui.widgets.InterpolatedValue;
import com.simibubi.create.foundation.utility.AnimationTickHolder; import com.simibubi.create.foundation.utility.AnimationTickHolder;
import com.simibubi.create.foundation.utility.NBTHelper; import com.simibubi.create.foundation.utility.NBTHelper;
import com.simibubi.create.foundation.utility.VecHelper; import com.simibubi.create.foundation.utility.VecHelper;
import com.simibubi.create.modules.contraptions.base.KineticTileEntity;
import net.minecraft.nbt.CompoundNBT; import net.minecraft.nbt.CompoundNBT;
import net.minecraft.particles.ParticleTypes; import net.minecraft.particles.ParticleTypes;

4
src/main/java/com/simibubi/create/modules/contraptions/components/crafter/ConnectedInputHandler.java → src/main/java/com/simibubi/create/content/contraptions/components/crafter/ConnectedInputHandler.java
View file

@ -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.ArrayList;
import java.util.Arrays; import java.util.Arrays;

2
src/main/java/com/simibubi/create/modules/contraptions/components/crafter/ConnectedInputRenderer.java → src/main/java/com/simibubi/create/content/contraptions/components/crafter/ConnectedInputRenderer.java
View file

@ -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; import org.apache.commons.lang3.tuple.Pair;

6
src/main/java/com/simibubi/create/modules/contraptions/components/crafter/CrafterCTBehaviour.java → src/main/java/com/simibubi/create/content/contraptions/components/crafter/CrafterCTBehaviour.java
View file

@ -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.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.CTSpriteShiftEntry;
import com.simibubi.create.foundation.block.connected.ConnectedTextureBehaviour; 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.block.BlockState;
import net.minecraft.util.Direction; import net.minecraft.util.Direction;

2
src/main/java/com/simibubi/create/modules/contraptions/components/crafter/CrafterHelper.java → src/main/java/com/simibubi/create/content/contraptions/components/crafter/CrafterHelper.java
View file

@ -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.tileentity.TileEntity;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;

8
src/main/java/com/simibubi/create/modules/contraptions/components/crafter/MechanicalCrafterBlock.java → src/main/java/com/simibubi/create/content/contraptions/components/crafter/MechanicalCrafterBlock.java
View file

@ -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.AllBlocks;
import com.simibubi.create.AllItems; 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.block.ITE;
import com.simibubi.create.foundation.utility.AngleHelper; import com.simibubi.create.foundation.utility.AngleHelper;
import com.simibubi.create.foundation.utility.Lang; import com.simibubi.create.foundation.utility.Lang;
import com.simibubi.create.foundation.utility.VecHelper; 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.Block;
import net.minecraft.block.BlockState; import net.minecraft.block.BlockState;

20
src/main/java/com/simibubi/create/modules/contraptions/components/crafter/MechanicalCrafterTileEntity.java → src/main/java/com/simibubi/create/content/contraptions/components/crafter/MechanicalCrafterTileEntity.java
View file

@ -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.ArrayList;
import java.util.LinkedList; import java.util.LinkedList;
@ -10,15 +10,15 @@ import org.apache.commons.lang3.tuple.Pair;
import com.simibubi.create.AllBlocks; import com.simibubi.create.AllBlocks;
import com.simibubi.create.AllTileEntities; import com.simibubi.create.AllTileEntities;
import com.simibubi.create.foundation.behaviour.base.TileEntityBehaviour; import com.simibubi.create.content.contraptions.base.KineticTileEntity;
import com.simibubi.create.foundation.behaviour.inventory.InsertingBehaviour; import com.simibubi.create.content.contraptions.components.crafter.ConnectedInputHandler.ConnectedInput;
import com.simibubi.create.foundation.behaviour.inventory.InventoryManagementBehaviour.Attachments; 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.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.block.BlockState;
import net.minecraft.entity.item.ItemEntity; import net.minecraft.entity.item.ItemEntity;

12
src/main/java/com/simibubi/create/modules/contraptions/components/crafter/MechanicalCrafterTileEntityRenderer.java → src/main/java/com/simibubi/create/content/contraptions/components/crafter/MechanicalCrafterTileEntityRenderer.java
View file

@ -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.content.contraptions.base.HorizontalKineticBlock.HORIZONTAL_FACING;
import static com.simibubi.create.modules.contraptions.base.KineticTileEntityRenderer.standardKineticRotationTransform; import static com.simibubi.create.content.contraptions.base.KineticTileEntityRenderer.standardKineticRotationTransform;
import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.matrix.MatrixStack;
import com.mojang.blaze3d.vertex.IVertexBuilder; import com.mojang.blaze3d.vertex.IVertexBuilder;
import com.simibubi.create.AllBlockPartials; import com.simibubi.create.AllBlockPartials;
import com.simibubi.create.AllSpriteShifts; 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.AngleHelper;
import com.simibubi.create.foundation.utility.AnimationTickHolder; import com.simibubi.create.foundation.utility.AnimationTickHolder;
import com.simibubi.create.foundation.utility.SuperByteBuffer; import com.simibubi.create.foundation.utility.SuperByteBuffer;
import com.simibubi.create.foundation.utility.TessellatorHelper; 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.block.BlockState;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;

4
src/main/java/com/simibubi/create/modules/contraptions/components/crafter/MechanicalCraftingInventory.java → src/main/java/com/simibubi/create/content/contraptions/components/crafter/MechanicalCraftingInventory.java
View file

@ -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 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.entity.player.PlayerEntity;
import net.minecraft.inventory.CraftingInventory; import net.minecraft.inventory.CraftingInventory;

8
src/main/java/com/simibubi/create/modules/contraptions/components/crafter/MechanicalCraftingRecipe.java → src/main/java/com/simibubi/create/content/contraptions/components/crafter/MechanicalCraftingRecipe.java
View file

@ -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.google.gson.JsonObject;
import com.simibubi.create.AllRecipes; import com.simibubi.create.AllRecipeTypes;
import net.minecraft.inventory.CraftingInventory; import net.minecraft.inventory.CraftingInventory;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
@ -33,12 +33,12 @@ public class MechanicalCraftingRecipe extends ShapedRecipe {
@Override @Override
public IRecipeType<?> getType() { public IRecipeType<?> getType() {
return AllRecipes.MECHANICAL_CRAFTING.type; return AllRecipeTypes.MECHANICAL_CRAFTING.type;
} }
@Override @Override
public IRecipeSerializer<?> getSerializer() { public IRecipeSerializer<?> getSerializer() {
return AllRecipes.MECHANICAL_CRAFTING.serializer; return AllRecipeTypes.MECHANICAL_CRAFTING.serializer;
} }
public static class Serializer extends ShapedRecipe.Serializer { public static class Serializer extends ShapedRecipe.Serializer {

10
src/main/java/com/simibubi/create/modules/contraptions/components/crafter/RecipeGridHandler.java → src/main/java/com/simibubi/create/content/contraptions/components/crafter/RecipeGridHandler.java
View file

@ -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.ArrayList;
import java.util.HashMap; import java.util.HashMap;
@ -14,8 +14,8 @@ import org.apache.commons.lang3.tuple.Pair;
import com.google.common.base.Predicates; import com.google.common.base.Predicates;
import com.simibubi.create.AllBlocks; import com.simibubi.create.AllBlocks;
import com.simibubi.create.AllRecipes; import com.simibubi.create.AllRecipeTypes;
import com.simibubi.create.modules.contraptions.components.crafter.MechanicalCrafterBlock.Pointing; import com.simibubi.create.content.contraptions.components.crafter.MechanicalCrafterBlock.Pointing;
import net.minecraft.block.BlockState; import net.minecraft.block.BlockState;
import net.minecraft.inventory.CraftingInventory; import net.minecraft.inventory.CraftingInventory;
@ -128,7 +128,7 @@ public class RecipeGridHandler {
.orElse(null); .orElse(null);
if (result == null) if (result == null)
result = world.getRecipeManager() result = world.getRecipeManager()
.getRecipe(AllRecipes.MECHANICAL_CRAFTING.getType(), craftinginventory, world) .getRecipe(AllRecipeTypes.MECHANICAL_CRAFTING.getType(), craftinginventory, world)
.map(r -> r.getCraftingResult(craftinginventory)) .map(r -> r.getCraftingResult(craftinginventory))
.orElse(null); .orElse(null);

6
src/main/java/com/simibubi/create/modules/contraptions/components/crank/HandCrankBlock.java → src/main/java/com/simibubi/create/content/contraptions/components/crank/HandCrankBlock.java
View file

@ -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.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.Block;
import net.minecraft.block.BlockRenderType; import net.minecraft.block.BlockRenderType;

4
src/main/java/com/simibubi/create/modules/contraptions/components/crank/HandCrankTileEntity.java → src/main/java/com/simibubi/create/content/contraptions/components/crank/HandCrankTileEntity.java
View file

@ -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.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.nbt.CompoundNBT;

6
src/main/java/com/simibubi/create/modules/contraptions/components/crank/HandCrankTileEntityRenderer.java → src/main/java/com/simibubi/create/content/contraptions/components/crank/HandCrankTileEntityRenderer.java
View file

@ -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 static net.minecraft.state.properties.BlockStateProperties.FACING;
import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.matrix.MatrixStack;
import com.simibubi.create.AllBlockPartials; 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.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.block.BlockState;
import net.minecraft.client.renderer.IRenderTypeBuffer; import net.minecraft.client.renderer.IRenderTypeBuffer;

12
src/main/java/com/simibubi/create/modules/contraptions/components/crusher/AbstractCrushingRecipe.java → src/main/java/com/simibubi/create/content/contraptions/components/crusher/AbstractCrushingRecipe.java
View file

@ -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 java.util.List;
import com.simibubi.create.AllRecipes; import com.simibubi.create.AllRecipeTypes;
import com.simibubi.create.modules.contraptions.processing.ProcessingIngredient; import com.simibubi.create.content.contraptions.processing.ProcessingIngredient;
import com.simibubi.create.modules.contraptions.processing.ProcessingOutput; import com.simibubi.create.content.contraptions.processing.ProcessingOutput;
import com.simibubi.create.modules.contraptions.processing.ProcessingRecipe; import com.simibubi.create.content.contraptions.processing.ProcessingRecipe;
import net.minecraft.util.ResourceLocation; import net.minecraft.util.ResourceLocation;
import net.minecraftforge.items.wrapper.RecipeWrapper; import net.minecraftforge.items.wrapper.RecipeWrapper;
public abstract class AbstractCrushingRecipe extends ProcessingRecipe<RecipeWrapper> { public abstract class AbstractCrushingRecipe extends ProcessingRecipe<RecipeWrapper> {
public AbstractCrushingRecipe(AllRecipes recipeType, ResourceLocation id, String group, public AbstractCrushingRecipe(AllRecipeTypes recipeType, ResourceLocation id, String group,
List<ProcessingIngredient> ingredients, List<ProcessingOutput> results, int processingDuration) { List<ProcessingIngredient> ingredients, List<ProcessingOutput> results, int processingDuration) {
super(recipeType, id, group, ingredients, results, processingDuration); super(recipeType, id, group, ingredients, results, processingDuration);
} }

10
src/main/java/com/simibubi/create/modules/contraptions/components/crusher/CrushingRecipe.java → src/main/java/com/simibubi/create/content/contraptions/components/crusher/CrushingRecipe.java
View file

@ -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 java.util.List;
import com.simibubi.create.AllRecipes; import com.simibubi.create.AllRecipeTypes;
import com.simibubi.create.modules.contraptions.processing.ProcessingIngredient; import com.simibubi.create.content.contraptions.processing.ProcessingIngredient;
import com.simibubi.create.modules.contraptions.processing.ProcessingOutput; import com.simibubi.create.content.contraptions.processing.ProcessingOutput;
import net.minecraft.util.ResourceLocation; import net.minecraft.util.ResourceLocation;
import net.minecraft.world.World; import net.minecraft.world.World;
@ -14,7 +14,7 @@ public class CrushingRecipe extends AbstractCrushingRecipe {
public CrushingRecipe(ResourceLocation id, String group, List<ProcessingIngredient> ingredients, public CrushingRecipe(ResourceLocation id, String group, List<ProcessingIngredient> ingredients,
List<ProcessingOutput> results, int processingDuration) { List<ProcessingOutput> results, int processingDuration) {
super(AllRecipes.CRUSHING, id, group, ingredients, results, processingDuration); super(AllRecipeTypes.CRUSHING, id, group, ingredients, results, processingDuration);
} }
@Override @Override

8
src/main/java/com/simibubi/create/modules/contraptions/components/crusher/CrushingWheelBlock.java → src/main/java/com/simibubi/create/content/contraptions/components/crusher/CrushingWheelBlock.java
View file

@ -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.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.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.BlockRenderType;
import net.minecraft.block.BlockState; import net.minecraft.block.BlockState;

4
src/main/java/com/simibubi/create/modules/contraptions/components/crusher/CrushingWheelControllerBlock.java → src/main/java/com/simibubi/create/content/contraptions/components/crusher/CrushingWheelControllerBlock.java
View file

@ -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 java.util.Random;
import com.simibubi.create.AllBlocks; 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.block.ITE;
import com.simibubi.create.foundation.item.ItemHelper; import com.simibubi.create.foundation.item.ItemHelper;
import com.simibubi.create.modules.contraptions.base.KineticTileEntity;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.BlockState; import net.minecraft.block.BlockState;

16
src/main/java/com/simibubi/create/modules/contraptions/components/crusher/CrushingWheelControllerTileEntity.java → src/main/java/com/simibubi/create/content/contraptions/components/crusher/CrushingWheelControllerTileEntity.java
View file

@ -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.ArrayList;
import java.util.List; import java.util.List;
@ -6,14 +6,14 @@ import java.util.Optional;
import java.util.Random; import java.util.Random;
import java.util.UUID; import java.util.UUID;
import com.simibubi.create.AllRecipes; import com.simibubi.create.AllRecipeTypes;
import com.simibubi.create.AllTileEntities; import com.simibubi.create.AllTileEntities;
import com.simibubi.create.config.AllConfigs; import com.simibubi.create.content.contraptions.processing.ProcessingInventory;
import com.simibubi.create.foundation.block.SyncedTileEntity; 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.item.ItemHelper;
import com.simibubi.create.foundation.tileEntity.SyncedTileEntity;
import com.simibubi.create.foundation.utility.VecHelper; 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.Entity;
import net.minecraft.entity.item.ItemEntity; import net.minecraft.entity.item.ItemEntity;
@ -196,9 +196,9 @@ public class CrushingWheelControllerTileEntity extends SyncedTileEntity implemen
public Optional<ProcessingRecipe<RecipeWrapper>> findRecipe() { public Optional<ProcessingRecipe<RecipeWrapper>> findRecipe() {
Optional<ProcessingRecipe<RecipeWrapper>> crushingRecipe = Optional<ProcessingRecipe<RecipeWrapper>> crushingRecipe =
world.getRecipeManager().getRecipe(AllRecipes.CRUSHING.getType(), wrapper, world); world.getRecipeManager().getRecipe(AllRecipeTypes.CRUSHING.getType(), wrapper, world);
if (!crushingRecipe.isPresent()) if (!crushingRecipe.isPresent())
crushingRecipe = world.getRecipeManager().getRecipe(AllRecipes.MILLING.getType(), wrapper, world); crushingRecipe = world.getRecipeManager().getRecipe(AllRecipeTypes.MILLING.getType(), wrapper, world);
return crushingRecipe; return crushingRecipe;
} }

4
src/main/java/com/simibubi/create/modules/contraptions/components/crusher/CrushingWheelTileEntity.java → src/main/java/com/simibubi/create/content/contraptions/components/crusher/CrushingWheelTileEntity.java
View file

@ -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.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.DamageSource;
import net.minecraft.util.Direction; import net.minecraft.util.Direction;

14
src/main/java/com/simibubi/create/modules/contraptions/components/deployer/DeployerBlock.java → src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerBlock.java
View file

@ -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.AllItems;
import com.simibubi.create.foundation.behaviour.base.TileEntityBehaviour; import com.simibubi.create.AllShapes;
import com.simibubi.create.foundation.behaviour.filtering.FilteringBehaviour; 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.block.ITE;
import com.simibubi.create.foundation.utility.AllShapes; import com.simibubi.create.foundation.tileEntity.TileEntityBehaviour;
import com.simibubi.create.modules.contraptions.base.DirectionalAxisKineticBlock; import com.simibubi.create.foundation.tileEntity.behaviour.filtering.FilteringBehaviour;
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.block.BlockState;
import net.minecraft.block.material.PushReaction; import net.minecraft.block.material.PushReaction;

6
src/main/java/com/simibubi/create/modules/contraptions/components/deployer/DeployerFakePlayer.java → src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerFakePlayer.java
View file

@ -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.OptionalInt;
import java.util.UUID; import java.util.UUID;
@ -6,8 +6,8 @@ import java.util.UUID;
import org.apache.commons.lang3.tuple.Pair; import org.apache.commons.lang3.tuple.Pair;
import com.mojang.authlib.GameProfile; import com.mojang.authlib.GameProfile;
import com.simibubi.create.config.AllConfigs; import com.simibubi.create.foundation.config.AllConfigs;
import com.simibubi.create.config.CKinetics; import com.simibubi.create.foundation.config.CKinetics;
import com.simibubi.create.foundation.utility.Lang; import com.simibubi.create.foundation.utility.Lang;
import io.netty.util.concurrent.Future; import io.netty.util.concurrent.Future;

4
src/main/java/com/simibubi/create/modules/contraptions/components/deployer/DeployerFilterSlot.java → src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerFilterSlot.java
View file

@ -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.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.AngleHelper;
import com.simibubi.create.foundation.utility.VecHelper; import com.simibubi.create.foundation.utility.VecHelper;

8
src/main/java/com/simibubi/create/modules/contraptions/components/deployer/DeployerHandler.java → src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerHandler.java
View file

@ -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.DEFAULT;
import static net.minecraftforge.eventbus.api.Event.Result.DENY; 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 org.apache.commons.lang3.tuple.Pair;
import com.google.common.collect.Multimap; import com.google.common.collect.Multimap;
import com.simibubi.create.foundation.utility.WrappedWorld; import com.simibubi.create.content.contraptions.components.deployer.DeployerTileEntity.Mode;
import com.simibubi.create.modules.contraptions.components.deployer.DeployerTileEntity.Mode; import com.simibubi.create.content.curiosities.tools.SandPaperItem;
import com.simibubi.create.modules.curiosities.tools.SandPaperItem; import com.simibubi.create.foundation.utility.worldWrappers.WrappedWorld;
import net.minecraft.block.BlockState; import net.minecraft.block.BlockState;
import net.minecraft.block.Blocks; import net.minecraft.block.Blocks;

6
src/main/java/com/simibubi/create/modules/contraptions/components/deployer/DeployerItemHandler.java → src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerItemHandler.java
View file

@ -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.tileEntity.TileEntityBehaviour;
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.ItemStack;
import net.minecraft.util.Hand; import net.minecraft.util.Hand;

12
src/main/java/com/simibubi/create/modules/contraptions/components/deployer/DeployerMovementBehaviour.java → src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerMovementBehaviour.java
View file

@ -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.Arrays;
import java.util.List; import java.util.List;
import org.apache.commons.lang3.tuple.Pair; 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.item.ItemHelper;
import com.simibubi.create.foundation.utility.NBTHelper; import com.simibubi.create.foundation.utility.NBTHelper;
import com.simibubi.create.foundation.utility.SuperByteBuffer; import com.simibubi.create.foundation.utility.SuperByteBuffer;
import com.simibubi.create.foundation.utility.VecHelper; 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.entity.player.PlayerInventory;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;

14
src/main/java/com/simibubi/create/modules/contraptions/components/deployer/DeployerTileEntity.java → src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerTileEntity.java
View file

@ -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.ArrayList;
import java.util.Arrays; import java.util.Arrays;
@ -13,15 +13,15 @@ import org.apache.commons.lang3.tuple.Pair;
import com.simibubi.create.AllBlockPartials; import com.simibubi.create.AllBlockPartials;
import com.simibubi.create.AllBlocks; import com.simibubi.create.AllBlocks;
import com.simibubi.create.AllTileEntities; 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.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.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.NBTHelper;
import com.simibubi.create.foundation.utility.VecHelper; 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.item.ItemEntity;
import net.minecraft.entity.player.PlayerInventory; import net.minecraft.entity.player.PlayerInventory;

20
src/main/java/com/simibubi/create/modules/contraptions/components/deployer/DeployerTileEntityRenderer.java → src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerTileEntityRenderer.java
View file

@ -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.content.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.DirectionalKineticBlock.FACING;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
@ -9,18 +9,18 @@ import java.util.List;
import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.matrix.MatrixStack;
import com.mojang.blaze3d.vertex.IVertexBuilder; import com.mojang.blaze3d.vertex.IVertexBuilder;
import com.simibubi.create.AllBlockPartials; import com.simibubi.create.AllBlockPartials;
import com.simibubi.create.foundation.behaviour.filtering.FilteringRenderer; import com.simibubi.create.content.contraptions.base.KineticTileEntity;
import com.simibubi.create.foundation.block.SafeTileEntityRenderer; 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.AngleHelper;
import com.simibubi.create.foundation.utility.AnimationTickHolder; import com.simibubi.create.foundation.utility.AnimationTickHolder;
import com.simibubi.create.foundation.utility.NBTHelper; import com.simibubi.create.foundation.utility.NBTHelper;
import com.simibubi.create.foundation.utility.SuperByteBuffer; import com.simibubi.create.foundation.utility.SuperByteBuffer;
import com.simibubi.create.foundation.utility.VecHelper; 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.block.BlockState;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;

14
src/main/java/com/simibubi/create/modules/contraptions/components/fan/AirCurrent.java → src/main/java/com/simibubi/create/content/contraptions/components/fan/AirCurrent.java
View file

@ -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.ArrayList;
import java.util.Iterator; import java.util.Iterator;
@ -6,13 +6,13 @@ import java.util.List;
import org.apache.commons.lang3.tuple.Pair; 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.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.BlockState;
import net.minecraft.block.Blocks; import net.minecraft.block.Blocks;

6
src/main/java/com/simibubi/create/modules/contraptions/components/fan/EncasedFanBlock.java → src/main/java/com/simibubi/create/content/contraptions/components/fan/EncasedFanBlock.java
View file

@ -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.block.ITE;
import com.simibubi.create.foundation.utility.WrappedWorld; import com.simibubi.create.foundation.utility.worldWrappers.WrappedWorld;
import com.simibubi.create.modules.contraptions.base.DirectionalKineticBlock;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.BlockState; import net.minecraft.block.BlockState;

8
src/main/java/com/simibubi/create/modules/contraptions/components/fan/EncasedFanTileEntity.java → src/main/java/com/simibubi/create/content/contraptions/components/fan/EncasedFanTileEntity.java
View file

@ -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.AllBlockTags;
import com.simibubi.create.AllTileEntities; import com.simibubi.create.AllTileEntities;
import com.simibubi.create.config.AllConfigs; import com.simibubi.create.content.contraptions.base.GeneratingKineticTileEntity;
import com.simibubi.create.config.CKinetics; import com.simibubi.create.foundation.config.AllConfigs;
import com.simibubi.create.modules.contraptions.base.GeneratingKineticTileEntity; import com.simibubi.create.foundation.config.CKinetics;
import net.minecraft.nbt.CompoundNBT; import net.minecraft.nbt.CompoundNBT;
import net.minecraft.state.properties.BlockStateProperties; import net.minecraft.state.properties.BlockStateProperties;

Some files were not shown because too many files have changed in this diff Show more