mirror of
https://github.com/Creators-of-Create/Create.git
synced 2024-09-21 08:58:55 +02:00
Some re-repackaging
This commit is contained in:
parent
47f18aa1f9
commit
691786bbb9
89 changed files with 150 additions and 191 deletions
|
@ -202,6 +202,8 @@ import com.simibubi.create.content.trains.bogey.BogeyBlockEntityRenderer;
|
||||||
import com.simibubi.create.content.trains.bogey.StandardBogeyBlockEntity;
|
import com.simibubi.create.content.trains.bogey.StandardBogeyBlockEntity;
|
||||||
import com.simibubi.create.content.trains.display.FlapDisplayBlockEntity;
|
import com.simibubi.create.content.trains.display.FlapDisplayBlockEntity;
|
||||||
import com.simibubi.create.content.trains.display.FlapDisplayRenderer;
|
import com.simibubi.create.content.trains.display.FlapDisplayRenderer;
|
||||||
|
import com.simibubi.create.content.trains.observer.TrackObserverBlockEntity;
|
||||||
|
import com.simibubi.create.content.trains.observer.TrackObserverRenderer;
|
||||||
import com.simibubi.create.content.trains.signal.SignalBlockEntity;
|
import com.simibubi.create.content.trains.signal.SignalBlockEntity;
|
||||||
import com.simibubi.create.content.trains.signal.SignalRenderer;
|
import com.simibubi.create.content.trains.signal.SignalRenderer;
|
||||||
import com.simibubi.create.content.trains.station.StationBlockEntity;
|
import com.simibubi.create.content.trains.station.StationBlockEntity;
|
||||||
|
@ -211,8 +213,6 @@ import com.simibubi.create.content.trains.track.TrackBlockEntity;
|
||||||
import com.simibubi.create.content.trains.track.TrackInstance;
|
import com.simibubi.create.content.trains.track.TrackInstance;
|
||||||
import com.simibubi.create.content.trains.track.TrackMaterial;
|
import com.simibubi.create.content.trains.track.TrackMaterial;
|
||||||
import com.simibubi.create.content.trains.track.TrackRenderer;
|
import com.simibubi.create.content.trains.track.TrackRenderer;
|
||||||
import com.simibubi.create.content.trains.trackObserver.TrackObserverBlockEntity;
|
|
||||||
import com.simibubi.create.content.trains.trackObserver.TrackObserverRenderer;
|
|
||||||
import com.simibubi.create.foundation.blockEntity.renderer.SmartBlockEntityRenderer;
|
import com.simibubi.create.foundation.blockEntity.renderer.SmartBlockEntityRenderer;
|
||||||
import com.tterrag.registrate.util.entry.BlockEntityEntry;
|
import com.tterrag.registrate.util.entry.BlockEntityEntry;
|
||||||
|
|
||||||
|
|
|
@ -237,8 +237,8 @@ import com.simibubi.create.content.schematics.table.SchematicTableBlock;
|
||||||
import com.simibubi.create.content.trains.bogey.BogeySizes;
|
import com.simibubi.create.content.trains.bogey.BogeySizes;
|
||||||
import com.simibubi.create.content.trains.bogey.StandardBogeyBlock;
|
import com.simibubi.create.content.trains.bogey.StandardBogeyBlock;
|
||||||
import com.simibubi.create.content.trains.display.FlapDisplayBlock;
|
import com.simibubi.create.content.trains.display.FlapDisplayBlock;
|
||||||
import com.simibubi.create.content.trains.edgePoint.EdgePointType;
|
import com.simibubi.create.content.trains.graph.EdgePointType;
|
||||||
import com.simibubi.create.content.trains.edgePoint.TrackTargetingBlockItem;
|
import com.simibubi.create.content.trains.observer.TrackObserverBlock;
|
||||||
import com.simibubi.create.content.trains.signal.SignalBlock;
|
import com.simibubi.create.content.trains.signal.SignalBlock;
|
||||||
import com.simibubi.create.content.trains.station.StationBlock;
|
import com.simibubi.create.content.trains.station.StationBlock;
|
||||||
import com.simibubi.create.content.trains.track.FakeTrackBlock;
|
import com.simibubi.create.content.trains.track.FakeTrackBlock;
|
||||||
|
@ -247,7 +247,7 @@ import com.simibubi.create.content.trains.track.TrackBlockItem;
|
||||||
import com.simibubi.create.content.trains.track.TrackBlockStateGenerator;
|
import com.simibubi.create.content.trains.track.TrackBlockStateGenerator;
|
||||||
import com.simibubi.create.content.trains.track.TrackMaterial;
|
import com.simibubi.create.content.trains.track.TrackMaterial;
|
||||||
import com.simibubi.create.content.trains.track.TrackModel;
|
import com.simibubi.create.content.trains.track.TrackModel;
|
||||||
import com.simibubi.create.content.trains.trackObserver.TrackObserverBlock;
|
import com.simibubi.create.content.trains.track.TrackTargetingBlockItem;
|
||||||
import com.simibubi.create.foundation.block.CopperBlockSet;
|
import com.simibubi.create.foundation.block.CopperBlockSet;
|
||||||
import com.simibubi.create.foundation.block.DyedBlockList;
|
import com.simibubi.create.foundation.block.DyedBlockList;
|
||||||
import com.simibubi.create.foundation.block.ItemUseOverrides;
|
import com.simibubi.create.foundation.block.ItemUseOverrides;
|
||||||
|
|
|
@ -44,10 +44,10 @@ import com.simibubi.create.content.legacy.ShadowSteelItem;
|
||||||
import com.simibubi.create.content.logistics.filter.FilterItem;
|
import com.simibubi.create.content.logistics.filter.FilterItem;
|
||||||
import com.simibubi.create.content.materials.ExperienceNuggetItem;
|
import com.simibubi.create.content.materials.ExperienceNuggetItem;
|
||||||
import com.simibubi.create.content.processing.burner.BlazeBurnerBlockItem;
|
import com.simibubi.create.content.processing.burner.BlazeBurnerBlockItem;
|
||||||
import com.simibubi.create.content.processing.itemAssembly.SequencedAssemblyItem;
|
import com.simibubi.create.content.processing.sequenced.SequencedAssemblyItem;
|
||||||
import com.simibubi.create.content.redstone.link.controller.LinkedControllerItem;
|
import com.simibubi.create.content.redstone.link.controller.LinkedControllerItem;
|
||||||
import com.simibubi.create.content.schematics.item.SchematicAndQuillItem;
|
import com.simibubi.create.content.schematics.SchematicAndQuillItem;
|
||||||
import com.simibubi.create.content.schematics.item.SchematicItem;
|
import com.simibubi.create.content.schematics.SchematicItem;
|
||||||
import com.simibubi.create.content.trains.schedule.ScheduleItem;
|
import com.simibubi.create.content.trains.schedule.ScheduleItem;
|
||||||
import com.simibubi.create.foundation.data.AssetLookup;
|
import com.simibubi.create.foundation.data.AssetLookup;
|
||||||
import com.simibubi.create.foundation.data.CreateRegistrate;
|
import com.simibubi.create.foundation.data.CreateRegistrate;
|
||||||
|
|
|
@ -67,7 +67,6 @@ import com.simibubi.create.content.schematics.packet.SchematicSyncPacket;
|
||||||
import com.simibubi.create.content.schematics.packet.SchematicUploadPacket;
|
import com.simibubi.create.content.schematics.packet.SchematicUploadPacket;
|
||||||
import com.simibubi.create.content.trains.HonkPacket;
|
import com.simibubi.create.content.trains.HonkPacket;
|
||||||
import com.simibubi.create.content.trains.TrainHUDUpdatePacket;
|
import com.simibubi.create.content.trains.TrainHUDUpdatePacket;
|
||||||
import com.simibubi.create.content.trains.edgePoint.CurvedTrackSelectionPacket;
|
|
||||||
import com.simibubi.create.content.trains.entity.TrainPacket;
|
import com.simibubi.create.content.trains.entity.TrainPacket;
|
||||||
import com.simibubi.create.content.trains.entity.TrainPromptPacket;
|
import com.simibubi.create.content.trains.entity.TrainPromptPacket;
|
||||||
import com.simibubi.create.content.trains.entity.TrainRelocationPacket;
|
import com.simibubi.create.content.trains.entity.TrainRelocationPacket;
|
||||||
|
@ -80,6 +79,7 @@ import com.simibubi.create.content.trains.station.StationEditPacket;
|
||||||
import com.simibubi.create.content.trains.station.TrainEditPacket;
|
import com.simibubi.create.content.trains.station.TrainEditPacket;
|
||||||
import com.simibubi.create.content.trains.station.TrainEditPacket.TrainEditReturnPacket;
|
import com.simibubi.create.content.trains.station.TrainEditPacket.TrainEditReturnPacket;
|
||||||
import com.simibubi.create.content.trains.track.CurvedTrackDestroyPacket;
|
import com.simibubi.create.content.trains.track.CurvedTrackDestroyPacket;
|
||||||
|
import com.simibubi.create.content.trains.track.CurvedTrackSelectionPacket;
|
||||||
import com.simibubi.create.content.trains.track.PlaceExtendedCurvePacket;
|
import com.simibubi.create.content.trains.track.PlaceExtendedCurvePacket;
|
||||||
import com.simibubi.create.foundation.blockEntity.RemoveBlockEntityPacket;
|
import com.simibubi.create.foundation.blockEntity.RemoveBlockEntityPacket;
|
||||||
import com.simibubi.create.foundation.blockEntity.behaviour.ValueSettingsPacket;
|
import com.simibubi.create.foundation.blockEntity.behaviour.ValueSettingsPacket;
|
||||||
|
|
|
@ -24,8 +24,8 @@ import com.simibubi.create.content.kinetics.mixer.MixingRecipe;
|
||||||
import com.simibubi.create.content.kinetics.press.PressingRecipe;
|
import com.simibubi.create.content.kinetics.press.PressingRecipe;
|
||||||
import com.simibubi.create.content.kinetics.saw.CuttingRecipe;
|
import com.simibubi.create.content.kinetics.saw.CuttingRecipe;
|
||||||
import com.simibubi.create.content.processing.basin.BasinRecipe;
|
import com.simibubi.create.content.processing.basin.BasinRecipe;
|
||||||
import com.simibubi.create.content.processing.itemAssembly.SequencedAssemblyRecipeSerializer;
|
|
||||||
import com.simibubi.create.content.processing.recipe.ProcessingRecipeBuilder.ProcessingRecipeFactory;
|
import com.simibubi.create.content.processing.recipe.ProcessingRecipeBuilder.ProcessingRecipeFactory;
|
||||||
|
import com.simibubi.create.content.processing.sequenced.SequencedAssemblyRecipeSerializer;
|
||||||
import com.simibubi.create.content.processing.recipe.ProcessingRecipeSerializer;
|
import com.simibubi.create.content.processing.recipe.ProcessingRecipeSerializer;
|
||||||
import com.simibubi.create.foundation.recipe.IRecipeTypeInfo;
|
import com.simibubi.create.foundation.recipe.IRecipeTypeInfo;
|
||||||
import com.simibubi.create.foundation.utility.Lang;
|
import com.simibubi.create.foundation.utility.Lang;
|
||||||
|
|
|
@ -59,7 +59,7 @@ import com.simibubi.create.content.kinetics.saw.CuttingRecipe;
|
||||||
import com.simibubi.create.content.kinetics.saw.SawBlockEntity;
|
import com.simibubi.create.content.kinetics.saw.SawBlockEntity;
|
||||||
import com.simibubi.create.content.logistics.filter.AbstractFilterScreen;
|
import com.simibubi.create.content.logistics.filter.AbstractFilterScreen;
|
||||||
import com.simibubi.create.content.processing.basin.BasinRecipe;
|
import com.simibubi.create.content.processing.basin.BasinRecipe;
|
||||||
import com.simibubi.create.content.processing.itemAssembly.SequencedAssemblyRecipe;
|
import com.simibubi.create.content.processing.sequenced.SequencedAssemblyRecipe;
|
||||||
import com.simibubi.create.content.redstone.link.controller.LinkedControllerScreen;
|
import com.simibubi.create.content.redstone.link.controller.LinkedControllerScreen;
|
||||||
import com.simibubi.create.content.trains.schedule.ScheduleScreen;
|
import com.simibubi.create.content.trains.schedule.ScheduleScreen;
|
||||||
import com.simibubi.create.foundation.config.ConfigBase.ConfigBool;
|
import com.simibubi.create.foundation.config.ConfigBase.ConfigBool;
|
||||||
|
|
|
@ -11,8 +11,8 @@ import org.jetbrains.annotations.NotNull;
|
||||||
|
|
||||||
import com.mojang.blaze3d.vertex.PoseStack;
|
import com.mojang.blaze3d.vertex.PoseStack;
|
||||||
import com.simibubi.create.compat.jei.category.sequencedAssembly.SequencedAssemblySubCategory;
|
import com.simibubi.create.compat.jei.category.sequencedAssembly.SequencedAssemblySubCategory;
|
||||||
import com.simibubi.create.content.processing.itemAssembly.SequencedAssemblyRecipe;
|
import com.simibubi.create.content.processing.sequenced.SequencedAssemblyRecipe;
|
||||||
import com.simibubi.create.content.processing.itemAssembly.SequencedRecipe;
|
import com.simibubi.create.content.processing.sequenced.SequencedRecipe;
|
||||||
import com.simibubi.create.foundation.gui.AllGuiTextures;
|
import com.simibubi.create.foundation.gui.AllGuiTextures;
|
||||||
import com.simibubi.create.foundation.gui.AllIcons;
|
import com.simibubi.create.foundation.gui.AllIcons;
|
||||||
import com.simibubi.create.foundation.utility.Components;
|
import com.simibubi.create.foundation.utility.Components;
|
||||||
|
|
|
@ -7,7 +7,7 @@ import com.simibubi.create.compat.jei.category.animations.AnimatedPress;
|
||||||
import com.simibubi.create.compat.jei.category.animations.AnimatedSaw;
|
import com.simibubi.create.compat.jei.category.animations.AnimatedSaw;
|
||||||
import com.simibubi.create.compat.jei.category.animations.AnimatedSpout;
|
import com.simibubi.create.compat.jei.category.animations.AnimatedSpout;
|
||||||
import com.simibubi.create.content.kinetics.deployer.DeployerApplicationRecipe;
|
import com.simibubi.create.content.kinetics.deployer.DeployerApplicationRecipe;
|
||||||
import com.simibubi.create.content.processing.itemAssembly.SequencedRecipe;
|
import com.simibubi.create.content.processing.sequenced.SequencedRecipe;
|
||||||
import com.simibubi.create.foundation.fluid.FluidIngredient;
|
import com.simibubi.create.foundation.fluid.FluidIngredient;
|
||||||
import com.simibubi.create.foundation.utility.Lang;
|
import com.simibubi.create.foundation.utility.Lang;
|
||||||
|
|
||||||
|
|
|
@ -6,7 +6,7 @@ import java.util.Optional;
|
||||||
import com.simibubi.create.AllRecipeTypes;
|
import com.simibubi.create.AllRecipeTypes;
|
||||||
import com.simibubi.create.content.fluids.transfer.FillingRecipe;
|
import com.simibubi.create.content.fluids.transfer.FillingRecipe;
|
||||||
import com.simibubi.create.content.fluids.transfer.GenericItemFilling;
|
import com.simibubi.create.content.fluids.transfer.GenericItemFilling;
|
||||||
import com.simibubi.create.content.processing.itemAssembly.SequencedAssemblyRecipe;
|
import com.simibubi.create.content.processing.sequenced.SequencedAssemblyRecipe;
|
||||||
import com.simibubi.create.foundation.fluid.FluidIngredient;
|
import com.simibubi.create.foundation.fluid.FluidIngredient;
|
||||||
|
|
||||||
import net.minecraft.world.item.ItemStack;
|
import net.minecraft.world.item.ItemStack;
|
||||||
|
|
|
@ -7,9 +7,9 @@ import java.util.function.Supplier;
|
||||||
import com.simibubi.create.AllBlocks;
|
import com.simibubi.create.AllBlocks;
|
||||||
import com.simibubi.create.AllRecipeTypes;
|
import com.simibubi.create.AllRecipeTypes;
|
||||||
import com.simibubi.create.compat.jei.category.sequencedAssembly.SequencedAssemblySubCategory;
|
import com.simibubi.create.compat.jei.category.sequencedAssembly.SequencedAssemblySubCategory;
|
||||||
import com.simibubi.create.content.processing.itemAssembly.IAssemblyRecipe;
|
|
||||||
import com.simibubi.create.content.processing.recipe.ProcessingRecipe;
|
import com.simibubi.create.content.processing.recipe.ProcessingRecipe;
|
||||||
import com.simibubi.create.content.processing.recipe.ProcessingRecipeBuilder.ProcessingRecipeParams;
|
import com.simibubi.create.content.processing.recipe.ProcessingRecipeBuilder.ProcessingRecipeParams;
|
||||||
|
import com.simibubi.create.content.processing.sequenced.IAssemblyRecipe;
|
||||||
import com.simibubi.create.foundation.fluid.FluidIngredient;
|
import com.simibubi.create.foundation.fluid.FluidIngredient;
|
||||||
import com.simibubi.create.foundation.utility.Components;
|
import com.simibubi.create.foundation.utility.Components;
|
||||||
import com.simibubi.create.foundation.utility.Lang;
|
import com.simibubi.create.foundation.utility.Lang;
|
||||||
|
|
|
@ -8,9 +8,9 @@ import com.simibubi.create.AllBlocks;
|
||||||
import com.simibubi.create.AllRecipeTypes;
|
import com.simibubi.create.AllRecipeTypes;
|
||||||
import com.simibubi.create.AllTags.AllItemTags;
|
import com.simibubi.create.AllTags.AllItemTags;
|
||||||
import com.simibubi.create.compat.jei.category.sequencedAssembly.SequencedAssemblySubCategory;
|
import com.simibubi.create.compat.jei.category.sequencedAssembly.SequencedAssemblySubCategory;
|
||||||
import com.simibubi.create.content.processing.itemAssembly.IAssemblyRecipe;
|
|
||||||
import com.simibubi.create.content.processing.recipe.ProcessingRecipeBuilder;
|
import com.simibubi.create.content.processing.recipe.ProcessingRecipeBuilder;
|
||||||
import com.simibubi.create.content.processing.recipe.ProcessingRecipeBuilder.ProcessingRecipeParams;
|
import com.simibubi.create.content.processing.recipe.ProcessingRecipeBuilder.ProcessingRecipeParams;
|
||||||
|
import com.simibubi.create.content.processing.sequenced.IAssemblyRecipe;
|
||||||
import com.simibubi.create.foundation.utility.Components;
|
import com.simibubi.create.foundation.utility.Components;
|
||||||
import com.simibubi.create.foundation.utility.Lang;
|
import com.simibubi.create.foundation.utility.Lang;
|
||||||
|
|
||||||
|
|
|
@ -19,7 +19,7 @@ import com.simibubi.create.content.kinetics.base.IRotate.StressImpact;
|
||||||
import com.simibubi.create.content.kinetics.base.KineticBlockEntity;
|
import com.simibubi.create.content.kinetics.base.KineticBlockEntity;
|
||||||
import com.simibubi.create.content.kinetics.belt.behaviour.BeltProcessingBehaviour;
|
import com.simibubi.create.content.kinetics.belt.behaviour.BeltProcessingBehaviour;
|
||||||
import com.simibubi.create.content.kinetics.belt.behaviour.TransportedItemStackHandlerBehaviour;
|
import com.simibubi.create.content.kinetics.belt.behaviour.TransportedItemStackHandlerBehaviour;
|
||||||
import com.simibubi.create.content.processing.itemAssembly.SequencedAssemblyRecipe;
|
import com.simibubi.create.content.processing.sequenced.SequencedAssemblyRecipe;
|
||||||
import com.simibubi.create.foundation.advancement.AllAdvancements;
|
import com.simibubi.create.foundation.advancement.AllAdvancements;
|
||||||
import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
|
import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
|
||||||
import com.simibubi.create.foundation.blockEntity.behaviour.filtering.FilteringBehaviour;
|
import com.simibubi.create.foundation.blockEntity.behaviour.filtering.FilteringBehaviour;
|
||||||
|
|
|
@ -12,7 +12,7 @@ import com.simibubi.create.content.kinetics.press.PressingBehaviour.Mode;
|
||||||
import com.simibubi.create.content.kinetics.press.PressingBehaviour.PressingBehaviourSpecifics;
|
import com.simibubi.create.content.kinetics.press.PressingBehaviour.PressingBehaviourSpecifics;
|
||||||
import com.simibubi.create.content.processing.basin.BasinBlockEntity;
|
import com.simibubi.create.content.processing.basin.BasinBlockEntity;
|
||||||
import com.simibubi.create.content.processing.basin.BasinOperatingBlockEntity;
|
import com.simibubi.create.content.processing.basin.BasinOperatingBlockEntity;
|
||||||
import com.simibubi.create.content.processing.itemAssembly.SequencedAssemblyRecipe;
|
import com.simibubi.create.content.processing.sequenced.SequencedAssemblyRecipe;
|
||||||
import com.simibubi.create.foundation.advancement.AdvancementBehaviour;
|
import com.simibubi.create.foundation.advancement.AdvancementBehaviour;
|
||||||
import com.simibubi.create.foundation.advancement.AllAdvancements;
|
import com.simibubi.create.foundation.advancement.AllAdvancements;
|
||||||
import com.simibubi.create.foundation.advancement.CreateAdvancement;
|
import com.simibubi.create.foundation.advancement.CreateAdvancement;
|
||||||
|
|
|
@ -9,9 +9,9 @@ import javax.annotation.ParametersAreNonnullByDefault;
|
||||||
import com.simibubi.create.AllBlocks;
|
import com.simibubi.create.AllBlocks;
|
||||||
import com.simibubi.create.AllRecipeTypes;
|
import com.simibubi.create.AllRecipeTypes;
|
||||||
import com.simibubi.create.compat.jei.category.sequencedAssembly.SequencedAssemblySubCategory;
|
import com.simibubi.create.compat.jei.category.sequencedAssembly.SequencedAssemblySubCategory;
|
||||||
import com.simibubi.create.content.processing.itemAssembly.IAssemblyRecipe;
|
|
||||||
import com.simibubi.create.content.processing.recipe.ProcessingRecipe;
|
import com.simibubi.create.content.processing.recipe.ProcessingRecipe;
|
||||||
import com.simibubi.create.content.processing.recipe.ProcessingRecipeBuilder.ProcessingRecipeParams;
|
import com.simibubi.create.content.processing.recipe.ProcessingRecipeBuilder.ProcessingRecipeParams;
|
||||||
|
import com.simibubi.create.content.processing.sequenced.IAssemblyRecipe;
|
||||||
import com.simibubi.create.foundation.utility.Lang;
|
import com.simibubi.create.foundation.utility.Lang;
|
||||||
|
|
||||||
import net.minecraft.network.chat.Component;
|
import net.minecraft.network.chat.Component;
|
||||||
|
|
|
@ -9,9 +9,9 @@ import javax.annotation.ParametersAreNonnullByDefault;
|
||||||
import com.simibubi.create.AllBlocks;
|
import com.simibubi.create.AllBlocks;
|
||||||
import com.simibubi.create.AllRecipeTypes;
|
import com.simibubi.create.AllRecipeTypes;
|
||||||
import com.simibubi.create.compat.jei.category.sequencedAssembly.SequencedAssemblySubCategory;
|
import com.simibubi.create.compat.jei.category.sequencedAssembly.SequencedAssemblySubCategory;
|
||||||
import com.simibubi.create.content.processing.itemAssembly.IAssemblyRecipe;
|
|
||||||
import com.simibubi.create.content.processing.recipe.ProcessingRecipe;
|
import com.simibubi.create.content.processing.recipe.ProcessingRecipe;
|
||||||
import com.simibubi.create.content.processing.recipe.ProcessingRecipeBuilder.ProcessingRecipeParams;
|
import com.simibubi.create.content.processing.recipe.ProcessingRecipeBuilder.ProcessingRecipeParams;
|
||||||
|
import com.simibubi.create.content.processing.sequenced.IAssemblyRecipe;
|
||||||
import com.simibubi.create.foundation.utility.Lang;
|
import com.simibubi.create.foundation.utility.Lang;
|
||||||
|
|
||||||
import net.minecraft.network.chat.Component;
|
import net.minecraft.network.chat.Component;
|
||||||
|
|
|
@ -17,8 +17,8 @@ import com.simibubi.create.AllRecipeTypes;
|
||||||
import com.simibubi.create.AllSoundEvents;
|
import com.simibubi.create.AllSoundEvents;
|
||||||
import com.simibubi.create.content.kinetics.base.BlockBreakingKineticBlockEntity;
|
import com.simibubi.create.content.kinetics.base.BlockBreakingKineticBlockEntity;
|
||||||
import com.simibubi.create.content.kinetics.belt.behaviour.DirectBeltInputBehaviour;
|
import com.simibubi.create.content.kinetics.belt.behaviour.DirectBeltInputBehaviour;
|
||||||
import com.simibubi.create.content.processing.itemAssembly.SequencedAssemblyRecipe;
|
|
||||||
import com.simibubi.create.content.processing.recipe.ProcessingInventory;
|
import com.simibubi.create.content.processing.recipe.ProcessingInventory;
|
||||||
|
import com.simibubi.create.content.processing.sequenced.SequencedAssemblyRecipe;
|
||||||
import com.simibubi.create.foundation.advancement.AllAdvancements;
|
import com.simibubi.create.foundation.advancement.AllAdvancements;
|
||||||
import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
|
import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
|
||||||
import com.simibubi.create.foundation.blockEntity.behaviour.filtering.FilteringBehaviour;
|
import com.simibubi.create.foundation.blockEntity.behaviour.filtering.FilteringBehaviour;
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
package com.simibubi.create.content.processing.itemAssembly;
|
package com.simibubi.create.content.processing.sequenced;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
|
@ -1,4 +1,4 @@
|
||||||
package com.simibubi.create.content.processing.itemAssembly;
|
package com.simibubi.create.content.processing.sequenced;
|
||||||
|
|
||||||
import com.simibubi.create.foundation.utility.Color;
|
import com.simibubi.create.foundation.utility.Color;
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
package com.simibubi.create.content.processing.itemAssembly;
|
package com.simibubi.create.content.processing.sequenced;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.HashSet;
|
import java.util.HashSet;
|
|
@ -1,4 +1,4 @@
|
||||||
package com.simibubi.create.content.processing.itemAssembly;
|
package com.simibubi.create.content.processing.sequenced;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
|
@ -1,4 +1,4 @@
|
||||||
package com.simibubi.create.content.processing.itemAssembly;
|
package com.simibubi.create.content.processing.sequenced;
|
||||||
|
|
||||||
import com.google.gson.JsonArray;
|
import com.google.gson.JsonArray;
|
||||||
import com.google.gson.JsonElement;
|
import com.google.gson.JsonElement;
|
|
@ -1,4 +1,4 @@
|
||||||
package com.simibubi.create.content.processing.itemAssembly;
|
package com.simibubi.create.content.processing.sequenced;
|
||||||
|
|
||||||
import com.google.common.collect.ImmutableList;
|
import com.google.common.collect.ImmutableList;
|
||||||
import com.google.gson.JsonObject;
|
import com.google.gson.JsonObject;
|
|
@ -6,8 +6,8 @@ import com.simibubi.create.Create;
|
||||||
import com.simibubi.create.content.redstone.displayLink.DisplayLinkContext;
|
import com.simibubi.create.content.redstone.displayLink.DisplayLinkContext;
|
||||||
import com.simibubi.create.content.redstone.displayLink.target.DisplayTargetStats;
|
import com.simibubi.create.content.redstone.displayLink.target.DisplayTargetStats;
|
||||||
import com.simibubi.create.content.trains.entity.Train;
|
import com.simibubi.create.content.trains.entity.Train;
|
||||||
import com.simibubi.create.content.trains.trackObserver.TrackObserver;
|
import com.simibubi.create.content.trains.observer.TrackObserver;
|
||||||
import com.simibubi.create.content.trains.trackObserver.TrackObserverBlockEntity;
|
import com.simibubi.create.content.trains.observer.TrackObserverBlockEntity;
|
||||||
|
|
||||||
import net.minecraft.network.chat.MutableComponent;
|
import net.minecraft.network.chat.MutableComponent;
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
package com.simibubi.create.content.schematics.item;
|
package com.simibubi.create.content.schematics;
|
||||||
|
|
||||||
import java.util.Iterator;
|
import java.util.Iterator;
|
||||||
|
|
|
@ -9,7 +9,6 @@ import java.nio.file.StandardOpenOption;
|
||||||
import javax.annotation.Nullable;
|
import javax.annotation.Nullable;
|
||||||
|
|
||||||
import com.simibubi.create.Create;
|
import com.simibubi.create.Create;
|
||||||
import com.simibubi.create.content.schematics.item.SchematicAndQuillItem;
|
|
||||||
import com.simibubi.create.foundation.utility.FilesHelper;
|
import com.simibubi.create.foundation.utility.FilesHelper;
|
||||||
import com.simibubi.create.foundation.utility.Lang;
|
import com.simibubi.create.foundation.utility.Lang;
|
||||||
|
|
||||||
|
|
|
@ -7,7 +7,6 @@ import javax.annotation.Nullable;
|
||||||
import com.google.common.cache.Cache;
|
import com.google.common.cache.Cache;
|
||||||
import com.google.common.cache.CacheBuilder;
|
import com.google.common.cache.CacheBuilder;
|
||||||
import com.simibubi.create.content.contraptions.StructureTransform;
|
import com.simibubi.create.content.contraptions.StructureTransform;
|
||||||
import com.simibubi.create.content.schematics.item.SchematicItem;
|
|
||||||
import com.simibubi.create.foundation.utility.WorldAttached;
|
import com.simibubi.create.foundation.utility.WorldAttached;
|
||||||
|
|
||||||
import net.minecraft.core.BlockPos;
|
import net.minecraft.core.BlockPos;
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
package com.simibubi.create.content.schematics.item;
|
package com.simibubi.create.content.schematics;
|
||||||
|
|
||||||
import java.io.BufferedInputStream;
|
import java.io.BufferedInputStream;
|
||||||
import java.io.DataInputStream;
|
import java.io.DataInputStream;
|
||||||
|
@ -16,8 +16,6 @@ import org.slf4j.Logger;
|
||||||
|
|
||||||
import com.mojang.logging.LogUtils;
|
import com.mojang.logging.LogUtils;
|
||||||
import com.simibubi.create.AllItems;
|
import com.simibubi.create.AllItems;
|
||||||
import com.simibubi.create.content.schematics.SchematicInstances;
|
|
||||||
import com.simibubi.create.content.schematics.SchematicProcessor;
|
|
||||||
import com.simibubi.create.content.schematics.client.SchematicEditScreen;
|
import com.simibubi.create.content.schematics.client.SchematicEditScreen;
|
||||||
import com.simibubi.create.foundation.gui.ScreenOpener;
|
import com.simibubi.create.foundation.gui.ScreenOpener;
|
||||||
import com.simibubi.create.foundation.utility.Components;
|
import com.simibubi.create.foundation.utility.Components;
|
|
@ -9,7 +9,6 @@ import com.simibubi.create.Create;
|
||||||
import com.simibubi.create.content.contraptions.BlockMovementChecks;
|
import com.simibubi.create.content.contraptions.BlockMovementChecks;
|
||||||
import com.simibubi.create.content.contraptions.StructureTransform;
|
import com.simibubi.create.content.contraptions.StructureTransform;
|
||||||
import com.simibubi.create.content.schematics.cannon.MaterialChecklist;
|
import com.simibubi.create.content.schematics.cannon.MaterialChecklist;
|
||||||
import com.simibubi.create.content.schematics.item.SchematicItem;
|
|
||||||
import com.simibubi.create.content.schematics.requirement.ItemRequirement;
|
import com.simibubi.create.content.schematics.requirement.ItemRequirement;
|
||||||
import com.simibubi.create.foundation.blockEntity.IMergeableBE;
|
import com.simibubi.create.foundation.blockEntity.IMergeableBE;
|
||||||
import com.simibubi.create.foundation.utility.BBHelper;
|
import com.simibubi.create.foundation.utility.BBHelper;
|
||||||
|
|
|
@ -18,7 +18,6 @@ import com.simibubi.create.AllBlocks;
|
||||||
import com.simibubi.create.AllItems;
|
import com.simibubi.create.AllItems;
|
||||||
import com.simibubi.create.Create;
|
import com.simibubi.create.Create;
|
||||||
import com.simibubi.create.content.schematics.SchematicExport.SchematicExportResult;
|
import com.simibubi.create.content.schematics.SchematicExport.SchematicExportResult;
|
||||||
import com.simibubi.create.content.schematics.item.SchematicItem;
|
|
||||||
import com.simibubi.create.content.schematics.table.SchematicTableBlockEntity;
|
import com.simibubi.create.content.schematics.table.SchematicTableBlockEntity;
|
||||||
import com.simibubi.create.foundation.utility.Components;
|
import com.simibubi.create.foundation.utility.Components;
|
||||||
import com.simibubi.create.foundation.utility.FilesHelper;
|
import com.simibubi.create.foundation.utility.FilesHelper;
|
||||||
|
|
|
@ -12,9 +12,9 @@ import com.simibubi.create.AllPackets;
|
||||||
import com.simibubi.create.Create;
|
import com.simibubi.create.Create;
|
||||||
import com.simibubi.create.content.contraptions.StructureTransform;
|
import com.simibubi.create.content.contraptions.StructureTransform;
|
||||||
import com.simibubi.create.content.schematics.SchematicInstances;
|
import com.simibubi.create.content.schematics.SchematicInstances;
|
||||||
|
import com.simibubi.create.content.schematics.SchematicItem;
|
||||||
import com.simibubi.create.content.schematics.SchematicWorld;
|
import com.simibubi.create.content.schematics.SchematicWorld;
|
||||||
import com.simibubi.create.content.schematics.client.tools.ToolType;
|
import com.simibubi.create.content.schematics.client.tools.ToolType;
|
||||||
import com.simibubi.create.content.schematics.item.SchematicItem;
|
|
||||||
import com.simibubi.create.content.schematics.packet.SchematicPlacePacket;
|
import com.simibubi.create.content.schematics.packet.SchematicPlacePacket;
|
||||||
import com.simibubi.create.content.schematics.packet.SchematicSyncPacket;
|
import com.simibubi.create.content.schematics.packet.SchematicSyncPacket;
|
||||||
import com.simibubi.create.foundation.outliner.AABBOutline;
|
import com.simibubi.create.foundation.outliner.AABBOutline;
|
||||||
|
|
|
@ -5,8 +5,9 @@ import java.util.Map;
|
||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
|
|
||||||
import com.simibubi.create.Create;
|
import com.simibubi.create.Create;
|
||||||
import com.simibubi.create.content.trains.edgePoint.EdgePointType;
|
|
||||||
import com.simibubi.create.content.trains.entity.Train;
|
import com.simibubi.create.content.trains.entity.Train;
|
||||||
|
import com.simibubi.create.content.trains.graph.DimensionPalette;
|
||||||
|
import com.simibubi.create.content.trains.graph.EdgePointType;
|
||||||
import com.simibubi.create.content.trains.graph.TrackGraph;
|
import com.simibubi.create.content.trains.graph.TrackGraph;
|
||||||
import com.simibubi.create.content.trains.signal.SignalBoundary;
|
import com.simibubi.create.content.trains.signal.SignalBoundary;
|
||||||
import com.simibubi.create.content.trains.signal.SignalEdgeGroup;
|
import com.simibubi.create.content.trains.signal.SignalEdgeGroup;
|
||||||
|
|
|
@ -20,9 +20,9 @@ import org.apache.commons.lang3.mutable.MutableDouble;
|
||||||
|
|
||||||
import com.simibubi.create.content.contraptions.Contraption;
|
import com.simibubi.create.content.contraptions.Contraption;
|
||||||
import com.simibubi.create.content.contraptions.minecart.TrainCargoManager;
|
import com.simibubi.create.content.contraptions.minecart.TrainCargoManager;
|
||||||
import com.simibubi.create.content.trains.DimensionPalette;
|
|
||||||
import com.simibubi.create.content.trains.entity.TravellingPoint.IEdgePointListener;
|
import com.simibubi.create.content.trains.entity.TravellingPoint.IEdgePointListener;
|
||||||
import com.simibubi.create.content.trains.entity.TravellingPoint.ITrackSelector;
|
import com.simibubi.create.content.trains.entity.TravellingPoint.ITrackSelector;
|
||||||
|
import com.simibubi.create.content.trains.graph.DimensionPalette;
|
||||||
import com.simibubi.create.content.trains.graph.TrackGraph;
|
import com.simibubi.create.content.trains.graph.TrackGraph;
|
||||||
import com.simibubi.create.content.trains.graph.TrackNodeLocation;
|
import com.simibubi.create.content.trains.graph.TrackNodeLocation;
|
||||||
import com.simibubi.create.foundation.advancement.AllAdvancements;
|
import com.simibubi.create.foundation.advancement.AllAdvancements;
|
||||||
|
|
|
@ -8,11 +8,11 @@ import javax.annotation.Nullable;
|
||||||
import com.jozufozu.flywheel.api.MaterialManager;
|
import com.jozufozu.flywheel.api.MaterialManager;
|
||||||
import com.simibubi.create.AllBogeyStyles;
|
import com.simibubi.create.AllBogeyStyles;
|
||||||
import com.simibubi.create.Create;
|
import com.simibubi.create.Create;
|
||||||
import com.simibubi.create.content.trains.DimensionPalette;
|
|
||||||
import com.simibubi.create.content.trains.bogey.AbstractBogeyBlock;
|
import com.simibubi.create.content.trains.bogey.AbstractBogeyBlock;
|
||||||
import com.simibubi.create.content.trains.bogey.AbstractBogeyBlockEntity;
|
import com.simibubi.create.content.trains.bogey.AbstractBogeyBlockEntity;
|
||||||
import com.simibubi.create.content.trains.bogey.BogeyInstance;
|
import com.simibubi.create.content.trains.bogey.BogeyInstance;
|
||||||
import com.simibubi.create.content.trains.bogey.BogeyStyle;
|
import com.simibubi.create.content.trains.bogey.BogeyStyle;
|
||||||
|
import com.simibubi.create.content.trains.graph.DimensionPalette;
|
||||||
import com.simibubi.create.content.trains.graph.TrackGraph;
|
import com.simibubi.create.content.trains.graph.TrackGraph;
|
||||||
import com.simibubi.create.foundation.utility.AngleHelper;
|
import com.simibubi.create.foundation.utility.AngleHelper;
|
||||||
import com.simibubi.create.foundation.utility.Couple;
|
import com.simibubi.create.foundation.utility.Couple;
|
||||||
|
|
|
@ -18,10 +18,10 @@ import org.apache.commons.lang3.mutable.MutableDouble;
|
||||||
import org.apache.commons.lang3.mutable.MutableObject;
|
import org.apache.commons.lang3.mutable.MutableObject;
|
||||||
|
|
||||||
import com.simibubi.create.Create;
|
import com.simibubi.create.Create;
|
||||||
import com.simibubi.create.content.trains.DimensionPalette;
|
|
||||||
import com.simibubi.create.content.trains.edgePoint.EdgeData;
|
|
||||||
import com.simibubi.create.content.trains.edgePoint.EdgePointType;
|
|
||||||
import com.simibubi.create.content.trains.entity.TravellingPoint.ITrackSelector;
|
import com.simibubi.create.content.trains.entity.TravellingPoint.ITrackSelector;
|
||||||
|
import com.simibubi.create.content.trains.graph.DimensionPalette;
|
||||||
|
import com.simibubi.create.content.trains.graph.EdgeData;
|
||||||
|
import com.simibubi.create.content.trains.graph.EdgePointType;
|
||||||
import com.simibubi.create.content.trains.graph.TrackEdge;
|
import com.simibubi.create.content.trains.graph.TrackEdge;
|
||||||
import com.simibubi.create.content.trains.graph.TrackGraph;
|
import com.simibubi.create.content.trains.graph.TrackGraph;
|
||||||
import com.simibubi.create.content.trains.graph.TrackNode;
|
import com.simibubi.create.content.trains.graph.TrackNode;
|
||||||
|
|
|
@ -25,17 +25,18 @@ import com.simibubi.create.AllPackets;
|
||||||
import com.simibubi.create.Create;
|
import com.simibubi.create.Create;
|
||||||
import com.simibubi.create.content.contraptions.behaviour.MovementBehaviour;
|
import com.simibubi.create.content.contraptions.behaviour.MovementBehaviour;
|
||||||
import com.simibubi.create.content.logistics.filter.FilterItem;
|
import com.simibubi.create.content.logistics.filter.FilterItem;
|
||||||
import com.simibubi.create.content.trains.DimensionPalette;
|
|
||||||
import com.simibubi.create.content.trains.bogey.AbstractBogeyBlockEntity;
|
import com.simibubi.create.content.trains.bogey.AbstractBogeyBlockEntity;
|
||||||
import com.simibubi.create.content.trains.edgePoint.EdgeData;
|
|
||||||
import com.simibubi.create.content.trains.edgePoint.EdgePointType;
|
|
||||||
import com.simibubi.create.content.trains.entity.Carriage.DimensionalCarriageEntity;
|
import com.simibubi.create.content.trains.entity.Carriage.DimensionalCarriageEntity;
|
||||||
import com.simibubi.create.content.trains.entity.TravellingPoint.IEdgePointListener;
|
import com.simibubi.create.content.trains.entity.TravellingPoint.IEdgePointListener;
|
||||||
import com.simibubi.create.content.trains.entity.TravellingPoint.SteerDirection;
|
import com.simibubi.create.content.trains.entity.TravellingPoint.SteerDirection;
|
||||||
import com.simibubi.create.content.trains.graph.GraphLocation;
|
import com.simibubi.create.content.trains.graph.TrackGraphLocation;
|
||||||
|
import com.simibubi.create.content.trains.graph.DimensionPalette;
|
||||||
|
import com.simibubi.create.content.trains.graph.EdgeData;
|
||||||
|
import com.simibubi.create.content.trains.graph.EdgePointType;
|
||||||
import com.simibubi.create.content.trains.graph.TrackEdge;
|
import com.simibubi.create.content.trains.graph.TrackEdge;
|
||||||
import com.simibubi.create.content.trains.graph.TrackGraph;
|
import com.simibubi.create.content.trains.graph.TrackGraph;
|
||||||
import com.simibubi.create.content.trains.graph.TrackNode;
|
import com.simibubi.create.content.trains.graph.TrackNode;
|
||||||
|
import com.simibubi.create.content.trains.observer.TrackObserver;
|
||||||
import com.simibubi.create.content.trains.schedule.ScheduleRuntime;
|
import com.simibubi.create.content.trains.schedule.ScheduleRuntime;
|
||||||
import com.simibubi.create.content.trains.schedule.ScheduleRuntime.State;
|
import com.simibubi.create.content.trains.schedule.ScheduleRuntime.State;
|
||||||
import com.simibubi.create.content.trains.signal.SignalBlock.SignalType;
|
import com.simibubi.create.content.trains.signal.SignalBlock.SignalType;
|
||||||
|
@ -43,7 +44,6 @@ import com.simibubi.create.content.trains.signal.SignalBoundary;
|
||||||
import com.simibubi.create.content.trains.signal.SignalEdgeGroup;
|
import com.simibubi.create.content.trains.signal.SignalEdgeGroup;
|
||||||
import com.simibubi.create.content.trains.station.GlobalStation;
|
import com.simibubi.create.content.trains.station.GlobalStation;
|
||||||
import com.simibubi.create.content.trains.station.StationBlockEntity;
|
import com.simibubi.create.content.trains.station.StationBlockEntity;
|
||||||
import com.simibubi.create.content.trains.trackObserver.TrackObserver;
|
|
||||||
import com.simibubi.create.foundation.advancement.AllAdvancements;
|
import com.simibubi.create.foundation.advancement.AllAdvancements;
|
||||||
import com.simibubi.create.foundation.utility.Couple;
|
import com.simibubi.create.foundation.utility.Couple;
|
||||||
import com.simibubi.create.foundation.utility.Iterate;
|
import com.simibubi.create.foundation.utility.Iterate;
|
||||||
|
@ -843,11 +843,11 @@ public class Train {
|
||||||
}
|
}
|
||||||
|
|
||||||
Set<Entry<UUID, TrackGraph>> entrySet = new HashSet<>(Create.RAILWAYS.trackNetworks.entrySet());
|
Set<Entry<UUID, TrackGraph>> entrySet = new HashSet<>(Create.RAILWAYS.trackNetworks.entrySet());
|
||||||
Map<UUID, List<GraphLocation>> successfulMigrations = new HashMap<>();
|
Map<UUID, List<TrackGraphLocation>> successfulMigrations = new HashMap<>();
|
||||||
for (TrainMigration md : migratingPoints) {
|
for (TrainMigration md : migratingPoints) {
|
||||||
for (Iterator<Entry<UUID, TrackGraph>> iterator = entrySet.iterator(); iterator.hasNext();) {
|
for (Iterator<Entry<UUID, TrackGraph>> iterator = entrySet.iterator(); iterator.hasNext();) {
|
||||||
Entry<UUID, TrackGraph> entry = iterator.next();
|
Entry<UUID, TrackGraph> entry = iterator.next();
|
||||||
GraphLocation gl = md.tryMigratingTo(entry.getValue());
|
TrackGraphLocation gl = md.tryMigratingTo(entry.getValue());
|
||||||
if (gl == null) {
|
if (gl == null) {
|
||||||
iterator.remove();
|
iterator.remove();
|
||||||
continue;
|
continue;
|
||||||
|
@ -866,7 +866,7 @@ public class Train {
|
||||||
|
|
||||||
for (Entry<UUID, TrackGraph> entry : entrySet) {
|
for (Entry<UUID, TrackGraph> entry : entrySet) {
|
||||||
graph = entry.getValue();
|
graph = entry.getValue();
|
||||||
List<GraphLocation> locations = successfulMigrations.get(entry.getKey());
|
List<TrackGraphLocation> locations = successfulMigrations.get(entry.getKey());
|
||||||
forEachTravellingPoint(tp -> tp.migrateTo(locations));
|
forEachTravellingPoint(tp -> tp.migrateTo(locations));
|
||||||
migratingPoints.clear();
|
migratingPoints.clear();
|
||||||
if (derailed)
|
if (derailed)
|
||||||
|
|
|
@ -2,8 +2,8 @@ package com.simibubi.create.content.trains.entity;
|
||||||
|
|
||||||
import java.util.Map.Entry;
|
import java.util.Map.Entry;
|
||||||
|
|
||||||
import com.simibubi.create.content.trains.DimensionPalette;
|
import com.simibubi.create.content.trains.graph.TrackGraphLocation;
|
||||||
import com.simibubi.create.content.trains.graph.GraphLocation;
|
import com.simibubi.create.content.trains.graph.DimensionPalette;
|
||||||
import com.simibubi.create.content.trains.graph.TrackEdge;
|
import com.simibubi.create.content.trains.graph.TrackEdge;
|
||||||
import com.simibubi.create.content.trains.graph.TrackGraph;
|
import com.simibubi.create.content.trains.graph.TrackGraph;
|
||||||
import com.simibubi.create.content.trains.graph.TrackNode;
|
import com.simibubi.create.content.trains.graph.TrackNode;
|
||||||
|
@ -33,14 +33,14 @@ public class TrainMigration {
|
||||||
locations = Couple.create(point.node1.getLocation(), point.node2.getLocation());
|
locations = Couple.create(point.node1.getLocation(), point.node2.getLocation());
|
||||||
}
|
}
|
||||||
|
|
||||||
public GraphLocation tryMigratingTo(TrackGraph graph) {
|
public TrackGraphLocation tryMigratingTo(TrackGraph graph) {
|
||||||
TrackNode node1 = graph.locateNode(locations.getFirst());
|
TrackNode node1 = graph.locateNode(locations.getFirst());
|
||||||
TrackNode node2 = graph.locateNode(locations.getSecond());
|
TrackNode node2 = graph.locateNode(locations.getSecond());
|
||||||
if (node1 != null && node2 != null) {
|
if (node1 != null && node2 != null) {
|
||||||
TrackEdge edge = graph.getConnectionsFrom(node1)
|
TrackEdge edge = graph.getConnectionsFrom(node1)
|
||||||
.get(node2);
|
.get(node2);
|
||||||
if (edge != null) {
|
if (edge != null) {
|
||||||
GraphLocation graphLocation = new GraphLocation();
|
TrackGraphLocation graphLocation = new TrackGraphLocation();
|
||||||
graphLocation.graph = graph;
|
graphLocation.graph = graph;
|
||||||
graphLocation.edge = locations;
|
graphLocation.edge = locations;
|
||||||
graphLocation.position = positionOnOldEdge;
|
graphLocation.position = positionOnOldEdge;
|
||||||
|
@ -88,7 +88,7 @@ public class TrainMigration {
|
||||||
if (position > edgeLength)
|
if (position > edgeLength)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
GraphLocation graphLocation = new GraphLocation();
|
TrackGraphLocation graphLocation = new TrackGraphLocation();
|
||||||
graphLocation.graph = graph;
|
graphLocation.graph = graph;
|
||||||
graphLocation.edge = Couple.create(loc, newNode2.getLocation());
|
graphLocation.edge = Couple.create(loc, newNode2.getLocation());
|
||||||
graphLocation.position = position;
|
graphLocation.position = position;
|
||||||
|
|
|
@ -22,7 +22,7 @@ import com.simibubi.create.content.trains.entity.TravellingPoint.IEdgePointListe
|
||||||
import com.simibubi.create.content.trains.entity.TravellingPoint.ITrackSelector;
|
import com.simibubi.create.content.trains.entity.TravellingPoint.ITrackSelector;
|
||||||
import com.simibubi.create.content.trains.entity.TravellingPoint.ITurnListener;
|
import com.simibubi.create.content.trains.entity.TravellingPoint.ITurnListener;
|
||||||
import com.simibubi.create.content.trains.entity.TravellingPoint.SteerDirection;
|
import com.simibubi.create.content.trains.entity.TravellingPoint.SteerDirection;
|
||||||
import com.simibubi.create.content.trains.graph.GraphLocation;
|
import com.simibubi.create.content.trains.graph.TrackGraphLocation;
|
||||||
import com.simibubi.create.content.trains.graph.TrackEdge;
|
import com.simibubi.create.content.trains.graph.TrackEdge;
|
||||||
import com.simibubi.create.content.trains.graph.TrackGraph;
|
import com.simibubi.create.content.trains.graph.TrackGraph;
|
||||||
import com.simibubi.create.content.trains.graph.TrackGraphHelper;
|
import com.simibubi.create.content.trains.graph.TrackGraphHelper;
|
||||||
|
@ -168,7 +168,7 @@ public class TrainRelocator {
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
Pair<Vec3, AxisDirection> nearestTrackAxis = track.getNearestTrackAxis(level, pos, blockState, lookAngle);
|
Pair<Vec3, AxisDirection> nearestTrackAxis = track.getNearestTrackAxis(level, pos, blockState, lookAngle);
|
||||||
GraphLocation graphLocation = bezier != null
|
TrackGraphLocation graphLocation = bezier != null
|
||||||
? TrackGraphHelper.getBezierGraphLocationAt(level, pos,
|
? TrackGraphHelper.getBezierGraphLocationAt(level, pos,
|
||||||
bezierDirection ? AxisDirection.POSITIVE : AxisDirection.NEGATIVE, bezier)
|
bezierDirection ? AxisDirection.POSITIVE : AxisDirection.NEGATIVE, bezier)
|
||||||
: TrackGraphHelper.getGraphLocationAt(level, pos, nearestTrackAxis.getSecond(),
|
: TrackGraphHelper.getGraphLocationAt(level, pos, nearestTrackAxis.getSecond(),
|
||||||
|
|
|
@ -16,9 +16,9 @@ import java.util.function.Predicate;
|
||||||
import javax.annotation.Nullable;
|
import javax.annotation.Nullable;
|
||||||
|
|
||||||
import com.simibubi.create.Create;
|
import com.simibubi.create.Create;
|
||||||
import com.simibubi.create.content.trains.DimensionPalette;
|
import com.simibubi.create.content.trains.graph.TrackGraphLocation;
|
||||||
import com.simibubi.create.content.trains.edgePoint.EdgeData;
|
import com.simibubi.create.content.trains.graph.DimensionPalette;
|
||||||
import com.simibubi.create.content.trains.graph.GraphLocation;
|
import com.simibubi.create.content.trains.graph.EdgeData;
|
||||||
import com.simibubi.create.content.trains.graph.TrackEdge;
|
import com.simibubi.create.content.trains.graph.TrackEdge;
|
||||||
import com.simibubi.create.content.trains.graph.TrackGraph;
|
import com.simibubi.create.content.trains.graph.TrackGraph;
|
||||||
import com.simibubi.create.content.trains.graph.TrackNode;
|
import com.simibubi.create.content.trains.graph.TrackNode;
|
||||||
|
@ -411,8 +411,8 @@ public class TravellingPoint {
|
||||||
.scale(upsideDown ^ flipUpsideDown ? -1 : 1));
|
.scale(upsideDown ^ flipUpsideDown ? -1 : 1));
|
||||||
}
|
}
|
||||||
|
|
||||||
public void migrateTo(List<GraphLocation> locations) {
|
public void migrateTo(List<TrackGraphLocation> locations) {
|
||||||
GraphLocation location = locations.remove(0);
|
TrackGraphLocation location = locations.remove(0);
|
||||||
TrackGraph graph = location.graph;
|
TrackGraph graph = location.graph;
|
||||||
node1 = graph.locateNode(location.edge.getFirst());
|
node1 = graph.locateNode(location.edge.getFirst());
|
||||||
node2 = graph.locateNode(location.edge.getSecond());
|
node2 = graph.locateNode(location.edge.getSecond());
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
package com.simibubi.create.content.trains;
|
package com.simibubi.create.content.trains.graph;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
|
@ -1,4 +1,4 @@
|
||||||
package com.simibubi.create.content.trains.edgePoint;
|
package com.simibubi.create.content.trains.graph;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Iterator;
|
import java.util.Iterator;
|
||||||
|
@ -10,11 +10,6 @@ import javax.annotation.Nullable;
|
||||||
|
|
||||||
import com.google.common.base.Objects;
|
import com.google.common.base.Objects;
|
||||||
import com.simibubi.create.Create;
|
import com.simibubi.create.Create;
|
||||||
import com.simibubi.create.content.trains.DimensionPalette;
|
|
||||||
import com.simibubi.create.content.trains.graph.TrackEdge;
|
|
||||||
import com.simibubi.create.content.trains.graph.TrackGraph;
|
|
||||||
import com.simibubi.create.content.trains.graph.TrackNode;
|
|
||||||
import com.simibubi.create.content.trains.graph.TrackNodeLocation;
|
|
||||||
import com.simibubi.create.content.trains.signal.SignalBoundary;
|
import com.simibubi.create.content.trains.signal.SignalBoundary;
|
||||||
import com.simibubi.create.content.trains.signal.SignalEdgeGroup;
|
import com.simibubi.create.content.trains.signal.SignalEdgeGroup;
|
||||||
import com.simibubi.create.content.trains.signal.TrackEdgePoint;
|
import com.simibubi.create.content.trains.signal.TrackEdgePoint;
|
|
@ -1,10 +1,6 @@
|
||||||
package com.simibubi.create.content.trains.edgePoint;
|
package com.simibubi.create.content.trains.graph;
|
||||||
|
|
||||||
import com.simibubi.create.Create;
|
import com.simibubi.create.Create;
|
||||||
import com.simibubi.create.content.trains.graph.TrackEdge;
|
|
||||||
import com.simibubi.create.content.trains.graph.TrackGraph;
|
|
||||||
import com.simibubi.create.content.trains.graph.TrackNode;
|
|
||||||
import com.simibubi.create.content.trains.graph.TrackNodeLocation;
|
|
||||||
import com.simibubi.create.content.trains.signal.TrackEdgePoint;
|
import com.simibubi.create.content.trains.signal.TrackEdgePoint;
|
||||||
import com.simibubi.create.foundation.utility.Couple;
|
import com.simibubi.create.foundation.utility.Couple;
|
||||||
import com.simibubi.create.foundation.utility.Iterate;
|
import com.simibubi.create.foundation.utility.Iterate;
|
|
@ -1,4 +1,4 @@
|
||||||
package com.simibubi.create.content.trains.edgePoint;
|
package com.simibubi.create.content.trains.graph;
|
||||||
|
|
||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
|
@ -7,8 +7,6 @@ import java.util.Map.Entry;
|
||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
|
|
||||||
import com.simibubi.create.Create;
|
import com.simibubi.create.Create;
|
||||||
import com.simibubi.create.content.trains.DimensionPalette;
|
|
||||||
import com.simibubi.create.content.trains.graph.TrackGraph;
|
|
||||||
import com.simibubi.create.content.trains.signal.TrackEdgePoint;
|
import com.simibubi.create.content.trains.signal.TrackEdgePoint;
|
||||||
import com.simibubi.create.foundation.utility.NBTHelper;
|
import com.simibubi.create.foundation.utility.NBTHelper;
|
||||||
|
|
|
@ -1,15 +1,14 @@
|
||||||
package com.simibubi.create.content.trains.edgePoint;
|
package com.simibubi.create.content.trains.graph;
|
||||||
|
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.function.Supplier;
|
import java.util.function.Supplier;
|
||||||
|
|
||||||
import com.simibubi.create.Create;
|
import com.simibubi.create.Create;
|
||||||
import com.simibubi.create.content.trains.DimensionPalette;
|
import com.simibubi.create.content.trains.observer.TrackObserver;
|
||||||
import com.simibubi.create.content.trains.signal.SignalBoundary;
|
import com.simibubi.create.content.trains.signal.SignalBoundary;
|
||||||
import com.simibubi.create.content.trains.signal.TrackEdgePoint;
|
import com.simibubi.create.content.trains.signal.TrackEdgePoint;
|
||||||
import com.simibubi.create.content.trains.station.GlobalStation;
|
import com.simibubi.create.content.trains.station.GlobalStation;
|
||||||
import com.simibubi.create.content.trains.trackObserver.TrackObserver;
|
|
||||||
|
|
||||||
import net.minecraft.network.FriendlyByteBuf;
|
import net.minecraft.network.FriendlyByteBuf;
|
||||||
import net.minecraft.resources.ResourceLocation;
|
import net.minecraft.resources.ResourceLocation;
|
|
@ -7,8 +7,6 @@ import java.util.Collections;
|
||||||
import javax.annotation.Nullable;
|
import javax.annotation.Nullable;
|
||||||
|
|
||||||
import com.google.common.collect.ImmutableList;
|
import com.google.common.collect.ImmutableList;
|
||||||
import com.simibubi.create.content.trains.DimensionPalette;
|
|
||||||
import com.simibubi.create.content.trains.edgePoint.EdgeData;
|
|
||||||
import com.simibubi.create.content.trains.track.BezierConnection;
|
import com.simibubi.create.content.trains.track.BezierConnection;
|
||||||
import com.simibubi.create.content.trains.track.TrackMaterial;
|
import com.simibubi.create.content.trains.track.TrackMaterial;
|
||||||
import com.simibubi.create.foundation.utility.VecHelper;
|
import com.simibubi.create.foundation.utility.VecHelper;
|
||||||
|
|
|
@ -1,9 +1,7 @@
|
||||||
package com.simibubi.create.content.trains.edgePoint;
|
package com.simibubi.create.content.trains.graph;
|
||||||
|
|
||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
|
|
||||||
import com.simibubi.create.content.trains.DimensionPalette;
|
|
||||||
import com.simibubi.create.content.trains.graph.TrackNodeLocation;
|
|
||||||
import com.simibubi.create.foundation.utility.Couple;
|
import com.simibubi.create.foundation.utility.Couple;
|
||||||
|
|
||||||
import net.minecraft.nbt.CompoundTag;
|
import net.minecraft.nbt.CompoundTag;
|
|
@ -19,12 +19,6 @@ import java.util.stream.Collectors;
|
||||||
import javax.annotation.Nullable;
|
import javax.annotation.Nullable;
|
||||||
|
|
||||||
import com.simibubi.create.Create;
|
import com.simibubi.create.Create;
|
||||||
import com.simibubi.create.content.trains.DimensionPalette;
|
|
||||||
import com.simibubi.create.content.trains.edgePoint.EdgeData;
|
|
||||||
import com.simibubi.create.content.trains.edgePoint.EdgePointManager;
|
|
||||||
import com.simibubi.create.content.trains.edgePoint.EdgePointStorage;
|
|
||||||
import com.simibubi.create.content.trains.edgePoint.EdgePointType;
|
|
||||||
import com.simibubi.create.content.trains.edgePoint.TrackEdgeIntersection;
|
|
||||||
import com.simibubi.create.content.trains.entity.Train;
|
import com.simibubi.create.content.trains.entity.Train;
|
||||||
import com.simibubi.create.content.trains.graph.TrackNodeLocation.DiscoveredLocation;
|
import com.simibubi.create.content.trains.graph.TrackNodeLocation.DiscoveredLocation;
|
||||||
import com.simibubi.create.content.trains.signal.SignalEdgeGroup;
|
import com.simibubi.create.content.trains.signal.SignalEdgeGroup;
|
||||||
|
|
|
@ -23,7 +23,7 @@ import net.minecraft.world.phys.Vec3;
|
||||||
public class TrackGraphHelper {
|
public class TrackGraphHelper {
|
||||||
|
|
||||||
@Nullable
|
@Nullable
|
||||||
public static GraphLocation getGraphLocationAt(Level level, BlockPos pos, AxisDirection targetDirection,
|
public static TrackGraphLocation getGraphLocationAt(Level level, BlockPos pos, AxisDirection targetDirection,
|
||||||
Vec3 targetAxis) {
|
Vec3 targetAxis) {
|
||||||
BlockState trackBlockState = level.getBlockState(pos);
|
BlockState trackBlockState = level.getBlockState(pos);
|
||||||
if (!(trackBlockState.getBlock()instanceof ITrackBlock track))
|
if (!(trackBlockState.getBlock()instanceof ITrackBlock track))
|
||||||
|
@ -51,7 +51,7 @@ public class TrackGraphHelper {
|
||||||
.distanceToSqr(axis.scale(-1)) > 1 / 4096f)
|
.distanceToSqr(axis.scale(-1)) > 1 / 4096f)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
GraphLocation graphLocation = new GraphLocation();
|
TrackGraphLocation graphLocation = new TrackGraphLocation();
|
||||||
graphLocation.edge = Couple.create(node.getLocation(), backNode.getLocation());
|
graphLocation.edge = Couple.create(node.getLocation(), backNode.getLocation());
|
||||||
graphLocation.position = 0;
|
graphLocation.position = 0;
|
||||||
graphLocation.graph = graph;
|
graphLocation.graph = graph;
|
||||||
|
@ -137,7 +137,7 @@ public class TrackGraphHelper {
|
||||||
.getLocation())
|
.getLocation())
|
||||||
/ 2.0;
|
/ 2.0;
|
||||||
|
|
||||||
GraphLocation graphLocation = new GraphLocation();
|
TrackGraphLocation graphLocation = new TrackGraphLocation();
|
||||||
graphLocation.edge = Couple.create(backNode.getLocation(), frontNode.getLocation());
|
graphLocation.edge = Couple.create(backNode.getLocation(), frontNode.getLocation());
|
||||||
graphLocation.position = position;
|
graphLocation.position = position;
|
||||||
graphLocation.graph = graph;
|
graphLocation.graph = graph;
|
||||||
|
@ -145,7 +145,7 @@ public class TrackGraphHelper {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Nullable
|
@Nullable
|
||||||
public static GraphLocation getBezierGraphLocationAt(Level level, BlockPos pos, AxisDirection targetDirection,
|
public static TrackGraphLocation getBezierGraphLocationAt(Level level, BlockPos pos, AxisDirection targetDirection,
|
||||||
BezierTrackPointLocation targetBezier) {
|
BezierTrackPointLocation targetBezier) {
|
||||||
BlockState state = level.getBlockState(pos);
|
BlockState state = level.getBlockState(pos);
|
||||||
|
|
||||||
|
@ -176,7 +176,7 @@ public class TrackGraphHelper {
|
||||||
if (edge == null)
|
if (edge == null)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
GraphLocation graphLocation = new GraphLocation();
|
TrackGraphLocation graphLocation = new TrackGraphLocation();
|
||||||
graphLocation.graph = graph;
|
graphLocation.graph = graph;
|
||||||
graphLocation.edge = Couple.create(location, targetLoc);
|
graphLocation.edge = Couple.create(location, targetLoc);
|
||||||
graphLocation.position = (targetBezier.segment() + 1) / 2f;
|
graphLocation.position = (targetBezier.segment() + 1) / 2f;
|
||||||
|
|
|
@ -2,7 +2,7 @@ package com.simibubi.create.content.trains.graph;
|
||||||
|
|
||||||
import com.simibubi.create.foundation.utility.Couple;
|
import com.simibubi.create.foundation.utility.Couple;
|
||||||
|
|
||||||
public class GraphLocation {
|
public class TrackGraphLocation {
|
||||||
|
|
||||||
public TrackGraph graph;
|
public TrackGraph graph;
|
||||||
public Couple<TrackNodeLocation> edge;
|
public Couple<TrackNodeLocation> edge;
|
|
@ -11,7 +11,6 @@ import javax.annotation.Nullable;
|
||||||
import com.google.common.collect.ImmutableList;
|
import com.google.common.collect.ImmutableList;
|
||||||
import com.simibubi.create.AllPackets;
|
import com.simibubi.create.AllPackets;
|
||||||
import com.simibubi.create.Create;
|
import com.simibubi.create.Create;
|
||||||
import com.simibubi.create.content.trains.edgePoint.EdgePointType;
|
|
||||||
import com.simibubi.create.content.trains.signal.EdgeGroupColor;
|
import com.simibubi.create.content.trains.signal.EdgeGroupColor;
|
||||||
import com.simibubi.create.content.trains.signal.SignalEdgeGroupPacket;
|
import com.simibubi.create.content.trains.signal.SignalEdgeGroupPacket;
|
||||||
import com.simibubi.create.content.trains.signal.TrackEdgePoint;
|
import com.simibubi.create.content.trains.signal.TrackEdgePoint;
|
||||||
|
|
|
@ -9,10 +9,7 @@ import java.util.Objects;
|
||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
|
|
||||||
import com.simibubi.create.Create;
|
import com.simibubi.create.Create;
|
||||||
import com.simibubi.create.content.trains.DimensionPalette;
|
|
||||||
import com.simibubi.create.content.trains.GlobalRailwayManager;
|
import com.simibubi.create.content.trains.GlobalRailwayManager;
|
||||||
import com.simibubi.create.content.trains.edgePoint.EdgeData;
|
|
||||||
import com.simibubi.create.content.trains.edgePoint.EdgePointType;
|
|
||||||
import com.simibubi.create.content.trains.signal.TrackEdgePoint;
|
import com.simibubi.create.content.trains.signal.TrackEdgePoint;
|
||||||
import com.simibubi.create.content.trains.track.BezierConnection;
|
import com.simibubi.create.content.trains.track.BezierConnection;
|
||||||
import com.simibubi.create.content.trains.track.TrackMaterial;
|
import com.simibubi.create.content.trains.track.TrackMaterial;
|
||||||
|
|
|
@ -10,7 +10,6 @@ import org.lwjgl.glfw.GLFW;
|
||||||
import com.simibubi.create.AllKeys;
|
import com.simibubi.create.AllKeys;
|
||||||
import com.simibubi.create.Create;
|
import com.simibubi.create.Create;
|
||||||
import com.simibubi.create.CreateClient;
|
import com.simibubi.create.CreateClient;
|
||||||
import com.simibubi.create.content.trains.edgePoint.EdgeData;
|
|
||||||
import com.simibubi.create.content.trains.signal.SignalBoundary;
|
import com.simibubi.create.content.trains.signal.SignalBoundary;
|
||||||
import com.simibubi.create.content.trains.signal.SignalEdgeGroup;
|
import com.simibubi.create.content.trains.signal.SignalEdgeGroup;
|
||||||
import com.simibubi.create.content.trains.signal.TrackEdgePoint;
|
import com.simibubi.create.content.trains.signal.TrackEdgePoint;
|
||||||
|
|
|
@ -5,7 +5,6 @@ import java.util.HashSet;
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
|
||||||
import com.simibubi.create.content.trains.DimensionPalette;
|
|
||||||
import com.simibubi.create.content.trains.track.BezierConnection;
|
import com.simibubi.create.content.trains.track.BezierConnection;
|
||||||
import com.simibubi.create.content.trains.track.TrackMaterial;
|
import com.simibubi.create.content.trains.track.TrackMaterial;
|
||||||
import com.simibubi.create.foundation.utility.Iterate;
|
import com.simibubi.create.foundation.utility.Iterate;
|
||||||
|
|
|
@ -1,10 +1,10 @@
|
||||||
package com.simibubi.create.content.trains.trackObserver;
|
package com.simibubi.create.content.trains.observer;
|
||||||
|
|
||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
|
|
||||||
import com.simibubi.create.Create;
|
import com.simibubi.create.Create;
|
||||||
import com.simibubi.create.content.trains.DimensionPalette;
|
|
||||||
import com.simibubi.create.content.trains.entity.Train;
|
import com.simibubi.create.content.trains.entity.Train;
|
||||||
|
import com.simibubi.create.content.trains.graph.DimensionPalette;
|
||||||
import com.simibubi.create.content.trains.graph.TrackEdge;
|
import com.simibubi.create.content.trains.graph.TrackEdge;
|
||||||
import com.simibubi.create.content.trains.graph.TrackGraph;
|
import com.simibubi.create.content.trains.graph.TrackGraph;
|
||||||
import com.simibubi.create.content.trains.signal.SignalPropagator;
|
import com.simibubi.create.content.trains.signal.SignalPropagator;
|
|
@ -1,4 +1,4 @@
|
||||||
package com.simibubi.create.content.trains.trackObserver;
|
package com.simibubi.create.content.trains.observer;
|
||||||
|
|
||||||
import com.simibubi.create.AllBlockEntityTypes;
|
import com.simibubi.create.AllBlockEntityTypes;
|
||||||
import com.simibubi.create.content.equipment.wrench.IWrenchable;
|
import com.simibubi.create.content.equipment.wrench.IWrenchable;
|
|
@ -1,4 +1,4 @@
|
||||||
package com.simibubi.create.content.trains.trackObserver;
|
package com.simibubi.create.content.trains.observer;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
@ -9,8 +9,8 @@ import com.mojang.blaze3d.vertex.PoseStack;
|
||||||
import com.simibubi.create.content.contraptions.ITransformableBlockEntity;
|
import com.simibubi.create.content.contraptions.ITransformableBlockEntity;
|
||||||
import com.simibubi.create.content.contraptions.StructureTransform;
|
import com.simibubi.create.content.contraptions.StructureTransform;
|
||||||
import com.simibubi.create.content.redstone.displayLink.DisplayLinkBlock;
|
import com.simibubi.create.content.redstone.displayLink.DisplayLinkBlock;
|
||||||
import com.simibubi.create.content.trains.edgePoint.EdgePointType;
|
import com.simibubi.create.content.trains.graph.EdgePointType;
|
||||||
import com.simibubi.create.content.trains.edgePoint.TrackTargetingBehaviour;
|
import com.simibubi.create.content.trains.track.TrackTargetingBehaviour;
|
||||||
import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
|
import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
|
||||||
import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
|
import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
|
||||||
import com.simibubi.create.foundation.blockEntity.behaviour.ValueBoxTransform;
|
import com.simibubi.create.foundation.blockEntity.behaviour.ValueBoxTransform;
|
|
@ -1,10 +1,10 @@
|
||||||
package com.simibubi.create.content.trains.trackObserver;
|
package com.simibubi.create.content.trains.observer;
|
||||||
|
|
||||||
import com.jozufozu.flywheel.util.transform.TransformStack;
|
import com.jozufozu.flywheel.util.transform.TransformStack;
|
||||||
import com.mojang.blaze3d.vertex.PoseStack;
|
import com.mojang.blaze3d.vertex.PoseStack;
|
||||||
import com.simibubi.create.content.trains.edgePoint.TrackTargetingBehaviour;
|
|
||||||
import com.simibubi.create.content.trains.edgePoint.TrackTargetingBehaviour.RenderedTrackOverlayType;
|
|
||||||
import com.simibubi.create.content.trains.track.ITrackBlock;
|
import com.simibubi.create.content.trains.track.ITrackBlock;
|
||||||
|
import com.simibubi.create.content.trains.track.TrackTargetingBehaviour;
|
||||||
|
import com.simibubi.create.content.trains.track.TrackTargetingBehaviour.RenderedTrackOverlayType;
|
||||||
import com.simibubi.create.foundation.blockEntity.renderer.SmartBlockEntityRenderer;
|
import com.simibubi.create.foundation.blockEntity.renderer.SmartBlockEntityRenderer;
|
||||||
|
|
||||||
import net.minecraft.client.renderer.MultiBufferSource;
|
import net.minecraft.client.renderer.MultiBufferSource;
|
|
@ -7,9 +7,9 @@ import java.util.Objects;
|
||||||
|
|
||||||
import com.simibubi.create.AllItems;
|
import com.simibubi.create.AllItems;
|
||||||
import com.simibubi.create.content.trains.display.GlobalTrainDisplayData.TrainDeparturePrediction;
|
import com.simibubi.create.content.trains.display.GlobalTrainDisplayData.TrainDeparturePrediction;
|
||||||
import com.simibubi.create.content.trains.edgePoint.EdgePointType;
|
|
||||||
import com.simibubi.create.content.trains.entity.Carriage;
|
import com.simibubi.create.content.trains.entity.Carriage;
|
||||||
import com.simibubi.create.content.trains.entity.Train;
|
import com.simibubi.create.content.trains.entity.Train;
|
||||||
|
import com.simibubi.create.content.trains.graph.EdgePointType;
|
||||||
import com.simibubi.create.content.trains.schedule.condition.ScheduleWaitCondition;
|
import com.simibubi.create.content.trains.schedule.condition.ScheduleWaitCondition;
|
||||||
import com.simibubi.create.content.trains.schedule.condition.ScheduledDelay;
|
import com.simibubi.create.content.trains.schedule.condition.ScheduledDelay;
|
||||||
import com.simibubi.create.content.trains.schedule.destination.ChangeThrottleInstruction;
|
import com.simibubi.create.content.trains.schedule.destination.ChangeThrottleInstruction;
|
||||||
|
|
|
@ -21,7 +21,7 @@ import com.mojang.math.Matrix4f;
|
||||||
import com.simibubi.create.AllPackets;
|
import com.simibubi.create.AllPackets;
|
||||||
import com.simibubi.create.Create;
|
import com.simibubi.create.Create;
|
||||||
import com.simibubi.create.content.trains.GlobalRailwayManager;
|
import com.simibubi.create.content.trains.GlobalRailwayManager;
|
||||||
import com.simibubi.create.content.trains.edgePoint.EdgePointType;
|
import com.simibubi.create.content.trains.graph.EdgePointType;
|
||||||
import com.simibubi.create.content.trains.graph.TrackGraph;
|
import com.simibubi.create.content.trains.graph.TrackGraph;
|
||||||
import com.simibubi.create.content.trains.schedule.condition.ScheduleWaitCondition;
|
import com.simibubi.create.content.trains.schedule.condition.ScheduleWaitCondition;
|
||||||
import com.simibubi.create.content.trains.schedule.condition.ScheduledDelay;
|
import com.simibubi.create.content.trains.schedule.condition.ScheduledDelay;
|
||||||
|
|
|
@ -6,9 +6,9 @@ import javax.annotation.Nullable;
|
||||||
|
|
||||||
import com.simibubi.create.content.contraptions.ITransformableBlockEntity;
|
import com.simibubi.create.content.contraptions.ITransformableBlockEntity;
|
||||||
import com.simibubi.create.content.contraptions.StructureTransform;
|
import com.simibubi.create.content.contraptions.StructureTransform;
|
||||||
import com.simibubi.create.content.trains.edgePoint.EdgePointType;
|
import com.simibubi.create.content.trains.graph.EdgePointType;
|
||||||
import com.simibubi.create.content.trains.edgePoint.TrackTargetingBehaviour;
|
|
||||||
import com.simibubi.create.content.trains.signal.SignalBlock.SignalType;
|
import com.simibubi.create.content.trains.signal.SignalBlock.SignalType;
|
||||||
|
import com.simibubi.create.content.trains.track.TrackTargetingBehaviour;
|
||||||
import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
|
import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
|
||||||
import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
|
import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
|
||||||
import com.simibubi.create.foundation.utility.NBTHelper;
|
import com.simibubi.create.foundation.utility.NBTHelper;
|
||||||
|
|
|
@ -7,8 +7,8 @@ import java.util.UUID;
|
||||||
|
|
||||||
import com.google.common.base.Objects;
|
import com.google.common.base.Objects;
|
||||||
import com.simibubi.create.Create;
|
import com.simibubi.create.Create;
|
||||||
import com.simibubi.create.content.trains.DimensionPalette;
|
import com.simibubi.create.content.trains.graph.DimensionPalette;
|
||||||
import com.simibubi.create.content.trains.edgePoint.EdgePointType;
|
import com.simibubi.create.content.trains.graph.EdgePointType;
|
||||||
import com.simibubi.create.content.trains.graph.TrackGraph;
|
import com.simibubi.create.content.trains.graph.TrackGraph;
|
||||||
import com.simibubi.create.content.trains.graph.TrackNode;
|
import com.simibubi.create.content.trains.graph.TrackNode;
|
||||||
import com.simibubi.create.content.trains.signal.SignalBlock.SignalType;
|
import com.simibubi.create.content.trains.signal.SignalBlock.SignalType;
|
||||||
|
|
|
@ -12,9 +12,9 @@ import java.util.function.Predicate;
|
||||||
|
|
||||||
import com.google.common.base.Predicates;
|
import com.google.common.base.Predicates;
|
||||||
import com.simibubi.create.Create;
|
import com.simibubi.create.Create;
|
||||||
import com.simibubi.create.content.trains.edgePoint.EdgeData;
|
|
||||||
import com.simibubi.create.content.trains.edgePoint.EdgePointType;
|
|
||||||
import com.simibubi.create.content.trains.entity.Train;
|
import com.simibubi.create.content.trains.entity.Train;
|
||||||
|
import com.simibubi.create.content.trains.graph.EdgeData;
|
||||||
|
import com.simibubi.create.content.trains.graph.EdgePointType;
|
||||||
import com.simibubi.create.content.trains.graph.TrackEdge;
|
import com.simibubi.create.content.trains.graph.TrackEdge;
|
||||||
import com.simibubi.create.content.trains.graph.TrackGraph;
|
import com.simibubi.create.content.trains.graph.TrackGraph;
|
||||||
import com.simibubi.create.content.trains.graph.TrackGraphSync;
|
import com.simibubi.create.content.trains.graph.TrackGraphSync;
|
||||||
|
|
|
@ -3,11 +3,11 @@ package com.simibubi.create.content.trains.signal;
|
||||||
import com.jozufozu.flywheel.util.transform.TransformStack;
|
import com.jozufozu.flywheel.util.transform.TransformStack;
|
||||||
import com.mojang.blaze3d.vertex.PoseStack;
|
import com.mojang.blaze3d.vertex.PoseStack;
|
||||||
import com.simibubi.create.AllPartialModels;
|
import com.simibubi.create.AllPartialModels;
|
||||||
import com.simibubi.create.content.trains.edgePoint.TrackTargetingBehaviour;
|
|
||||||
import com.simibubi.create.content.trains.edgePoint.TrackTargetingBehaviour.RenderedTrackOverlayType;
|
|
||||||
import com.simibubi.create.content.trains.signal.SignalBlockEntity.OverlayState;
|
import com.simibubi.create.content.trains.signal.SignalBlockEntity.OverlayState;
|
||||||
import com.simibubi.create.content.trains.signal.SignalBlockEntity.SignalState;
|
import com.simibubi.create.content.trains.signal.SignalBlockEntity.SignalState;
|
||||||
import com.simibubi.create.content.trains.track.ITrackBlock;
|
import com.simibubi.create.content.trains.track.ITrackBlock;
|
||||||
|
import com.simibubi.create.content.trains.track.TrackTargetingBehaviour;
|
||||||
|
import com.simibubi.create.content.trains.track.TrackTargetingBehaviour.RenderedTrackOverlayType;
|
||||||
import com.simibubi.create.foundation.blockEntity.renderer.SafeBlockEntityRenderer;
|
import com.simibubi.create.foundation.blockEntity.renderer.SafeBlockEntityRenderer;
|
||||||
import com.simibubi.create.foundation.render.CachedBufferer;
|
import com.simibubi.create.foundation.render.CachedBufferer;
|
||||||
import com.simibubi.create.foundation.utility.AnimationTickHolder;
|
import com.simibubi.create.foundation.utility.AnimationTickHolder;
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
package com.simibubi.create.content.trains.signal;
|
package com.simibubi.create.content.trains.signal;
|
||||||
|
|
||||||
import com.simibubi.create.content.trains.DimensionPalette;
|
import com.simibubi.create.content.trains.graph.DimensionPalette;
|
||||||
|
|
||||||
import net.minecraft.core.BlockPos;
|
import net.minecraft.core.BlockPos;
|
||||||
import net.minecraft.nbt.CompoundTag;
|
import net.minecraft.nbt.CompoundTag;
|
||||||
|
|
|
@ -3,13 +3,13 @@ package com.simibubi.create.content.trains.signal;
|
||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
|
|
||||||
import com.simibubi.create.Create;
|
import com.simibubi.create.Create;
|
||||||
import com.simibubi.create.content.trains.DimensionPalette;
|
import com.simibubi.create.content.trains.graph.DimensionPalette;
|
||||||
import com.simibubi.create.content.trains.edgePoint.EdgePointType;
|
import com.simibubi.create.content.trains.graph.EdgePointType;
|
||||||
import com.simibubi.create.content.trains.edgePoint.TrackTargetingBehaviour;
|
|
||||||
import com.simibubi.create.content.trains.graph.TrackEdge;
|
import com.simibubi.create.content.trains.graph.TrackEdge;
|
||||||
import com.simibubi.create.content.trains.graph.TrackGraph;
|
import com.simibubi.create.content.trains.graph.TrackGraph;
|
||||||
import com.simibubi.create.content.trains.graph.TrackNode;
|
import com.simibubi.create.content.trains.graph.TrackNode;
|
||||||
import com.simibubi.create.content.trains.graph.TrackNodeLocation;
|
import com.simibubi.create.content.trains.graph.TrackNodeLocation;
|
||||||
|
import com.simibubi.create.content.trains.track.TrackTargetingBehaviour;
|
||||||
import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
|
import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
|
||||||
import com.simibubi.create.foundation.utility.Couple;
|
import com.simibubi.create.foundation.utility.Couple;
|
||||||
|
|
||||||
|
|
|
@ -4,8 +4,8 @@ import java.lang.ref.WeakReference;
|
||||||
|
|
||||||
import javax.annotation.Nullable;
|
import javax.annotation.Nullable;
|
||||||
|
|
||||||
import com.simibubi.create.content.trains.DimensionPalette;
|
|
||||||
import com.simibubi.create.content.trains.entity.Train;
|
import com.simibubi.create.content.trains.entity.Train;
|
||||||
|
import com.simibubi.create.content.trains.graph.DimensionPalette;
|
||||||
import com.simibubi.create.content.trains.graph.TrackNode;
|
import com.simibubi.create.content.trains.graph.TrackNode;
|
||||||
import com.simibubi.create.content.trains.signal.SingleBlockEntityEdgePoint;
|
import com.simibubi.create.content.trains.signal.SingleBlockEntityEdgePoint;
|
||||||
|
|
||||||
|
|
|
@ -30,15 +30,14 @@ import com.simibubi.create.content.logistics.depot.DepotBehaviour;
|
||||||
import com.simibubi.create.content.redstone.displayLink.DisplayLinkBlock;
|
import com.simibubi.create.content.redstone.displayLink.DisplayLinkBlock;
|
||||||
import com.simibubi.create.content.trains.bogey.AbstractBogeyBlock;
|
import com.simibubi.create.content.trains.bogey.AbstractBogeyBlock;
|
||||||
import com.simibubi.create.content.trains.bogey.AbstractBogeyBlockEntity;
|
import com.simibubi.create.content.trains.bogey.AbstractBogeyBlockEntity;
|
||||||
import com.simibubi.create.content.trains.edgePoint.EdgePointType;
|
|
||||||
import com.simibubi.create.content.trains.edgePoint.TrackTargetingBehaviour;
|
|
||||||
import com.simibubi.create.content.trains.entity.Carriage;
|
import com.simibubi.create.content.trains.entity.Carriage;
|
||||||
import com.simibubi.create.content.trains.entity.CarriageBogey;
|
import com.simibubi.create.content.trains.entity.CarriageBogey;
|
||||||
import com.simibubi.create.content.trains.entity.CarriageContraption;
|
import com.simibubi.create.content.trains.entity.CarriageContraption;
|
||||||
import com.simibubi.create.content.trains.entity.Train;
|
import com.simibubi.create.content.trains.entity.Train;
|
||||||
import com.simibubi.create.content.trains.entity.TrainPacket;
|
import com.simibubi.create.content.trains.entity.TrainPacket;
|
||||||
import com.simibubi.create.content.trains.entity.TravellingPoint;
|
import com.simibubi.create.content.trains.entity.TravellingPoint;
|
||||||
import com.simibubi.create.content.trains.graph.GraphLocation;
|
import com.simibubi.create.content.trains.graph.TrackGraphLocation;
|
||||||
|
import com.simibubi.create.content.trains.graph.EdgePointType;
|
||||||
import com.simibubi.create.content.trains.graph.TrackEdge;
|
import com.simibubi.create.content.trains.graph.TrackEdge;
|
||||||
import com.simibubi.create.content.trains.graph.TrackGraph;
|
import com.simibubi.create.content.trains.graph.TrackGraph;
|
||||||
import com.simibubi.create.content.trains.graph.TrackNode;
|
import com.simibubi.create.content.trains.graph.TrackNode;
|
||||||
|
@ -47,6 +46,7 @@ import com.simibubi.create.content.trains.graph.TrackNodeLocation.DiscoveredLoca
|
||||||
import com.simibubi.create.content.trains.schedule.Schedule;
|
import com.simibubi.create.content.trains.schedule.Schedule;
|
||||||
import com.simibubi.create.content.trains.schedule.ScheduleItem;
|
import com.simibubi.create.content.trains.schedule.ScheduleItem;
|
||||||
import com.simibubi.create.content.trains.track.ITrackBlock;
|
import com.simibubi.create.content.trains.track.ITrackBlock;
|
||||||
|
import com.simibubi.create.content.trains.track.TrackTargetingBehaviour;
|
||||||
import com.simibubi.create.foundation.advancement.AllAdvancements;
|
import com.simibubi.create.foundation.advancement.AllAdvancements;
|
||||||
import com.simibubi.create.foundation.block.ProperWaterloggedBlock;
|
import com.simibubi.create.foundation.block.ProperWaterloggedBlock;
|
||||||
import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
|
import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
|
||||||
|
@ -464,7 +464,7 @@ public class StationBlockEntity extends SmartBlockEntity implements ITransformab
|
||||||
|
|
||||||
private boolean updateStationState(Consumer<GlobalStation> updateState) {
|
private boolean updateStationState(Consumer<GlobalStation> updateState) {
|
||||||
GlobalStation station = getStation();
|
GlobalStation station = getStation();
|
||||||
GraphLocation graphLocation = edgePoint.determineGraphLocation();
|
TrackGraphLocation graphLocation = edgePoint.determineGraphLocation();
|
||||||
if (station == null || graphLocation == null)
|
if (station == null || graphLocation == null)
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
|
|
|
@ -8,7 +8,7 @@ import com.mojang.blaze3d.vertex.VertexConsumer;
|
||||||
import com.mojang.math.Matrix4f;
|
import com.mojang.math.Matrix4f;
|
||||||
import com.simibubi.create.AllBlockEntityTypes;
|
import com.simibubi.create.AllBlockEntityTypes;
|
||||||
import com.simibubi.create.Create;
|
import com.simibubi.create.Create;
|
||||||
import com.simibubi.create.content.trains.edgePoint.TrackTargetingBehaviour;
|
import com.simibubi.create.content.trains.track.TrackTargetingBehaviour;
|
||||||
import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
|
import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
|
||||||
import com.simibubi.create.foundation.map.CustomRenderedMapDecoration;
|
import com.simibubi.create.foundation.map.CustomRenderedMapDecoration;
|
||||||
import com.simibubi.create.foundation.utility.Components;
|
import com.simibubi.create.foundation.utility.Components;
|
||||||
|
|
|
@ -7,9 +7,9 @@ import com.mojang.blaze3d.vertex.PoseStack;
|
||||||
import com.mojang.blaze3d.vertex.VertexConsumer;
|
import com.mojang.blaze3d.vertex.VertexConsumer;
|
||||||
import com.simibubi.create.AllPartialModels;
|
import com.simibubi.create.AllPartialModels;
|
||||||
import com.simibubi.create.content.logistics.depot.DepotRenderer;
|
import com.simibubi.create.content.logistics.depot.DepotRenderer;
|
||||||
import com.simibubi.create.content.trains.edgePoint.TrackTargetingBehaviour;
|
|
||||||
import com.simibubi.create.content.trains.edgePoint.TrackTargetingBehaviour.RenderedTrackOverlayType;
|
|
||||||
import com.simibubi.create.content.trains.track.ITrackBlock;
|
import com.simibubi.create.content.trains.track.ITrackBlock;
|
||||||
|
import com.simibubi.create.content.trains.track.TrackTargetingBehaviour;
|
||||||
|
import com.simibubi.create.content.trains.track.TrackTargetingBehaviour.RenderedTrackOverlayType;
|
||||||
import com.simibubi.create.foundation.blockEntity.renderer.SafeBlockEntityRenderer;
|
import com.simibubi.create.foundation.blockEntity.renderer.SafeBlockEntityRenderer;
|
||||||
import com.simibubi.create.foundation.render.CachedBufferer;
|
import com.simibubi.create.foundation.render.CachedBufferer;
|
||||||
import com.simibubi.create.foundation.render.SuperByteBuffer;
|
import com.simibubi.create.foundation.render.SuperByteBuffer;
|
||||||
|
|
|
@ -3,7 +3,6 @@ package com.simibubi.create.content.trains.track;
|
||||||
import com.simibubi.create.AllItems;
|
import com.simibubi.create.AllItems;
|
||||||
import com.simibubi.create.AllPackets;
|
import com.simibubi.create.AllPackets;
|
||||||
import com.simibubi.create.AllTags;
|
import com.simibubi.create.AllTags;
|
||||||
import com.simibubi.create.content.trains.edgePoint.TrackTargetingBlockItem;
|
|
||||||
import com.simibubi.create.content.trains.track.TrackBlockOutline.BezierPointSelection;
|
import com.simibubi.create.content.trains.track.TrackBlockOutline.BezierPointSelection;
|
||||||
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;
|
||||||
|
|
|
@ -1,12 +1,11 @@
|
||||||
package com.simibubi.create.content.trains.edgePoint;
|
package com.simibubi.create.content.trains.track;
|
||||||
|
|
||||||
import org.apache.commons.lang3.mutable.MutableObject;
|
import org.apache.commons.lang3.mutable.MutableObject;
|
||||||
|
|
||||||
import com.simibubi.create.AllBlocks;
|
import com.simibubi.create.AllBlocks;
|
||||||
import com.simibubi.create.AllSoundEvents;
|
import com.simibubi.create.AllSoundEvents;
|
||||||
import com.simibubi.create.content.trains.edgePoint.TrackTargetingBlockItem.OverlapResult;
|
import com.simibubi.create.content.trains.graph.EdgePointType;
|
||||||
import com.simibubi.create.content.trains.track.BezierTrackPointLocation;
|
import com.simibubi.create.content.trains.track.TrackTargetingBlockItem.OverlapResult;
|
||||||
import com.simibubi.create.content.trains.track.TrackBlockEntity;
|
|
||||||
import com.simibubi.create.foundation.networking.BlockEntityConfigurationPacket;
|
import com.simibubi.create.foundation.networking.BlockEntityConfigurationPacket;
|
||||||
import com.simibubi.create.foundation.utility.Lang;
|
import com.simibubi.create.foundation.utility.Lang;
|
||||||
|
|
|
@ -10,9 +10,9 @@ import javax.annotation.Nullable;
|
||||||
|
|
||||||
import com.jozufozu.flywheel.core.PartialModel;
|
import com.jozufozu.flywheel.core.PartialModel;
|
||||||
import com.mojang.blaze3d.vertex.PoseStack;
|
import com.mojang.blaze3d.vertex.PoseStack;
|
||||||
import com.simibubi.create.content.trains.edgePoint.TrackTargetingBehaviour.RenderedTrackOverlayType;
|
|
||||||
import com.simibubi.create.content.trains.graph.TrackNodeLocation;
|
import com.simibubi.create.content.trains.graph.TrackNodeLocation;
|
||||||
import com.simibubi.create.content.trains.graph.TrackNodeLocation.DiscoveredLocation;
|
import com.simibubi.create.content.trains.graph.TrackNodeLocation.DiscoveredLocation;
|
||||||
|
import com.simibubi.create.content.trains.track.TrackTargetingBehaviour.RenderedTrackOverlayType;
|
||||||
import com.simibubi.create.foundation.utility.Iterate;
|
import com.simibubi.create.foundation.utility.Iterate;
|
||||||
import com.simibubi.create.foundation.utility.Pair;
|
import com.simibubi.create.foundation.utility.Pair;
|
||||||
|
|
||||||
|
|
|
@ -37,10 +37,10 @@ import com.simibubi.create.content.schematics.requirement.ISpecialBlockItemRequi
|
||||||
import com.simibubi.create.content.schematics.requirement.ItemRequirement;
|
import com.simibubi.create.content.schematics.requirement.ItemRequirement;
|
||||||
import com.simibubi.create.content.schematics.requirement.ItemRequirement.ItemUseType;
|
import com.simibubi.create.content.schematics.requirement.ItemRequirement.ItemUseType;
|
||||||
import com.simibubi.create.content.trains.CubeParticleData;
|
import com.simibubi.create.content.trains.CubeParticleData;
|
||||||
import com.simibubi.create.content.trains.edgePoint.TrackTargetingBehaviour.RenderedTrackOverlayType;
|
|
||||||
import com.simibubi.create.content.trains.graph.TrackNodeLocation;
|
import com.simibubi.create.content.trains.graph.TrackNodeLocation;
|
||||||
import com.simibubi.create.content.trains.graph.TrackNodeLocation.DiscoveredLocation;
|
import com.simibubi.create.content.trains.graph.TrackNodeLocation.DiscoveredLocation;
|
||||||
import com.simibubi.create.content.trains.station.StationBlockEntity;
|
import com.simibubi.create.content.trains.station.StationBlockEntity;
|
||||||
|
import com.simibubi.create.content.trains.track.TrackTargetingBehaviour.RenderedTrackOverlayType;
|
||||||
import com.simibubi.create.foundation.block.IBE;
|
import com.simibubi.create.foundation.block.IBE;
|
||||||
import com.simibubi.create.foundation.block.ProperWaterloggedBlock;
|
import com.simibubi.create.foundation.block.ProperWaterloggedBlock;
|
||||||
import com.simibubi.create.foundation.block.render.MultiPosDestructionHandler;
|
import com.simibubi.create.foundation.block.render.MultiPosDestructionHandler;
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
package com.simibubi.create.content.trains.edgePoint;
|
package com.simibubi.create.content.trains.track;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
|
@ -10,18 +10,16 @@ import com.mojang.blaze3d.vertex.PoseStack;
|
||||||
import com.simibubi.create.Create;
|
import com.simibubi.create.Create;
|
||||||
import com.simibubi.create.content.contraptions.StructureTransform;
|
import com.simibubi.create.content.contraptions.StructureTransform;
|
||||||
import com.simibubi.create.content.schematics.SchematicWorld;
|
import com.simibubi.create.content.schematics.SchematicWorld;
|
||||||
import com.simibubi.create.content.trains.DimensionPalette;
|
import com.simibubi.create.content.trains.graph.DimensionPalette;
|
||||||
import com.simibubi.create.content.trains.graph.GraphLocation;
|
import com.simibubi.create.content.trains.graph.EdgeData;
|
||||||
|
import com.simibubi.create.content.trains.graph.EdgePointType;
|
||||||
import com.simibubi.create.content.trains.graph.TrackEdge;
|
import com.simibubi.create.content.trains.graph.TrackEdge;
|
||||||
import com.simibubi.create.content.trains.graph.TrackGraph;
|
import com.simibubi.create.content.trains.graph.TrackGraph;
|
||||||
import com.simibubi.create.content.trains.graph.TrackGraphHelper;
|
import com.simibubi.create.content.trains.graph.TrackGraphHelper;
|
||||||
|
import com.simibubi.create.content.trains.graph.TrackGraphLocation;
|
||||||
import com.simibubi.create.content.trains.graph.TrackNode;
|
import com.simibubi.create.content.trains.graph.TrackNode;
|
||||||
import com.simibubi.create.content.trains.signal.SingleBlockEntityEdgePoint;
|
import com.simibubi.create.content.trains.signal.SingleBlockEntityEdgePoint;
|
||||||
import com.simibubi.create.content.trains.signal.TrackEdgePoint;
|
import com.simibubi.create.content.trains.signal.TrackEdgePoint;
|
||||||
import com.simibubi.create.content.trains.track.BezierConnection;
|
|
||||||
import com.simibubi.create.content.trains.track.BezierTrackPointLocation;
|
|
||||||
import com.simibubi.create.content.trains.track.ITrackBlock;
|
|
||||||
import com.simibubi.create.content.trains.track.TrackBlockEntity;
|
|
||||||
import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
|
import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
|
||||||
import com.simibubi.create.foundation.blockEntity.behaviour.BehaviourType;
|
import com.simibubi.create.foundation.blockEntity.behaviour.BehaviourType;
|
||||||
import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
|
import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
|
||||||
|
@ -159,7 +157,7 @@ public class TrackTargetingBehaviour<T extends TrackEdgePoint> extends BlockEnti
|
||||||
return null;
|
return null;
|
||||||
if (!hasValidTrack())
|
if (!hasValidTrack())
|
||||||
return null;
|
return null;
|
||||||
GraphLocation loc = determineGraphLocation();
|
TrackGraphLocation loc = determineGraphLocation();
|
||||||
if (loc == null)
|
if (loc == null)
|
||||||
return null;
|
return null;
|
||||||
|
|
||||||
|
@ -292,7 +290,7 @@ public class TrackTargetingBehaviour<T extends TrackEdgePoint> extends BlockEnti
|
||||||
return targetBezier;
|
return targetBezier;
|
||||||
}
|
}
|
||||||
|
|
||||||
public GraphLocation determineGraphLocation() {
|
public TrackGraphLocation determineGraphLocation() {
|
||||||
Level level = getWorld();
|
Level level = getWorld();
|
||||||
BlockPos pos = getGlobalPosition();
|
BlockPos pos = getGlobalPosition();
|
||||||
BlockState state = getTrackBlockState();
|
BlockState state = getTrackBlockState();
|
|
@ -1,4 +1,4 @@
|
||||||
package com.simibubi.create.content.trains.edgePoint;
|
package com.simibubi.create.content.trains.track;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.function.BiConsumer;
|
import java.util.function.BiConsumer;
|
||||||
|
@ -7,14 +7,13 @@ import org.apache.commons.lang3.mutable.MutableObject;
|
||||||
|
|
||||||
import com.simibubi.create.AllPackets;
|
import com.simibubi.create.AllPackets;
|
||||||
import com.simibubi.create.AllSoundEvents;
|
import com.simibubi.create.AllSoundEvents;
|
||||||
import com.simibubi.create.content.trains.graph.GraphLocation;
|
import com.simibubi.create.content.trains.graph.EdgeData;
|
||||||
|
import com.simibubi.create.content.trains.graph.EdgePointType;
|
||||||
import com.simibubi.create.content.trains.graph.TrackEdge;
|
import com.simibubi.create.content.trains.graph.TrackEdge;
|
||||||
import com.simibubi.create.content.trains.graph.TrackGraphHelper;
|
import com.simibubi.create.content.trains.graph.TrackGraphHelper;
|
||||||
|
import com.simibubi.create.content.trains.graph.TrackGraphLocation;
|
||||||
import com.simibubi.create.content.trains.graph.TrackNode;
|
import com.simibubi.create.content.trains.graph.TrackNode;
|
||||||
import com.simibubi.create.content.trains.signal.TrackEdgePoint;
|
import com.simibubi.create.content.trains.signal.TrackEdgePoint;
|
||||||
import com.simibubi.create.content.trains.track.BezierTrackPointLocation;
|
|
||||||
import com.simibubi.create.content.trains.track.ITrackBlock;
|
|
||||||
import com.simibubi.create.content.trains.track.TrackBlockEntity;
|
|
||||||
import com.simibubi.create.content.trains.track.TrackBlockOutline.BezierPointSelection;
|
import com.simibubi.create.content.trains.track.TrackBlockOutline.BezierPointSelection;
|
||||||
import com.simibubi.create.foundation.advancement.AllAdvancements;
|
import com.simibubi.create.foundation.advancement.AllAdvancements;
|
||||||
import com.simibubi.create.foundation.utility.Couple;
|
import com.simibubi.create.foundation.utility.Couple;
|
||||||
|
@ -185,7 +184,7 @@ public class TrackTargetingBlockItem extends BlockItem {
|
||||||
|
|
||||||
public static void withGraphLocation(Level level, BlockPos pos, boolean front,
|
public static void withGraphLocation(Level level, BlockPos pos, boolean front,
|
||||||
BezierTrackPointLocation targetBezier, EdgePointType<?> type,
|
BezierTrackPointLocation targetBezier, EdgePointType<?> type,
|
||||||
BiConsumer<OverlapResult, GraphLocation> callback) {
|
BiConsumer<OverlapResult, TrackGraphLocation> callback) {
|
||||||
|
|
||||||
BlockState state = level.getBlockState(pos);
|
BlockState state = level.getBlockState(pos);
|
||||||
|
|
||||||
|
@ -201,7 +200,7 @@ public class TrackTargetingBlockItem extends BlockItem {
|
||||||
}
|
}
|
||||||
|
|
||||||
AxisDirection targetDirection = front ? AxisDirection.POSITIVE : AxisDirection.NEGATIVE;
|
AxisDirection targetDirection = front ? AxisDirection.POSITIVE : AxisDirection.NEGATIVE;
|
||||||
GraphLocation location =
|
TrackGraphLocation location =
|
||||||
targetBezier != null ? TrackGraphHelper.getBezierGraphLocationAt(level, pos, targetDirection, targetBezier)
|
targetBezier != null ? TrackGraphHelper.getBezierGraphLocationAt(level, pos, targetDirection, targetBezier)
|
||||||
: TrackGraphHelper.getGraphLocationAt(level, pos, targetDirection, trackAxes.get(0));
|
: TrackGraphHelper.getGraphLocationAt(level, pos, targetDirection, trackAxes.get(0));
|
||||||
|
|
|
@ -1,16 +1,14 @@
|
||||||
package com.simibubi.create.content.trains.edgePoint;
|
package com.simibubi.create.content.trains.track;
|
||||||
|
|
||||||
import com.google.common.base.Objects;
|
import com.google.common.base.Objects;
|
||||||
import com.jozufozu.flywheel.util.transform.TransformStack;
|
import com.jozufozu.flywheel.util.transform.TransformStack;
|
||||||
import com.mojang.blaze3d.vertex.PoseStack;
|
import com.mojang.blaze3d.vertex.PoseStack;
|
||||||
import com.simibubi.create.Create;
|
import com.simibubi.create.Create;
|
||||||
import com.simibubi.create.content.trains.edgePoint.TrackTargetingBehaviour.RenderedTrackOverlayType;
|
import com.simibubi.create.content.trains.graph.EdgePointType;
|
||||||
import com.simibubi.create.content.trains.edgePoint.TrackTargetingBlockItem.OverlapResult;
|
import com.simibubi.create.content.trains.graph.TrackGraphLocation;
|
||||||
import com.simibubi.create.content.trains.graph.GraphLocation;
|
|
||||||
import com.simibubi.create.content.trains.track.BezierTrackPointLocation;
|
|
||||||
import com.simibubi.create.content.trains.track.ITrackBlock;
|
|
||||||
import com.simibubi.create.content.trains.track.TrackBlockOutline;
|
|
||||||
import com.simibubi.create.content.trains.track.TrackBlockOutline.BezierPointSelection;
|
import com.simibubi.create.content.trains.track.TrackBlockOutline.BezierPointSelection;
|
||||||
|
import com.simibubi.create.content.trains.track.TrackTargetingBehaviour.RenderedTrackOverlayType;
|
||||||
|
import com.simibubi.create.content.trains.track.TrackTargetingBlockItem.OverlapResult;
|
||||||
import com.simibubi.create.foundation.render.SuperRenderTypeBuffer;
|
import com.simibubi.create.foundation.render.SuperRenderTypeBuffer;
|
||||||
|
|
||||||
import net.minecraft.client.Minecraft;
|
import net.minecraft.client.Minecraft;
|
||||||
|
@ -36,7 +34,7 @@ public class TrackTargetingClient {
|
||||||
static BezierTrackPointLocation lastHoveredBezierSegment;
|
static BezierTrackPointLocation lastHoveredBezierSegment;
|
||||||
|
|
||||||
static OverlapResult lastResult;
|
static OverlapResult lastResult;
|
||||||
static GraphLocation lastLocation;
|
static TrackGraphLocation lastLocation;
|
||||||
|
|
||||||
public static void clientTick() {
|
public static void clientTick() {
|
||||||
Minecraft mc = Minecraft.getInstance();
|
Minecraft mc = Minecraft.getInstance();
|
|
@ -10,7 +10,7 @@ import com.simibubi.create.Create;
|
||||||
import com.simibubi.create.content.fluids.transfer.FillingRecipe;
|
import com.simibubi.create.content.fluids.transfer.FillingRecipe;
|
||||||
import com.simibubi.create.content.kinetics.deployer.DeployerApplicationRecipe;
|
import com.simibubi.create.content.kinetics.deployer.DeployerApplicationRecipe;
|
||||||
import com.simibubi.create.content.kinetics.press.PressingRecipe;
|
import com.simibubi.create.content.kinetics.press.PressingRecipe;
|
||||||
import com.simibubi.create.content.processing.itemAssembly.SequencedAssemblyRecipeBuilder;
|
import com.simibubi.create.content.processing.sequenced.SequencedAssemblyRecipeBuilder;
|
||||||
|
|
||||||
import net.minecraft.data.DataGenerator;
|
import net.minecraft.data.DataGenerator;
|
||||||
import net.minecraft.world.item.Items;
|
import net.minecraft.world.item.Items;
|
||||||
|
|
|
@ -31,13 +31,12 @@ import com.simibubi.create.content.kinetics.fan.AirCurrent;
|
||||||
import com.simibubi.create.content.kinetics.mechanicalArm.ArmInteractionPointHandler;
|
import com.simibubi.create.content.kinetics.mechanicalArm.ArmInteractionPointHandler;
|
||||||
import com.simibubi.create.content.kinetics.turntable.TurntableHandler;
|
import com.simibubi.create.content.kinetics.turntable.TurntableHandler;
|
||||||
import com.simibubi.create.content.logistics.depot.EjectorTargetHandler;
|
import com.simibubi.create.content.logistics.depot.EjectorTargetHandler;
|
||||||
import com.simibubi.create.content.processing.itemAssembly.SequencedAssemblyRecipe;
|
import com.simibubi.create.content.processing.sequenced.SequencedAssemblyRecipe;
|
||||||
import com.simibubi.create.content.redstone.displayLink.DisplayLinkBlockItem;
|
import com.simibubi.create.content.redstone.displayLink.DisplayLinkBlockItem;
|
||||||
import com.simibubi.create.content.redstone.link.LinkRenderer;
|
import com.simibubi.create.content.redstone.link.LinkRenderer;
|
||||||
import com.simibubi.create.content.redstone.link.controller.LinkedControllerClientHandler;
|
import com.simibubi.create.content.redstone.link.controller.LinkedControllerClientHandler;
|
||||||
import com.simibubi.create.content.trains.CameraDistanceModifier;
|
import com.simibubi.create.content.trains.CameraDistanceModifier;
|
||||||
import com.simibubi.create.content.trains.TrainHUD;
|
import com.simibubi.create.content.trains.TrainHUD;
|
||||||
import com.simibubi.create.content.trains.edgePoint.TrackTargetingClient;
|
|
||||||
import com.simibubi.create.content.trains.entity.CarriageContraptionEntity;
|
import com.simibubi.create.content.trains.entity.CarriageContraptionEntity;
|
||||||
import com.simibubi.create.content.trains.entity.CarriageCouplingRenderer;
|
import com.simibubi.create.content.trains.entity.CarriageCouplingRenderer;
|
||||||
import com.simibubi.create.content.trains.entity.TrainRelocator;
|
import com.simibubi.create.content.trains.entity.TrainRelocator;
|
||||||
|
@ -45,6 +44,7 @@ import com.simibubi.create.content.trains.schedule.TrainHatArmorLayer;
|
||||||
import com.simibubi.create.content.trains.track.CurvedTrackInteraction;
|
import com.simibubi.create.content.trains.track.CurvedTrackInteraction;
|
||||||
import com.simibubi.create.content.trains.track.TrackBlockOutline;
|
import com.simibubi.create.content.trains.track.TrackBlockOutline;
|
||||||
import com.simibubi.create.content.trains.track.TrackPlacement;
|
import com.simibubi.create.content.trains.track.TrackPlacement;
|
||||||
|
import com.simibubi.create.content.trains.track.TrackTargetingClient;
|
||||||
import com.simibubi.create.foundation.blockEntity.behaviour.edgeInteraction.EdgeInteractionRenderer;
|
import com.simibubi.create.foundation.blockEntity.behaviour.edgeInteraction.EdgeInteractionRenderer;
|
||||||
import com.simibubi.create.foundation.blockEntity.behaviour.filtering.FilteringRenderer;
|
import com.simibubi.create.foundation.blockEntity.behaviour.filtering.FilteringRenderer;
|
||||||
import com.simibubi.create.foundation.blockEntity.behaviour.scrollValue.ScrollValueHandler;
|
import com.simibubi.create.foundation.blockEntity.behaviour.scrollValue.ScrollValueHandler;
|
||||||
|
|
|
@ -6,7 +6,7 @@ import org.spongepowered.asm.mixin.Mixin;
|
||||||
import org.spongepowered.asm.mixin.injection.At;
|
import org.spongepowered.asm.mixin.injection.At;
|
||||||
import org.spongepowered.asm.mixin.injection.Redirect;
|
import org.spongepowered.asm.mixin.injection.Redirect;
|
||||||
|
|
||||||
import com.simibubi.create.infrastructure.gametest.infrastructure.CreateTestFunction;
|
import com.simibubi.create.infrastructure.gametest.CreateTestFunction;
|
||||||
|
|
||||||
import net.minecraft.core.BlockPos;
|
import net.minecraft.core.BlockPos;
|
||||||
import net.minecraft.gametest.framework.GameTestRegistry;
|
import net.minecraft.gametest.framework.GameTestRegistry;
|
||||||
|
|
|
@ -8,8 +8,8 @@ import java.util.function.Consumer;
|
||||||
import com.mojang.brigadier.builder.ArgumentBuilder;
|
import com.mojang.brigadier.builder.ArgumentBuilder;
|
||||||
import com.simibubi.create.Create;
|
import com.simibubi.create.Create;
|
||||||
import com.simibubi.create.content.trains.GlobalRailwayManager;
|
import com.simibubi.create.content.trains.GlobalRailwayManager;
|
||||||
import com.simibubi.create.content.trains.edgePoint.EdgePointType;
|
|
||||||
import com.simibubi.create.content.trains.entity.Train;
|
import com.simibubi.create.content.trains.entity.Train;
|
||||||
|
import com.simibubi.create.content.trains.graph.EdgePointType;
|
||||||
import com.simibubi.create.content.trains.graph.TrackGraph;
|
import com.simibubi.create.content.trains.graph.TrackGraph;
|
||||||
import com.simibubi.create.content.trains.schedule.ScheduleRuntime;
|
import com.simibubi.create.content.trains.schedule.ScheduleRuntime;
|
||||||
import com.simibubi.create.content.trains.signal.SignalBoundary;
|
import com.simibubi.create.content.trains.signal.SignalBoundary;
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
package com.simibubi.create.infrastructure.gametest.infrastructure;
|
package com.simibubi.create.infrastructure.gametest;
|
||||||
|
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.List;
|
import java.util.List;
|
|
@ -2,7 +2,6 @@ package com.simibubi.create.infrastructure.gametest;
|
||||||
|
|
||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
|
|
||||||
import com.simibubi.create.infrastructure.gametest.infrastructure.CreateTestFunction;
|
|
||||||
import com.simibubi.create.infrastructure.gametest.tests.TestContraptions;
|
import com.simibubi.create.infrastructure.gametest.tests.TestContraptions;
|
||||||
import com.simibubi.create.infrastructure.gametest.tests.TestFluids;
|
import com.simibubi.create.infrastructure.gametest.tests.TestFluids;
|
||||||
import com.simibubi.create.infrastructure.gametest.tests.TestItems;
|
import com.simibubi.create.infrastructure.gametest.tests.TestItems;
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
package com.simibubi.create.infrastructure.gametest.infrastructure;
|
package com.simibubi.create.infrastructure.gametest;
|
||||||
|
|
||||||
import java.lang.reflect.InvocationTargetException;
|
import java.lang.reflect.InvocationTargetException;
|
||||||
import java.lang.reflect.Method;
|
import java.lang.reflect.Method;
|
|
@ -1,4 +1,4 @@
|
||||||
package com.simibubi.create.infrastructure.gametest.infrastructure;
|
package com.simibubi.create.infrastructure.gametest;
|
||||||
|
|
||||||
import java.lang.annotation.ElementType;
|
import java.lang.annotation.ElementType;
|
||||||
import java.lang.annotation.Retention;
|
import java.lang.annotation.Retention;
|
|
@ -2,8 +2,8 @@ package com.simibubi.create.infrastructure.gametest.tests;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import com.simibubi.create.infrastructure.gametest.infrastructure.CreateGameTestHelper;
|
import com.simibubi.create.infrastructure.gametest.CreateGameTestHelper;
|
||||||
import com.simibubi.create.infrastructure.gametest.infrastructure.GameTestGroup;
|
import com.simibubi.create.infrastructure.gametest.GameTestGroup;
|
||||||
|
|
||||||
import it.unimi.dsi.fastutil.objects.Object2LongMap;
|
import it.unimi.dsi.fastutil.objects.Object2LongMap;
|
||||||
import net.minecraft.core.BlockPos;
|
import net.minecraft.core.BlockPos;
|
||||||
|
|
|
@ -4,8 +4,8 @@ import com.simibubi.create.AllBlockEntityTypes;
|
||||||
import com.simibubi.create.content.fluids.hosePulley.HosePulleyFluidHandler;
|
import com.simibubi.create.content.fluids.hosePulley.HosePulleyFluidHandler;
|
||||||
import com.simibubi.create.content.kinetics.gauge.SpeedGaugeBlockEntity;
|
import com.simibubi.create.content.kinetics.gauge.SpeedGaugeBlockEntity;
|
||||||
import com.simibubi.create.content.kinetics.gauge.StressGaugeBlockEntity;
|
import com.simibubi.create.content.kinetics.gauge.StressGaugeBlockEntity;
|
||||||
import com.simibubi.create.infrastructure.gametest.infrastructure.CreateGameTestHelper;
|
import com.simibubi.create.infrastructure.gametest.CreateGameTestHelper;
|
||||||
import com.simibubi.create.infrastructure.gametest.infrastructure.GameTestGroup;
|
import com.simibubi.create.infrastructure.gametest.GameTestGroup;
|
||||||
|
|
||||||
import net.minecraft.core.BlockPos;
|
import net.minecraft.core.BlockPos;
|
||||||
import net.minecraft.gametest.framework.GameTest;
|
import net.minecraft.gametest.framework.GameTest;
|
||||||
|
|
|
@ -15,8 +15,8 @@ import com.simibubi.create.content.trains.display.FlapDisplayBlockEntity;
|
||||||
import com.simibubi.create.content.trains.display.FlapDisplayLayout;
|
import com.simibubi.create.content.trains.display.FlapDisplayLayout;
|
||||||
import com.simibubi.create.content.trains.display.FlapDisplaySection;
|
import com.simibubi.create.content.trains.display.FlapDisplaySection;
|
||||||
import com.simibubi.create.foundation.utility.Components;
|
import com.simibubi.create.foundation.utility.Components;
|
||||||
import com.simibubi.create.infrastructure.gametest.infrastructure.CreateGameTestHelper;
|
import com.simibubi.create.infrastructure.gametest.CreateGameTestHelper;
|
||||||
import com.simibubi.create.infrastructure.gametest.infrastructure.GameTestGroup;
|
import com.simibubi.create.infrastructure.gametest.GameTestGroup;
|
||||||
|
|
||||||
import it.unimi.dsi.fastutil.objects.Object2LongMap;
|
import it.unimi.dsi.fastutil.objects.Object2LongMap;
|
||||||
import net.minecraft.Util;
|
import net.minecraft.Util;
|
||||||
|
|
|
@ -1,14 +1,14 @@
|
||||||
package com.simibubi.create.infrastructure.gametest.tests;
|
package com.simibubi.create.infrastructure.gametest.tests;
|
||||||
|
|
||||||
import static com.simibubi.create.infrastructure.gametest.infrastructure.CreateGameTestHelper.FIFTEEN_SECONDS;
|
import static com.simibubi.create.infrastructure.gametest.CreateGameTestHelper.FIFTEEN_SECONDS;
|
||||||
|
|
||||||
import com.simibubi.create.AllBlockEntityTypes;
|
import com.simibubi.create.AllBlockEntityTypes;
|
||||||
import com.simibubi.create.content.schematics.SchematicExport;
|
import com.simibubi.create.content.schematics.SchematicExport;
|
||||||
|
import com.simibubi.create.content.schematics.SchematicItem;
|
||||||
import com.simibubi.create.content.schematics.cannon.SchematicannonBlockEntity;
|
import com.simibubi.create.content.schematics.cannon.SchematicannonBlockEntity;
|
||||||
import com.simibubi.create.content.schematics.cannon.SchematicannonBlockEntity.State;
|
import com.simibubi.create.content.schematics.cannon.SchematicannonBlockEntity.State;
|
||||||
import com.simibubi.create.content.schematics.item.SchematicItem;
|
import com.simibubi.create.infrastructure.gametest.CreateGameTestHelper;
|
||||||
import com.simibubi.create.infrastructure.gametest.infrastructure.CreateGameTestHelper;
|
import com.simibubi.create.infrastructure.gametest.GameTestGroup;
|
||||||
import com.simibubi.create.infrastructure.gametest.infrastructure.GameTestGroup;
|
|
||||||
|
|
||||||
import net.minecraft.core.BlockPos;
|
import net.minecraft.core.BlockPos;
|
||||||
import net.minecraft.gametest.framework.GameTest;
|
import net.minecraft.gametest.framework.GameTest;
|
||||||
|
|
|
@ -5,11 +5,11 @@ 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.Create;
|
import com.simibubi.create.Create;
|
||||||
import com.simibubi.create.content.processing.itemAssembly.SequencedAssemblyRecipe;
|
|
||||||
import com.simibubi.create.content.processing.recipe.ProcessingOutput;
|
import com.simibubi.create.content.processing.recipe.ProcessingOutput;
|
||||||
|
import com.simibubi.create.content.processing.sequenced.SequencedAssemblyRecipe;
|
||||||
import com.simibubi.create.foundation.item.ItemHelper;
|
import com.simibubi.create.foundation.item.ItemHelper;
|
||||||
import com.simibubi.create.infrastructure.gametest.infrastructure.CreateGameTestHelper;
|
import com.simibubi.create.infrastructure.gametest.CreateGameTestHelper;
|
||||||
import com.simibubi.create.infrastructure.gametest.infrastructure.GameTestGroup;
|
import com.simibubi.create.infrastructure.gametest.GameTestGroup;
|
||||||
|
|
||||||
import net.minecraft.core.BlockPos;
|
import net.minecraft.core.BlockPos;
|
||||||
import net.minecraft.gametest.framework.GameTest;
|
import net.minecraft.gametest.framework.GameTest;
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
package com.simibubi.create.infrastructure.ponder.scenes.trains;
|
package com.simibubi.create.infrastructure.ponder.scenes.trains;
|
||||||
|
|
||||||
import com.simibubi.create.AllBlocks;
|
import com.simibubi.create.AllBlocks;
|
||||||
import com.simibubi.create.content.trains.trackObserver.TrackObserverBlockEntity;
|
import com.simibubi.create.content.trains.observer.TrackObserverBlockEntity;
|
||||||
import com.simibubi.create.foundation.ponder.ElementLink;
|
import com.simibubi.create.foundation.ponder.ElementLink;
|
||||||
import com.simibubi.create.foundation.ponder.PonderPalette;
|
import com.simibubi.create.foundation.ponder.PonderPalette;
|
||||||
import com.simibubi.create.foundation.ponder.SceneBuilder;
|
import com.simibubi.create.foundation.ponder.SceneBuilder;
|
||||||
|
|
Loading…
Reference in a new issue