Merge branch 'master' into super_stoker

This commit is contained in:
Maya authored and GitHub committed 2025-05-06 17:51:58 -05:00
commit 9a61285887
12 files changed
+343 -1400

No files matched your search

@@ -23,6 +23,7 @@ import com.glodblock.github.network.SPacketFluidUpdate;
import com.glodblock.github.network.SPacketLevelTerminalUpdate;
import com.glodblock.github.network.SPacketMEFluidInvUpdate;
import com.glodblock.github.network.SPacketMEItemInvUpdate;
import com.glodblock.github.network.SPacketPatternItemRenamer;
import com.glodblock.github.network.SPacketSetItemAmount;
import com.glodblock.github.network.SPacketStringUpdate;
import com.glodblock.github.network.SPacketSuperStokerUpdate;
@@ -87,6 +88,11 @@ public class ChannelLoader implements Runnable {
Side.SERVER);
netHandler
.registerMessage(new CPacketPatternMultiSet.Handler(), CPacketPatternMultiSet.class, id++, Side.SERVER);
netHandler.registerMessage(
new SPacketPatternItemRenamer.Handler(),
SPacketPatternItemRenamer.class,
id++,
Side.SERVER);
}
public static void sendPacketToAllPlayers(Packet packet, World world) {
@@ -1,6 +1,7 @@
package com.glodblock.github.loader;
import static com.glodblock.github.common.storage.CellType.Cell16384kPart;
import static com.glodblock.github.loader.ItemAndBlockHolder.ARTIFICIAL_UNIVERSE_CELL;
import static com.glodblock.github.loader.ItemAndBlockHolder.BUFFER;
import static com.glodblock.github.loader.ItemAndBlockHolder.CELL1024K;
import static com.glodblock.github.loader.ItemAndBlockHolder.CELL1024KM;
@@ -507,6 +508,18 @@ public class RecipeLoader implements Runnable {
QUANTUM_CELL,
'M',
AE2_MATTER_CONDENSER));
GameRegistry.addRecipe(
new ShapedOreRecipe(
ARTIFICIAL_UNIVERSE_CELL,
"SCS",
"CNC",
"SCS",
'S',
AE2_SINGULARITY,
'C',
SINGULARITY_CELL,
'N',
NETHER_STAR));
GameRegistry.addRecipe(
new ShapedOreRecipe(
FLUID_VOID_CELL,