tilera/CreateMod
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Some re-repackaging

Browse source
This commit is contained in:
simibubi 2023-05-21 21:48:39 +02:00
parent 47f18aa1f9
commit 691786bbb9
89 changed files with 150 additions and 191 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/com/simibubi/create/AllBlockEntityTypes.java
View file

@ -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.display.FlapDisplayBlockEntity;
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.SignalRenderer;
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.TrackMaterial;
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.tterrag.registrate.util.entry.BlockEntityEntry;

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

@ -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.StandardBogeyBlock;
import com.simibubi.create.content.trains.display.FlapDisplayBlock;
import com.simibubi.create.content.trains.edgePoint.EdgePointType;
import com.simibubi.create.content.trains.edgePoint.TrackTargetingBlockItem;
import com.simibubi.create.content.trains.graph.EdgePointType;
import com.simibubi.create.content.trains.observer.TrackObserverBlock;
import com.simibubi.create.content.trains.signal.SignalBlock;
import com.simibubi.create.content.trains.station.StationBlock;
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.TrackMaterial;
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.DyedBlockList;
import com.simibubi.create.foundation.block.ItemUseOverrides;

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

@ -44,10 +44,10 @@ import com.simibubi.create.content.legacy.ShadowSteelItem;
import com.simibubi.create.content.logistics.filter.FilterItem;
import com.simibubi.create.content.materials.ExperienceNuggetItem;
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.schematics.item.SchematicAndQuillItem;
import com.simibubi.create.content.schematics.item.SchematicItem;
import com.simibubi.create.content.schematics.SchematicAndQuillItem;
import com.simibubi.create.content.schematics.SchematicItem;
import com.simibubi.create.content.trains.schedule.ScheduleItem;
import com.simibubi.create.foundation.data.AssetLookup;
import com.simibubi.create.foundation.data.CreateRegistrate;

2
src/main/java/com/simibubi/create/AllPackets.java
View file

@ -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.trains.HonkPacket;
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.TrainPromptPacket;
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.TrainEditReturnPacket;
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.foundation.blockEntity.RemoveBlockEntityPacket;
import com.simibubi.create.foundation.blockEntity.behaviour.ValueSettingsPacket;

2
src/main/java/com/simibubi/create/AllRecipeTypes.java
View file

@ -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.saw.CuttingRecipe;
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.sequenced.SequencedAssemblyRecipeSerializer;
import com.simibubi.create.content.processing.recipe.ProcessingRecipeSerializer;
import com.simibubi.create.foundation.recipe.IRecipeTypeInfo;
import com.simibubi.create.foundation.utility.Lang;

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

@ -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.logistics.filter.AbstractFilterScreen;
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.trains.schedule.ScheduleScreen;
import com.simibubi.create.foundation.config.ConfigBase.ConfigBool;

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

@ -11,8 +11,8 @@ import org.jetbrains.annotations.NotNull;
import com.mojang.blaze3d.vertex.PoseStack;
import com.simibubi.create.compat.jei.category.sequencedAssembly.SequencedAssemblySubCategory;
import com.simibubi.create.content.processing.itemAssembly.SequencedAssemblyRecipe;
import com.simibubi.create.content.processing.itemAssembly.SequencedRecipe;
import com.simibubi.create.content.processing.sequenced.SequencedAssemblyRecipe;
import com.simibubi.create.content.processing.sequenced.SequencedRecipe;
import com.simibubi.create.foundation.gui.AllGuiTextures;
import com.simibubi.create.foundation.gui.AllIcons;
import com.simibubi.create.foundation.utility.Components;

2
src/main/java/com/simibubi/create/compat/jei/category/sequencedAssembly/SequencedAssemblySubCategory.java
View file

@ -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.AnimatedSpout;
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.utility.Lang;

2
src/main/java/com/simibubi/create/content/fluids/spout/FillingBySpout.java
View file

@ -6,7 +6,7 @@ import java.util.Optional;
import com.simibubi.create.AllRecipeTypes;
import com.simibubi.create.content.fluids.transfer.FillingRecipe;
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 net.minecraft.world.item.ItemStack;

2
src/main/java/com/simibubi/create/content/fluids/transfer/FillingRecipe.java
View file

@ -7,9 +7,9 @@ import java.util.function.Supplier;
import com.simibubi.create.AllBlocks;
import com.simibubi.create.AllRecipeTypes;
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.ProcessingRecipeBuilder.ProcessingRecipeParams;
import com.simibubi.create.content.processing.sequenced.IAssemblyRecipe;
import com.simibubi.create.foundation.fluid.FluidIngredient;
import com.simibubi.create.foundation.utility.Components;
import com.simibubi.create.foundation.utility.Lang;

2
src/main/java/com/simibubi/create/content/kinetics/deployer/DeployerApplicationRecipe.java
View file

@ -8,9 +8,9 @@ import com.simibubi.create.AllBlocks;
import com.simibubi.create.AllRecipeTypes;
import com.simibubi.create.AllTags.AllItemTags;
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.ProcessingRecipeParams;
import com.simibubi.create.content.processing.sequenced.IAssemblyRecipe;
import com.simibubi.create.foundation.utility.Components;
import com.simibubi.create.foundation.utility.Lang;

2
src/main/java/com/simibubi/create/content/kinetics/deployer/DeployerBlockEntity.java
View file

@ -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.belt.behaviour.BeltProcessingBehaviour;
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.blockEntity.behaviour.BlockEntityBehaviour;
import com.simibubi.create.foundation.blockEntity.behaviour.filtering.FilteringBehaviour;

2
src/main/java/com/simibubi/create/content/kinetics/press/MechanicalPressBlockEntity.java
View file

@ -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.processing.basin.BasinBlockEntity;
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.AllAdvancements;
import com.simibubi.create.foundation.advancement.CreateAdvancement;

2
src/main/java/com/simibubi/create/content/kinetics/press/PressingRecipe.java
View file

@ -9,9 +9,9 @@ import javax.annotation.ParametersAreNonnullByDefault;
import com.simibubi.create.AllBlocks;
import com.simibubi.create.AllRecipeTypes;
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.ProcessingRecipeBuilder.ProcessingRecipeParams;
import com.simibubi.create.content.processing.sequenced.IAssemblyRecipe;
import com.simibubi.create.foundation.utility.Lang;
import net.minecraft.network.chat.Component;

2
src/main/java/com/simibubi/create/content/kinetics/saw/CuttingRecipe.java
View file

@ -9,9 +9,9 @@ import javax.annotation.ParametersAreNonnullByDefault;
import com.simibubi.create.AllBlocks;
import com.simibubi.create.AllRecipeTypes;
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.ProcessingRecipeBuilder.ProcessingRecipeParams;
import com.simibubi.create.content.processing.sequenced.IAssemblyRecipe;
import com.simibubi.create.foundation.utility.Lang;
import net.minecraft.network.chat.Component;

2
src/main/java/com/simibubi/create/content/kinetics/saw/SawBlockEntity.java
View file

@ -17,8 +17,8 @@ import com.simibubi.create.AllRecipeTypes;
import com.simibubi.create.AllSoundEvents;
import com.simibubi.create.content.kinetics.base.BlockBreakingKineticBlockEntity;
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.sequenced.SequencedAssemblyRecipe;
import com.simibubi.create.foundation.advancement.AllAdvancements;
import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
import com.simibubi.create.foundation.blockEntity.behaviour.filtering.FilteringBehaviour;

2
src/main/java/com/simibubi/create/content/processing/itemAssembly/IAssemblyRecipe.java → src/main/java/com/simibubi/create/content/processing/sequenced/IAssemblyRecipe.java
View file

@ -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.Set;

2
src/main/java/com/simibubi/create/content/processing/itemAssembly/SequencedAssemblyItem.java → src/main/java/com/simibubi/create/content/processing/sequenced/SequencedAssemblyItem.java
View file

@ -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;

2
src/main/java/com/simibubi/create/content/processing/itemAssembly/SequencedAssemblyRecipe.java → src/main/java/com/simibubi/create/content/processing/sequenced/SequencedAssemblyRecipe.java
View file

@ -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.HashSet;

2
src/main/java/com/simibubi/create/content/processing/itemAssembly/SequencedAssemblyRecipeBuilder.java → src/main/java/com/simibubi/create/content/processing/sequenced/SequencedAssemblyRecipeBuilder.java
View file

@ -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.List;

2
src/main/java/com/simibubi/create/content/processing/itemAssembly/SequencedAssemblyRecipeSerializer.java → src/main/java/com/simibubi/create/content/processing/sequenced/SequencedAssemblyRecipeSerializer.java
View file

@ -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.JsonElement;

2
src/main/java/com/simibubi/create/content/processing/itemAssembly/SequencedRecipe.java → src/main/java/com/simibubi/create/content/processing/sequenced/SequencedRecipe.java
View file

@ -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.gson.JsonObject;

4
src/main/java/com/simibubi/create/content/redstone/displayLink/source/ObservedTrainNameSource.java
View file

@ -6,8 +6,8 @@ import com.simibubi.create.Create;
import com.simibubi.create.content.redstone.displayLink.DisplayLinkContext;
import com.simibubi.create.content.redstone.displayLink.target.DisplayTargetStats;
import com.simibubi.create.content.trains.entity.Train;
import com.simibubi.create.content.trains.trackObserver.TrackObserver;
import com.simibubi.create.content.trains.trackObserver.TrackObserverBlockEntity;
import com.simibubi.create.content.trains.observer.TrackObserver;
import com.simibubi.create.content.trains.observer.TrackObserverBlockEntity;
import net.minecraft.network.chat.MutableComponent;

2
src/main/java/com/simibubi/create/content/schematics/item/SchematicAndQuillItem.java → src/main/java/com/simibubi/create/content/schematics/SchematicAndQuillItem.java
View file

@ -1,4 +1,4 @@
package com.simibubi.create.content.schematics.item;
package com.simibubi.create.content.schematics;
import java.util.Iterator;

1
src/main/java/com/simibubi/create/content/schematics/SchematicExport.java
View file

@ -9,7 +9,6 @@ import java.nio.file.StandardOpenOption;
import javax.annotation.Nullable;
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.Lang;

1
src/main/java/com/simibubi/create/content/schematics/SchematicInstances.java
View file

@ -7,7 +7,6 @@ import javax.annotation.Nullable;
import com.google.common.cache.Cache;
import com.google.common.cache.CacheBuilder;
import com.simibubi.create.content.contraptions.StructureTransform;
import com.simibubi.create.content.schematics.item.SchematicItem;
import com.simibubi.create.foundation.utility.WorldAttached;
import net.minecraft.core.BlockPos;

4
src/main/java/com/simibubi/create/content/schematics/item/SchematicItem.java → src/main/java/com/simibubi/create/content/schematics/SchematicItem.java
View file

@ -1,4 +1,4 @@
package com.simibubi.create.content.schematics.item;
package com.simibubi.create.content.schematics;
import java.io.BufferedInputStream;
import java.io.DataInputStream;
@ -16,8 +16,6 @@ import org.slf4j.Logger;
import com.mojang.logging.LogUtils;
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.foundation.gui.ScreenOpener;
import com.simibubi.create.foundation.utility.Components;

1
src/main/java/com/simibubi/create/content/schematics/SchematicPrinter.java
View file

@ -9,7 +9,6 @@ import com.simibubi.create.Create;
import com.simibubi.create.content.contraptions.BlockMovementChecks;
import com.simibubi.create.content.contraptions.StructureTransform;
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.foundation.blockEntity.IMergeableBE;
import com.simibubi.create.foundation.utility.BBHelper;

1
src/main/java/com/simibubi/create/content/schematics/ServerSchematicLoader.java
View file

@ -18,7 +18,6 @@ import com.simibubi.create.AllBlocks;
import com.simibubi.create.AllItems;
import com.simibubi.create.Create;
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.foundation.utility.Components;
import com.simibubi.create.foundation.utility.FilesHelper;

2
src/main/java/com/simibubi/create/content/schematics/client/SchematicHandler.java
View file

@ -12,9 +12,9 @@ import com.simibubi.create.AllPackets;
import com.simibubi.create.Create;
import com.simibubi.create.content.contraptions.StructureTransform;
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.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.SchematicSyncPacket;
import com.simibubi.create.foundation.outliner.AABBOutline;

3
src/main/java/com/simibubi/create/content/trains/RailwaySavedData.java
View file

@ -5,8 +5,9 @@ import java.util.Map;
import java.util.UUID;
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.graph.DimensionPalette;
import com.simibubi.create.content.trains.graph.EdgePointType;
import com.simibubi.create.content.trains.graph.TrackGraph;
import com.simibubi.create.content.trains.signal.SignalBoundary;
import com.simibubi.create.content.trains.signal.SignalEdgeGroup;

2
src/main/java/com/simibubi/create/content/trains/entity/Carriage.java
View file

@ -20,9 +20,9 @@ import org.apache.commons.lang3.mutable.MutableDouble;
import com.simibubi.create.content.contraptions.Contraption;
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.ITrackSelector;
import com.simibubi.create.content.trains.graph.DimensionPalette;
import com.simibubi.create.content.trains.graph.TrackGraph;
import com.simibubi.create.content.trains.graph.TrackNodeLocation;
import com.simibubi.create.foundation.advancement.AllAdvancements;

2
src/main/java/com/simibubi/create/content/trains/entity/CarriageBogey.java
View file

@ -8,11 +8,11 @@ import javax.annotation.Nullable;
import com.jozufozu.flywheel.api.MaterialManager;
import com.simibubi.create.AllBogeyStyles;
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.AbstractBogeyBlockEntity;
import com.simibubi.create.content.trains.bogey.BogeyInstance;
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.foundation.utility.AngleHelper;
import com.simibubi.create.foundation.utility.Couple;

6
src/main/java/com/simibubi/create/content/trains/entity/Navigation.java
View file

@ -18,10 +18,10 @@ import org.apache.commons.lang3.mutable.MutableDouble;
import org.apache.commons.lang3.mutable.MutableObject;
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.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.TrackGraph;
import com.simibubi.create.content.trains.graph.TrackNode;

16
src/main/java/com/simibubi/create/content/trains/entity/Train.java
View file

@ -25,17 +25,18 @@ import com.simibubi.create.AllPackets;
import com.simibubi.create.Create;
import com.simibubi.create.content.contraptions.behaviour.MovementBehaviour;
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.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.TravellingPoint.IEdgePointListener;
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.TrackGraph;
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.State;
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.station.GlobalStation;
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.utility.Couple;
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());
Map<UUID, List<GraphLocation>> successfulMigrations = new HashMap<>();
Map<UUID, List<TrackGraphLocation>> successfulMigrations = new HashMap<>();
for (TrainMigration md : migratingPoints) {
for (Iterator<Entry<UUID, TrackGraph>> iterator = entrySet.iterator(); iterator.hasNext();) {
Entry<UUID, TrackGraph> entry = iterator.next();
GraphLocation gl = md.tryMigratingTo(entry.getValue());
TrackGraphLocation gl = md.tryMigratingTo(entry.getValue());
if (gl == null) {
iterator.remove();
continue;
@ -866,7 +866,7 @@ public class Train {
for (Entry<UUID, TrackGraph> entry : entrySet) {
graph = entry.getValue();
List<GraphLocation> locations = successfulMigrations.get(entry.getKey());
List<TrackGraphLocation> locations = successfulMigrations.get(entry.getKey());
forEachTravellingPoint(tp -> tp.migrateTo(locations));
migratingPoints.clear();
if (derailed)

10
src/main/java/com/simibubi/create/content/trains/entity/TrainMigration.java
View file

@ -2,8 +2,8 @@ package com.simibubi.create.content.trains.entity;
import java.util.Map.Entry;
import com.simibubi.create.content.trains.DimensionPalette;
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.TrackEdge;
import com.simibubi.create.content.trains.graph.TrackGraph;
import com.simibubi.create.content.trains.graph.TrackNode;
@ -33,14 +33,14 @@ public class TrainMigration {
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 node2 = graph.locateNode(locations.getSecond());
if (node1 != null && node2 != null) {
TrackEdge edge = graph.getConnectionsFrom(node1)
.get(node2);
if (edge != null) {
GraphLocation graphLocation = new GraphLocation();
TrackGraphLocation graphLocation = new TrackGraphLocation();
graphLocation.graph = graph;
graphLocation.edge = locations;
graphLocation.position = positionOnOldEdge;
@ -88,7 +88,7 @@ public class TrainMigration {
if (position > edgeLength)
continue;
GraphLocation graphLocation = new GraphLocation();
TrackGraphLocation graphLocation = new TrackGraphLocation();
graphLocation.graph = graph;
graphLocation.edge = Couple.create(loc, newNode2.getLocation());
graphLocation.position = position;

4
src/main/java/com/simibubi/create/content/trains/entity/TrainRelocator.java
View file

@ -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.ITurnListener;
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.TrackGraph;
import com.simibubi.create.content.trains.graph.TrackGraphHelper;
@ -168,7 +168,7 @@ public class TrainRelocator {
return false;
Pair<Vec3, AxisDirection> nearestTrackAxis = track.getNearestTrackAxis(level, pos, blockState, lookAngle);
GraphLocation graphLocation = bezier != null
TrackGraphLocation graphLocation = bezier != null
? TrackGraphHelper.getBezierGraphLocationAt(level, pos,
bezierDirection ? AxisDirection.POSITIVE : AxisDirection.NEGATIVE, bezier)
: TrackGraphHelper.getGraphLocationAt(level, pos, nearestTrackAxis.getSecond(),

10
src/main/java/com/simibubi/create/content/trains/entity/TravellingPoint.java
View file

@ -16,9 +16,9 @@ import java.util.function.Predicate;
import javax.annotation.Nullable;
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.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.TrackEdge;
import com.simibubi.create.content.trains.graph.TrackGraph;
import com.simibubi.create.content.trains.graph.TrackNode;
@ -411,8 +411,8 @@ public class TravellingPoint {
.scale(upsideDown ^ flipUpsideDown ? -1 : 1));
}
public void migrateTo(List<GraphLocation> locations) {
GraphLocation location = locations.remove(0);
public void migrateTo(List<TrackGraphLocation> locations) {
TrackGraphLocation location = locations.remove(0);
TrackGraph graph = location.graph;
node1 = graph.locateNode(location.edge.getFirst());
node2 = graph.locateNode(location.edge.getSecond());

2
src/main/java/com/simibubi/create/content/trains/DimensionPalette.java → src/main/java/com/simibubi/create/content/trains/graph/DimensionPalette.java
View file

@ -1,4 +1,4 @@
package com.simibubi.create.content.trains;
package com.simibubi.create.content.trains.graph;
import java.util.ArrayList;
import java.util.List;

7
src/main/java/com/simibubi/create/content/trains/edgePoint/EdgeData.java → src/main/java/com/simibubi/create/content/trains/graph/EdgeData.java
View file

@ -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.Iterator;
@ -10,11 +10,6 @@ import javax.annotation.Nullable;
import com.google.common.base.Objects;
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.SignalEdgeGroup;
import com.simibubi.create.content.trains.signal.TrackEdgePoint;

6
src/main/java/com/simibubi/create/content/trains/edgePoint/EdgePointManager.java → src/main/java/com/simibubi/create/content/trains/graph/EdgePointManager.java
View file

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

4
src/main/java/com/simibubi/create/content/trains/edgePoint/EdgePointStorage.java → src/main/java/com/simibubi/create/content/trains/graph/EdgePointStorage.java
View file

@ -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.HashMap;
@ -7,8 +7,6 @@ import java.util.Map.Entry;
import java.util.UUID;
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.foundation.utility.NBTHelper;

5
src/main/java/com/simibubi/create/content/trains/edgePoint/EdgePointType.java → src/main/java/com/simibubi/create/content/trains/graph/EdgePointType.java
View file

@ -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.Map;
import java.util.function.Supplier;
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.TrackEdgePoint;
import com.simibubi.create.content.trains.station.GlobalStation;
import com.simibubi.create.content.trains.trackObserver.TrackObserver;
import net.minecraft.network.FriendlyByteBuf;
import net.minecraft.resources.ResourceLocation;

2
src/main/java/com/simibubi/create/content/trains/graph/TrackEdge.java
View file

@ -7,8 +7,6 @@ import java.util.Collections;
import javax.annotation.Nullable;
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.TrackMaterial;
import com.simibubi.create.foundation.utility.VecHelper;

4
src/main/java/com/simibubi/create/content/trains/edgePoint/TrackEdgeIntersection.java → src/main/java/com/simibubi/create/content/trains/graph/TrackEdgeIntersection.java
View file

@ -1,9 +1,7 @@
package com.simibubi.create.content.trains.edgePoint;
package com.simibubi.create.content.trains.graph;
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 net.minecraft.nbt.CompoundTag;

6
src/main/java/com/simibubi/create/content/trains/graph/TrackGraph.java
View file

@ -19,12 +19,6 @@ import java.util.stream.Collectors;
import javax.annotation.Nullable;
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.graph.TrackNodeLocation.DiscoveredLocation;
import com.simibubi.create.content.trains.signal.SignalEdgeGroup;

10
src/main/java/com/simibubi/create/content/trains/graph/TrackGraphHelper.java
View file

@ -23,7 +23,7 @@ import net.minecraft.world.phys.Vec3;
public class TrackGraphHelper {
@Nullable
public static GraphLocation getGraphLocationAt(Level level, BlockPos pos, AxisDirection targetDirection,
public static TrackGraphLocation getGraphLocationAt(Level level, BlockPos pos, AxisDirection targetDirection,
Vec3 targetAxis) {
BlockState trackBlockState = level.getBlockState(pos);
if (!(trackBlockState.getBlock()instanceof ITrackBlock track))
@ -51,7 +51,7 @@ public class TrackGraphHelper {
.distanceToSqr(axis.scale(-1)) > 1 / 4096f)
continue;
GraphLocation graphLocation = new GraphLocation();
TrackGraphLocation graphLocation = new TrackGraphLocation();
graphLocation.edge = Couple.create(node.getLocation(), backNode.getLocation());
graphLocation.position = 0;
graphLocation.graph = graph;
@ -137,7 +137,7 @@ public class TrackGraphHelper {
.getLocation())
/ 2.0;
GraphLocation graphLocation = new GraphLocation();
TrackGraphLocation graphLocation = new TrackGraphLocation();
graphLocation.edge = Couple.create(backNode.getLocation(), frontNode.getLocation());
graphLocation.position = position;
graphLocation.graph = graph;
@ -145,7 +145,7 @@ public class TrackGraphHelper {
}
@Nullable
public static GraphLocation getBezierGraphLocationAt(Level level, BlockPos pos, AxisDirection targetDirection,
public static TrackGraphLocation getBezierGraphLocationAt(Level level, BlockPos pos, AxisDirection targetDirection,
BezierTrackPointLocation targetBezier) {
BlockState state = level.getBlockState(pos);
@ -176,7 +176,7 @@ public class TrackGraphHelper {
if (edge == null)
continue;
GraphLocation graphLocation = new GraphLocation();
TrackGraphLocation graphLocation = new TrackGraphLocation();
graphLocation.graph = graph;
graphLocation.edge = Couple.create(location, targetLoc);
graphLocation.position = (targetBezier.segment() + 1) / 2f;

2
src/main/java/com/simibubi/create/content/trains/graph/GraphLocation.java → src/main/java/com/simibubi/create/content/trains/graph/TrackGraphLocation.java
View file

@ -2,7 +2,7 @@ package com.simibubi.create.content.trains.graph;
import com.simibubi.create.foundation.utility.Couple;
public class GraphLocation {
public class TrackGraphLocation {
public TrackGraph graph;
public Couple<TrackNodeLocation> edge;

1
src/main/java/com/simibubi/create/content/trains/graph/TrackGraphSync.java
View file

@ -11,7 +11,6 @@ import javax.annotation.Nullable;
import com.google.common.collect.ImmutableList;
import com.simibubi.create.AllPackets;
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.SignalEdgeGroupPacket;
import com.simibubi.create.content.trains.signal.TrackEdgePoint;

3
src/main/java/com/simibubi/create/content/trains/graph/TrackGraphSyncPacket.java
View file

@ -9,10 +9,7 @@ import java.util.Objects;
import java.util.UUID;
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.edgePoint.EdgeData;
import com.simibubi.create.content.trains.edgePoint.EdgePointType;
import com.simibubi.create.content.trains.signal.TrackEdgePoint;
import com.simibubi.create.content.trains.track.BezierConnection;
import com.simibubi.create.content.trains.track.TrackMaterial;

1
src/main/java/com/simibubi/create/content/trains/graph/TrackGraphVisualizer.java
View file

@ -10,7 +10,6 @@ import org.lwjgl.glfw.GLFW;
import com.simibubi.create.AllKeys;
import com.simibubi.create.Create;
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.SignalEdgeGroup;
import com.simibubi.create.content.trains.signal.TrackEdgePoint;

1
src/main/java/com/simibubi/create/content/trains/graph/TrackNodeLocation.java
View file

@ -5,7 +5,6 @@ import java.util.HashSet;
import java.util.Objects;
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.TrackMaterial;
import com.simibubi.create.foundation.utility.Iterate;

4
src/main/java/com/simibubi/create/content/trains/trackObserver/TrackObserver.java → src/main/java/com/simibubi/create/content/trains/observer/TrackObserver.java
View file

@ -1,10 +1,10 @@
package com.simibubi.create.content.trains.trackObserver;
package com.simibubi.create.content.trains.observer;
import java.util.UUID;
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.graph.DimensionPalette;
import com.simibubi.create.content.trains.graph.TrackEdge;
import com.simibubi.create.content.trains.graph.TrackGraph;
import com.simibubi.create.content.trains.signal.SignalPropagator;

2
src/main/java/com/simibubi/create/content/trains/trackObserver/TrackObserverBlock.java → src/main/java/com/simibubi/create/content/trains/observer/TrackObserverBlock.java
View file

@ -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.content.equipment.wrench.IWrenchable;

6
src/main/java/com/simibubi/create/content/trains/trackObserver/TrackObserverBlockEntity.java → src/main/java/com/simibubi/create/content/trains/observer/TrackObserverBlockEntity.java
View file

@ -1,4 +1,4 @@
package com.simibubi.create.content.trains.trackObserver;
package com.simibubi.create.content.trains.observer;
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.StructureTransform;
import com.simibubi.create.content.redstone.displayLink.DisplayLinkBlock;
import com.simibubi.create.content.trains.edgePoint.EdgePointType;
import com.simibubi.create.content.trains.edgePoint.TrackTargetingBehaviour;
import com.simibubi.create.content.trains.graph.EdgePointType;
import com.simibubi.create.content.trains.track.TrackTargetingBehaviour;
import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
import com.simibubi.create.foundation.blockEntity.behaviour.ValueBoxTransform;

6
src/main/java/com/simibubi/create/content/trains/trackObserver/TrackObserverRenderer.java → src/main/java/com/simibubi/create/content/trains/observer/TrackObserverRenderer.java
View file

@ -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.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.TrackTargetingBehaviour;
import com.simibubi.create.content.trains.track.TrackTargetingBehaviour.RenderedTrackOverlayType;
import com.simibubi.create.foundation.blockEntity.renderer.SmartBlockEntityRenderer;
import net.minecraft.client.renderer.MultiBufferSource;

2
src/main/java/com/simibubi/create/content/trains/schedule/ScheduleRuntime.java
View file

@ -7,9 +7,9 @@ import java.util.Objects;
import com.simibubi.create.AllItems;
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.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.ScheduledDelay;
import com.simibubi.create.content.trains.schedule.destination.ChangeThrottleInstruction;

2
src/main/java/com/simibubi/create/content/trains/schedule/ScheduleScreen.java
View file

@ -21,7 +21,7 @@ import com.mojang.math.Matrix4f;
import com.simibubi.create.AllPackets;
import com.simibubi.create.Create;
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.schedule.condition.ScheduleWaitCondition;
import com.simibubi.create.content.trains.schedule.condition.ScheduledDelay;

4
src/main/java/com/simibubi/create/content/trains/signal/SignalBlockEntity.java
View file

@ -6,9 +6,9 @@ import javax.annotation.Nullable;
import com.simibubi.create.content.contraptions.ITransformableBlockEntity;
import com.simibubi.create.content.contraptions.StructureTransform;
import com.simibubi.create.content.trains.edgePoint.EdgePointType;
import com.simibubi.create.content.trains.edgePoint.TrackTargetingBehaviour;
import com.simibubi.create.content.trains.graph.EdgePointType;
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.behaviour.BlockEntityBehaviour;
import com.simibubi.create.foundation.utility.NBTHelper;

4
src/main/java/com/simibubi/create/content/trains/signal/SignalBoundary.java
View file

@ -7,8 +7,8 @@ import java.util.UUID;
import com.google.common.base.Objects;
import com.simibubi.create.Create;
import com.simibubi.create.content.trains.DimensionPalette;
import com.simibubi.create.content.trains.edgePoint.EdgePointType;
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.TrackNode;
import com.simibubi.create.content.trains.signal.SignalBlock.SignalType;

4
src/main/java/com/simibubi/create/content/trains/signal/SignalPropagator.java
View file

@ -12,9 +12,9 @@ import java.util.function.Predicate;
import com.google.common.base.Predicates;
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.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.TrackGraph;
import com.simibubi.create.content.trains.graph.TrackGraphSync;

4
src/main/java/com/simibubi/create/content/trains/signal/SignalRenderer.java
View file

@ -3,11 +3,11 @@ package com.simibubi.create.content.trains.signal;
import com.jozufozu.flywheel.util.transform.TransformStack;
import com.mojang.blaze3d.vertex.PoseStack;
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.SignalState;
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.render.CachedBufferer;
import com.simibubi.create.foundation.utility.AnimationTickHolder;

2
src/main/java/com/simibubi/create/content/trains/signal/SingleBlockEntityEdgePoint.java
View file

@ -1,6 +1,6 @@
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.nbt.CompoundTag;

6
src/main/java/com/simibubi/create/content/trains/signal/TrackEdgePoint.java
View file

@ -3,13 +3,13 @@ package com.simibubi.create.content.trains.signal;
import java.util.UUID;
import com.simibubi.create.Create;
import com.simibubi.create.content.trains.DimensionPalette;
import com.simibubi.create.content.trains.edgePoint.EdgePointType;
import com.simibubi.create.content.trains.edgePoint.TrackTargetingBehaviour;
import com.simibubi.create.content.trains.graph.DimensionPalette;
import com.simibubi.create.content.trains.graph.EdgePointType;
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.track.TrackTargetingBehaviour;
import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
import com.simibubi.create.foundation.utility.Couple;

2
src/main/java/com/simibubi/create/content/trains/station/GlobalStation.java
View file

@ -4,8 +4,8 @@ import java.lang.ref.WeakReference;
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.graph.DimensionPalette;
import com.simibubi.create.content.trains.graph.TrackNode;
import com.simibubi.create.content.trains.signal.SingleBlockEntityEdgePoint;

8
src/main/java/com/simibubi/create/content/trains/station/StationBlockEntity.java
View file

@ -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.trains.bogey.AbstractBogeyBlock;
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.CarriageBogey;
import com.simibubi.create.content.trains.entity.CarriageContraption;
import com.simibubi.create.content.trains.entity.Train;
import com.simibubi.create.content.trains.entity.TrainPacket;
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.TrackGraph;
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.ScheduleItem;
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.block.ProperWaterloggedBlock;
import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
@ -464,7 +464,7 @@ public class StationBlockEntity extends SmartBlockEntity implements ITransformab
private boolean updateStationState(Consumer<GlobalStation> updateState) {
GlobalStation station = getStation();
GraphLocation graphLocation = edgePoint.determineGraphLocation();
TrackGraphLocation graphLocation = edgePoint.determineGraphLocation();
if (station == null || graphLocation == null)
return false;

2
src/main/java/com/simibubi/create/content/trains/station/StationMarker.java
View file

@ -8,7 +8,7 @@ import com.mojang.blaze3d.vertex.VertexConsumer;
import com.mojang.math.Matrix4f;
import com.simibubi.create.AllBlockEntityTypes;
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.map.CustomRenderedMapDecoration;
import com.simibubi.create.foundation.utility.Components;

4
src/main/java/com/simibubi/create/content/trains/station/StationRenderer.java
View file

@ -7,9 +7,9 @@ import com.mojang.blaze3d.vertex.PoseStack;
import com.mojang.blaze3d.vertex.VertexConsumer;
import com.simibubi.create.AllPartialModels;
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.TrackTargetingBehaviour;
import com.simibubi.create.content.trains.track.TrackTargetingBehaviour.RenderedTrackOverlayType;
import com.simibubi.create.foundation.blockEntity.renderer.SafeBlockEntityRenderer;
import com.simibubi.create.foundation.render.CachedBufferer;
import com.simibubi.create.foundation.render.SuperByteBuffer;

1
src/main/java/com/simibubi/create/content/trains/track/CurvedTrackInteraction.java
View file

@ -3,7 +3,6 @@ package com.simibubi.create.content.trains.track;
import com.simibubi.create.AllItems;
import com.simibubi.create.AllPackets;
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.foundation.utility.Lang;
import com.simibubi.create.foundation.utility.VecHelper;

7
src/main/java/com/simibubi/create/content/trains/edgePoint/CurvedTrackSelectionPacket.java → src/main/java/com/simibubi/create/content/trains/track/CurvedTrackSelectionPacket.java
View file

@ -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 com.simibubi.create.AllBlocks;
import com.simibubi.create.AllSoundEvents;
import com.simibubi.create.content.trains.edgePoint.TrackTargetingBlockItem.OverlapResult;
import com.simibubi.create.content.trains.track.BezierTrackPointLocation;
import com.simibubi.create.content.trains.track.TrackBlockEntity;
import com.simibubi.create.content.trains.graph.EdgePointType;
import com.simibubi.create.content.trains.track.TrackTargetingBlockItem.OverlapResult;
import com.simibubi.create.foundation.networking.BlockEntityConfigurationPacket;
import com.simibubi.create.foundation.utility.Lang;

2
src/main/java/com/simibubi/create/content/trains/track/ITrackBlock.java
View file

@ -10,9 +10,9 @@ import javax.annotation.Nullable;
import com.jozufozu.flywheel.core.PartialModel;
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.DiscoveredLocation;
import com.simibubi.create.content.trains.track.TrackTargetingBehaviour.RenderedTrackOverlayType;
import com.simibubi.create.foundation.utility.Iterate;
import com.simibubi.create.foundation.utility.Pair;

2
src/main/java/com/simibubi/create/content/trains/track/TrackBlock.java
View file

@ -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.ItemUseType;
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.DiscoveredLocation;
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.ProperWaterloggedBlock;
import com.simibubi.create.foundation.block.render.MultiPosDestructionHandler;

16
src/main/java/com/simibubi/create/content/trains/edgePoint/TrackTargetingBehaviour.java → src/main/java/com/simibubi/create/content/trains/track/TrackTargetingBehaviour.java
View file

@ -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.UUID;
@ -10,18 +10,16 @@ import com.mojang.blaze3d.vertex.PoseStack;
import com.simibubi.create.Create;
import com.simibubi.create.content.contraptions.StructureTransform;
import com.simibubi.create.content.schematics.SchematicWorld;
import com.simibubi.create.content.trains.DimensionPalette;
import com.simibubi.create.content.trains.graph.GraphLocation;
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.TrackGraph;
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.signal.SingleBlockEntityEdgePoint;
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.behaviour.BehaviourType;
import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
@ -159,7 +157,7 @@ public class TrackTargetingBehaviour<T extends TrackEdgePoint> extends BlockEnti
return null;
if (!hasValidTrack())
return null;
GraphLocation loc = determineGraphLocation();
TrackGraphLocation loc = determineGraphLocation();
if (loc == null)
return null;
@ -292,7 +290,7 @@ public class TrackTargetingBehaviour<T extends TrackEdgePoint> extends BlockEnti
return targetBezier;
}
public GraphLocation determineGraphLocation() {
public TrackGraphLocation determineGraphLocation() {
Level level = getWorld();
BlockPos pos = getGlobalPosition();
BlockState state = getTrackBlockState();

13
src/main/java/com/simibubi/create/content/trains/edgePoint/TrackTargetingBlockItem.java → src/main/java/com/simibubi/create/content/trains/track/TrackTargetingBlockItem.java
View file

@ -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.function.BiConsumer;
@ -7,14 +7,13 @@ import org.apache.commons.lang3.mutable.MutableObject;
import com.simibubi.create.AllPackets;
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.TrackGraphHelper;
import com.simibubi.create.content.trains.graph.TrackGraphLocation;
import com.simibubi.create.content.trains.graph.TrackNode;
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.foundation.advancement.AllAdvancements;
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,
BezierTrackPointLocation targetBezier, EdgePointType<?> type,
BiConsumer<OverlapResult, GraphLocation> callback) {
BiConsumer<OverlapResult, TrackGraphLocation> callback) {
BlockState state = level.getBlockState(pos);
@ -201,7 +200,7 @@ public class TrackTargetingBlockItem extends BlockItem {
}
AxisDirection targetDirection = front ? AxisDirection.POSITIVE : AxisDirection.NEGATIVE;
GraphLocation location =
TrackGraphLocation location =
targetBezier != null ? TrackGraphHelper.getBezierGraphLocationAt(level, pos, targetDirection, targetBezier)
: TrackGraphHelper.getGraphLocationAt(level, pos, targetDirection, trackAxes.get(0));

14
src/main/java/com/simibubi/create/content/trains/edgePoint/TrackTargetingClient.java → src/main/java/com/simibubi/create/content/trains/track/TrackTargetingClient.java
View file

@ -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.jozufozu.flywheel.util.transform.TransformStack;
import com.mojang.blaze3d.vertex.PoseStack;
import com.simibubi.create.Create;
import com.simibubi.create.content.trains.edgePoint.TrackTargetingBehaviour.RenderedTrackOverlayType;
import com.simibubi.create.content.trains.edgePoint.TrackTargetingBlockItem.OverlapResult;
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.graph.EdgePointType;
import com.simibubi.create.content.trains.graph.TrackGraphLocation;
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 net.minecraft.client.Minecraft;
@ -36,7 +34,7 @@ public class TrackTargetingClient {
static BezierTrackPointLocation lastHoveredBezierSegment;
static OverlapResult lastResult;
static GraphLocation lastLocation;
static TrackGraphLocation lastLocation;
public static void clientTick() {
Minecraft mc = Minecraft.getInstance();

2
src/main/java/com/simibubi/create/foundation/data/recipe/SequencedAssemblyRecipeGen.java
View file

@ -10,7 +10,7 @@ import com.simibubi.create.Create;
import com.simibubi.create.content.fluids.transfer.FillingRecipe;
import com.simibubi.create.content.kinetics.deployer.DeployerApplicationRecipe;
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.world.item.Items;

4
src/main/java/com/simibubi/create/foundation/events/ClientEvents.java
View file

@ -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.turntable.TurntableHandler;
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.link.LinkRenderer;
import com.simibubi.create.content.redstone.link.controller.LinkedControllerClientHandler;
import com.simibubi.create.content.trains.CameraDistanceModifier;
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.CarriageCouplingRenderer;
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.TrackBlockOutline;
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.filtering.FilteringRenderer;
import com.simibubi.create.foundation.blockEntity.behaviour.scrollValue.ScrollValueHandler;

2
src/main/java/com/simibubi/create/foundation/mixin/TestCommandMixin.java
View file

@ -6,7 +6,7 @@ import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
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.gametest.framework.GameTestRegistry;

2
src/main/java/com/simibubi/create/infrastructure/command/DumpRailwaysCommand.java
View file

@ -8,8 +8,8 @@ import java.util.function.Consumer;
import com.mojang.brigadier.builder.ArgumentBuilder;
import com.simibubi.create.Create;
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.graph.EdgePointType;
import com.simibubi.create.content.trains.graph.TrackGraph;
import com.simibubi.create.content.trains.schedule.ScheduleRuntime;
import com.simibubi.create.content.trains.signal.SignalBoundary;

2
src/main/java/com/simibubi/create/infrastructure/gametest/infrastructure/CreateGameTestHelper.java → src/main/java/com/simibubi/create/infrastructure/gametest/CreateGameTestHelper.java
View file

@ -1,4 +1,4 @@
package com.simibubi.create.infrastructure.gametest.infrastructure;
package com.simibubi.create.infrastructure.gametest;
import java.util.Arrays;
import java.util.List;

1
src/main/java/com/simibubi/create/infrastructure/gametest/CreateGameTests.java
View file

@ -2,7 +2,6 @@ package com.simibubi.create.infrastructure.gametest;
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.TestFluids;
import com.simibubi.create.infrastructure.gametest.tests.TestItems;

2
src/main/java/com/simibubi/create/infrastructure/gametest/infrastructure/CreateTestFunction.java → src/main/java/com/simibubi/create/infrastructure/gametest/CreateTestFunction.java
View file

@ -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.Method;

2
src/main/java/com/simibubi/create/infrastructure/gametest/infrastructure/GameTestGroup.java → src/main/java/com/simibubi/create/infrastructure/gametest/GameTestGroup.java
View file

@ -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.Retention;

4
src/main/java/com/simibubi/create/infrastructure/gametest/tests/TestContraptions.java
View file

@ -2,8 +2,8 @@ package com.simibubi.create.infrastructure.gametest.tests;
import java.util.List;
import com.simibubi.create.infrastructure.gametest.infrastructure.CreateGameTestHelper;
import com.simibubi.create.infrastructure.gametest.infrastructure.GameTestGroup;
import com.simibubi.create.infrastructure.gametest.CreateGameTestHelper;
import com.simibubi.create.infrastructure.gametest.GameTestGroup;
import it.unimi.dsi.fastutil.objects.Object2LongMap;
import net.minecraft.core.BlockPos;

4
src/main/java/com/simibubi/create/infrastructure/gametest/tests/TestFluids.java
View file

@ -4,8 +4,8 @@ import com.simibubi.create.AllBlockEntityTypes;
import com.simibubi.create.content.fluids.hosePulley.HosePulleyFluidHandler;
import com.simibubi.create.content.kinetics.gauge.SpeedGaugeBlockEntity;
import com.simibubi.create.content.kinetics.gauge.StressGaugeBlockEntity;
import com.simibubi.create.infrastructure.gametest.infrastructure.CreateGameTestHelper;
import com.simibubi.create.infrastructure.gametest.infrastructure.GameTestGroup;
import com.simibubi.create.infrastructure.gametest.CreateGameTestHelper;
import com.simibubi.create.infrastructure.gametest.GameTestGroup;
import net.minecraft.core.BlockPos;
import net.minecraft.gametest.framework.GameTest;

4
src/main/java/com/simibubi/create/infrastructure/gametest/tests/TestItems.java
View file

@ -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.FlapDisplaySection;
import com.simibubi.create.foundation.utility.Components;
import com.simibubi.create.infrastructure.gametest.infrastructure.CreateGameTestHelper;
import com.simibubi.create.infrastructure.gametest.infrastructure.GameTestGroup;
import com.simibubi.create.infrastructure.gametest.CreateGameTestHelper;
import com.simibubi.create.infrastructure.gametest.GameTestGroup;
import it.unimi.dsi.fastutil.objects.Object2LongMap;
import net.minecraft.Util;

8
src/main/java/com/simibubi/create/infrastructure/gametest/tests/TestMisc.java
View file

@ -1,14 +1,14 @@
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.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.State;
import com.simibubi.create.content.schematics.item.SchematicItem;
import com.simibubi.create.infrastructure.gametest.infrastructure.CreateGameTestHelper;
import com.simibubi.create.infrastructure.gametest.infrastructure.GameTestGroup;
import com.simibubi.create.infrastructure.gametest.CreateGameTestHelper;
import com.simibubi.create.infrastructure.gametest.GameTestGroup;
import net.minecraft.core.BlockPos;
import net.minecraft.gametest.framework.GameTest;

6
src/main/java/com/simibubi/create/infrastructure/gametest/tests/TestProcessing.java
View file

@ -5,11 +5,11 @@ import java.util.List;
import com.simibubi.create.AllBlocks;
import com.simibubi.create.AllItems;
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.sequenced.SequencedAssemblyRecipe;
import com.simibubi.create.foundation.item.ItemHelper;
import com.simibubi.create.infrastructure.gametest.infrastructure.CreateGameTestHelper;
import com.simibubi.create.infrastructure.gametest.infrastructure.GameTestGroup;
import com.simibubi.create.infrastructure.gametest.CreateGameTestHelper;
import com.simibubi.create.infrastructure.gametest.GameTestGroup;
import net.minecraft.core.BlockPos;
import net.minecraft.gametest.framework.GameTest;

2
src/main/java/com/simibubi/create/infrastructure/ponder/scenes/trains/TrackObserverScenes.java
View file

@ -1,7 +1,7 @@
package com.simibubi.create.infrastructure.ponder.scenes.trains;
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.PonderPalette;
import com.simibubi.create.foundation.ponder.SceneBuilder;