[pull] mc1.18/dev from Creators-of-Create:mc1.18/dev

gradle.properties

@@ -8,7 +8,7 @@ mod_version = 0.5.0.i
 artifact_minecraft_version = 1.18.2
 
 minecraft_version = 1.18.2
-forge_version = 40.1.60
+forge_version = 40.2.1
 
 # build dependency versions
 forgegradle_version = 5.1.53

src/generated/resources/.cache/cache

@@ -559,7 +559,7 @@ bf2b0310500213ff853c748c236eb5d01f61658e assets/create/blockstates/yellow_toolbo
 7f39521b211441f5c3e06d60c5978cebe16cacfb assets/create/blockstates/zinc_block.json
 b7181bcd8182b2f17088e5aa881f374c9c65470c assets/create/blockstates/zinc_ore.json
 f85edc574ee6de0de7693ffb031266643db6724a assets/create/lang/en_ud.json
-7e9712249a13bd4760d58e041473487ada1326ba assets/create/lang/en_us.json
+eb624aafc91b284143c3a0cc7d9bbb8de66e8950 assets/create/lang/en_us.json
 487a511a01b2a4531fb672f917922312db78f958 assets/create/models/block/acacia_window.json
 b48060cba1a382f373a05bf0039054053eccf076 assets/create/models/block/acacia_window_pane_noside.json
 3066db1bf03cffa1a9c7fbacf47ae586632f4eb3 assets/create/models/block/acacia_window_pane_noside_alt.json

src/generated/resources/assets/create/lang/en_us.json

@@ -1751,6 +1751,9 @@
 	"create.contraption.minecart_contraption_too_big": "This Cart Contraption seems too big to pick up",
 	"create.contraption.minecart_contraption_illegal_pickup": "A mystical force is binding this Cart Contraption to the world",
 
+	"enchantment.create.capacity.desc": "Increases Backtank air capacity.",
+	"enchantment.create.potato_recovery.desc": "Potato Cannon projectiles have a chance to be reused.",
+
 
 	"_": "->------------------------]  Subtitles  [------------------------<-",
 

src/main/java/com/simibubi/create/content/logistics/trains/entity/Carriage.java

@@ -16,6 +16,8 @@
 
 import javax.annotation.Nullable;
 
+import net.minecraft.server.MinecraftServer;
+
 import org.apache.commons.lang3.mutable.MutableDouble;
 
 import com.simibubi.create.content.contraptions.components.structureMovement.Contraption;
@@ -129,7 +131,7 @@ public double travel(Level level, TrackGraph graph, double distance, TravellingP
 		boolean onTwoBogeys = isOnTwoBogeys();
 		double stress = train.derailed ? 0 : onTwoBogeys ? bogeySpacing - getAnchorDiff() : 0;
 		blocked = false;
-		
+
 		MutableDouble distanceMoved = new MutableDouble(distance);
 		boolean iterateFromBack = distance < 0;
 
@@ -141,7 +143,7 @@ public double travel(Level level, TrackGraph graph, double distance, TravellingP
 			CarriageBogey bogey = bogeys.get(actuallyFirstBogey);
 			double bogeyCorrection = stress * (actuallyFirstBogey ? 0.5d : -0.5d);
 			double bogeyStress = bogey.getStress();
-			
+
 			for (boolean firstWheel : Iterate.trueAndFalse) {
 				boolean actuallyFirstWheel = firstWheel ^ iterateFromBack;
 				TravellingPoint point = bogey.points.get(actuallyFirstWheel);
@@ -249,8 +251,11 @@ public void manageEntities(Level level) {
 
 			boolean discard =
 				!currentlyTraversedDimensions.isEmpty() && !currentlyTraversedDimensions.contains(entry.getKey());
-			ServerLevel currentLevel = level.getServer()
-				.getLevel(entry.getKey());
+
+			MinecraftServer server = level.getServer();
+			if (server == null)
+				continue;
+			ServerLevel currentLevel = server.getLevel(entry.getKey());
 			if (currentLevel == null)
 				continue;
 
@@ -848,7 +853,7 @@ public void alignEntity(CarriageContraptionEntity entity) {
 					train.carriageWaitingForChunks = id;
 					return;
 				}
-				
+
 				if (entity.getPassengers()
 					.stream()
 					.anyMatch(p -> p instanceof Player)

src/main/java/com/simibubi/create/events/CommonEvents.java

@@ -60,6 +60,7 @@
 import net.minecraftforge.event.world.WorldEvent;
 import net.minecraftforge.eventbus.api.EventPriority;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
+import net.minecraftforge.fml.LogicalSide;
 import net.minecraftforge.fml.ModList;
 import net.minecraftforge.fml.common.Mod.EventBusSubscriber;
 import net.minecraftforge.forgespi.language.IModFileInfo;
@@ -120,9 +121,11 @@ public static void whenFluidsMeet(FluidPlaceBlockEvent event) {
 	}
 
 	@SubscribeEvent
-	public static void onWorldTick(WorldTickEvent event) {
+	public static void onServerWorldTick(WorldTickEvent event) {
 		if (event.phase == Phase.START)
 			return;
+		if (event.side == LogicalSide.CLIENT)
+			return;
 		Level world = event.world;
 		ContraptionHandler.tick(world);
 		CapabilityMinecartController.tick(world);

src/main/resources/assets/create/lang/default/interface.json

@@ -919,6 +919,9 @@
 	"create.command.killTPSCommand.argument.tickTime": "tickTime",
 
 	"create.contraption.minecart_contraption_too_big": "This Cart Contraption seems too big to pick up",
-	"create.contraption.minecart_contraption_illegal_pickup": "A mystical force is binding this Cart Contraption to the world"
+	"create.contraption.minecart_contraption_illegal_pickup": "A mystical force is binding this Cart Contraption to the world",
+
+	"enchantment.create.capacity.desc": "Increases Backtank air capacity.",
+  	"enchantment.create.potato_recovery.desc": "Potato Cannon projectiles have a chance to be reused."
 
 }

src/main/resources/data/create/recipes/compat/ae2/crushing/deepslate_quartz_ore.json

@@ -0,0 +1,35 @@
+{
+	"conditions": [
+		{
+		  "type": "forge:mod_loaded",
+		  "modid": "ae2"
+		}
+	],
+    "type": "create:crushing",
+    "ingredients": [
+    	{
+    		"item": "ae2:deepslate_quartz_ore"
+    	}
+    ],
+	"results": [
+		{
+			"item": "ae2:certus_quartz_crystal",
+			"count": 1
+		},
+		{
+			"item": "ae2:certus_quartz_dust",
+			"count": 4
+		},
+		{
+			"item": "ae2:certus_quartz_dust",
+			"count": 1,
+			"chance": 0.5
+		},
+		{
+			"item": "minecraft:cobbled_deepslate",
+			"count": 1,
+			"chance": 0.125
+		}
+	],
+	"processingTime": 300
+}

src/main/resources/data/create/recipes/compat/ae2/crushing/certus_ore.json → src/main/resources/data/create/recipes/compat/ae2/crushing/quartz_ore.json

@@ -2,24 +2,28 @@
 	"conditions": [
 		{
 		  "type": "forge:mod_loaded",
-		  "modid": "appliedenergistics2"
+		  "modid": "ae2"
 		}
 	],
     "type": "create:crushing",
     "ingredients": [
     	{
-    		"item": "appliedenergistics2:quartz_ore"
+    		"item": "ae2:quartz_ore"
     	}
     ],
 	"results": [
 		{
-			"item": "appliedenergistics2:certus_quartz_crystal",
-			"count": 2
+			"item": "ae2:certus_quartz_crystal",
+			"count": 1
 		},
 		{
-			"item": "appliedenergistics2:certus_quartz_dust",
+			"item": "ae2:certus_quartz_dust",
+			"count": 4
+		},
+		{
+			"item": "ae2:certus_quartz_dust",
 			"count": 1,
-			"chance": 0.25
+			"chance": 0.5
 		},
 		{
 			"item": "minecraft:cobblestone",