Merge pull request #69 from asdflj/bookmark

add fluid storage monitor
This commit is contained in:
Martin Robertz authored and GitHub committed 2023-01-25 10:36:13 +01:00
commit 4d236cb898
28 files changed
+9826 -15

No files matched your search

@@ -16,7 +16,7 @@ public class ItemAndBlockHolder {
public static BlockFluidBuffer FLUID_BUFFER = new BlockFluidBuffer().register();
public static BlockLargeIngredientBuffer LARGE_BUFFER = new BlockLargeIngredientBuffer().register();
public static BlockOCPatternEditor OC_EDITOR = new BlockOCPatternEditor().register();
public static BlockWalrus WALRUS = new BlockWalrus().register();
public static ItemFluidDrop DROP = new ItemFluidDrop().register();
public static ItemFluidEncodedPattern PATTERN = new ItemFluidEncodedPattern().register();
public static ItemPartFluidTerminal FLUID_TERM = new ItemPartFluidTerminal().register();
@@ -27,6 +27,8 @@ public class ItemAndBlockHolder {
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 ItemFluidStorageMonitor FLUID_STORAGE_MONITOR = new ItemFluidStorageMonitor().register();
public static ItemFluidConversionMonitor FLUID_CONVERSION_MONITOR = new ItemFluidConversionMonitor().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();
@@ -2,6 +2,7 @@ package com.glodblock.github.loader;
import static com.glodblock.github.loader.ItemAndBlockHolder.*;
import static net.minecraft.init.Blocks.redstone_torch;
import static net.minecraft.init.Items.fish;
import com.glodblock.github.common.Config;
import com.glodblock.github.common.item.ItemBasicFluidStorageCell;
@@ -123,6 +124,25 @@ public class RecipeLoader implements Runnable {
AE2_WORK_BENCH));
GameRegistry.addShapelessRecipe(FLUID_STORAGE_BUS.stack(), FLUID_INTERFACE, STICKY_PISTON, PISTON);
GameRegistry.addShapelessRecipe(FLUID_STORAGE_BUS.stack(), INTERFACE, STICKY_PISTON, PISTON);
GameRegistry.addRecipe(new ShapedOreRecipe(
FLUID_STORAGE_MONITOR.stack(),
"EIP",
"P ",
'I',
"itemIlluminatedPanel",
'E',
FLUID_LEVEL_EMITTER,
'P',
"dyeBlue"));
GameRegistry.addRecipe(new ShapedOreRecipe(
FLUID_CONVERSION_MONITOR.stack(),
"ASF",
'A',
AE2_CORE_ANN,
'S',
FLUID_STORAGE_MONITOR,
'F',
AE2_CORE_FOM));
GameRegistry.addShapelessRecipe(FLUID_TERMINAL.stack(), AE2_PATTERN_TERM, ENCODER);
GameRegistry.addShapelessRecipe(
FLUID_TERMINAL_EX.stack(), FLUID_TERMINAL.stack(), AE2_PROCESS_CAL, AE2_PROCESS_ENG, AE2_PROCESS_LOG);
@@ -143,6 +163,7 @@ public class RecipeLoader implements Runnable {
AE2_CORE_FOM,
'B',
BUCKET));
GameRegistry.addRecipe(new ShapedOreRecipe(WALRUS, "FFF", "F F", "FFF", 'F', fish));
GameRegistry.addRecipe(new ShapedOreRecipe(
FLUID_LEVEL_EMITTER.stack(), "RPD", 'R', redstone_torch, 'P', AE2_PROCESS_CAL, 'D', "dyeBlue"));
GameRegistry.addRecipe(new ShapedOreRecipe(
@@ -2,6 +2,7 @@ package com.glodblock.github.loader;
import com.glodblock.github.client.render.ItemDropRender;
import com.glodblock.github.client.render.ItemPacketRender;
import com.glodblock.github.client.render.ItemWalrusRender;
public class RenderLoader implements Runnable {
@@ -9,5 +10,6 @@ public class RenderLoader implements Runnable {
public void run() {
new ItemDropRender();
new ItemPacketRender();
new ItemWalrusRender();
}
}