Merge branch 'master' into fix/fluidterminal

This commit is contained in:
Yang Xizhi authored and GitHub committed 2023-01-20 15:29:25 +08:00
commit c5e9b34a5e
19 files changed
+1109 -35

No files matched your search

@@ -33,6 +33,8 @@ public class ChannelLoader implements Runnable {
new SPacketFluidUpdate.Handler(), SPacketFluidUpdate.class, id++, Side.CLIENT);
FluidCraft.proxy.netHandler.registerMessage(
new CPacketPatternValueSet.Handler(), CPacketPatternValueSet.class, id++, Side.SERVER);
FluidCraft.proxy.netHandler.registerMessage(
new CPacketValueConfig.Handler(), CPacketValueConfig.class, id++, Side.SERVER);
FluidCraft.proxy.netHandler.registerMessage(
new CPacketFluidUpdate.Handler(), CPacketFluidUpdate.class, id++, Side.SERVER);
FluidCraft.proxy.netHandler.registerMessage(
@@ -26,6 +26,7 @@ public class ItemAndBlockHolder {
public static ItemFluidImportBus FLUID_IMPORT_BUS = new ItemFluidImportBus().register();
public static ItemFluidExportBus FLUID_EXPORT_BUS = new ItemFluidExportBus().register();
public static ItemPartFluidStorageBus FLUID_STORAGE_BUS = new ItemPartFluidStorageBus().register();
public static ItemFluidLevelEmitter FLUID_LEVEL_EMITTER = new ItemFluidLevelEmitter().register();
public static ItemFluidPacket PACKET = new ItemFluidPacket().register();
public static ItemBasicFluidStorageCell CELL1K = new ItemBasicFluidStorageCell(CellType.Cell1kPart, 1).register();
public static ItemBasicFluidStorageCell CELL4K = new ItemBasicFluidStorageCell(CellType.Cell4kPart, 4).register();
@@ -1,6 +1,7 @@
package com.glodblock.github.loader;
import static com.glodblock.github.loader.ItemAndBlockHolder.*;
import static net.minecraft.init.Blocks.redstone_torch;
import com.glodblock.github.common.Config;
import com.glodblock.github.common.item.ItemBasicFluidStorageCell;
@@ -142,6 +143,8 @@ public class RecipeLoader implements Runnable {
AE2_CORE_FOM,
'B',
BUCKET));
GameRegistry.addRecipe(new ShapedOreRecipe(
FLUID_LEVEL_EMITTER.stack(), "RPD", 'R', redstone_torch, 'P', AE2_PROCESS_CAL, 'D', "dyeBlue"));
GameRegistry.addRecipe(new ShapedOreRecipe(
LARGE_BUFFER.stack(),
"BGB",