Merge branch 'master' into bookmark

This commit is contained in:
Yang Xizhi authored and GitHub committed 2023-01-29 14:25:51 +08:00
commit 1f6dc04a71
236 files changed
+4313 -3150

No files matched your search

@@ -30,19 +30,22 @@ public class ItemAndBlockHolder {
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 ItemPortableFluidCell PORTABLE_FLUID_CELL = new ItemPortableFluidCell().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();
public static ItemBasicFluidStorageCell CELL16K =
new ItemBasicFluidStorageCell(CellType.Cell16kPart, 16).register();
public static ItemBasicFluidStorageCell CELL64K =
new ItemBasicFluidStorageCell(CellType.Cell64kPart, 64).register();
public static ItemBasicFluidStorageCell CELL256K =
new ItemBasicFluidStorageCell(CellType.Cell256kPart, 256).register();
public static ItemBasicFluidStorageCell CELL1024K =
new ItemBasicFluidStorageCell(CellType.Cell1024kPart, 1024).register();
public static ItemBasicFluidStorageCell CELL4096K =
new ItemBasicFluidStorageCell(CellType.Cell4096kPart, 4096).register();
public static ItemBasicFluidStorageCell CELL16K = new ItemBasicFluidStorageCell(CellType.Cell16kPart, 16)
.register();
public static ItemBasicFluidStorageCell CELL64K = new ItemBasicFluidStorageCell(CellType.Cell64kPart, 64)
.register();
public static ItemBasicFluidStorageCell CELL256K = new ItemBasicFluidStorageCell(CellType.Cell256kPart, 256)
.register();
public static ItemBasicFluidStorageCell CELL1024K = new ItemBasicFluidStorageCell(CellType.Cell1024kPart, 1024)
.register();
public static ItemBasicFluidStorageCell CELL4096K = new ItemBasicFluidStorageCell(CellType.Cell4096kPart, 4096)
.register();
public static ItemBasicFluidStorageCell CELL16384K = new ItemBasicFluidStorageCell(CellType.Cell16384kPart, 16384)
.register();
public static ItemBasicFluidStoragePart CELL_PART = new ItemBasicFluidStoragePart().register();
public static void loadSetting() {
@@ -54,5 +57,6 @@ public class ItemAndBlockHolder {
CellType.Cell256kPart.setItemInstance(CELL_PART);
CellType.Cell1024kPart.setItemInstance(CELL_PART);
CellType.Cell4096kPart.setItemInstance(CELL_PART);
CellType.Cell16384kPart.setItemInstance(CELL_PART);
}
}