Browse Source

Fixed Melting Points for Barrels and Drums

Gregorius Techneticies 2 months ago
parent
commit
fe0ef9d29c
Signed by: Gregorius Techneticies <gregoriustech@gmail.com> GPG Key ID: 1B693EA14F2FD70F

+ 1
- 0
CHANGELOG.md View File

@@ -18,6 +18,7 @@ Nothing (I tend to only add finished Stuff to the Changelog).
18 18
 [FIXED] Forestry Backpacks didn't work with Autocollecting Tools, because the Magnetic Autocollect did not throw an Item Collect Event.
19 19
 [FIXED] Chainsaws used WAY too much durability for Treecapitation!
20 20
 [FIXED] Worldgeneration in different Dimensions had the same RNG as on the Overworld. Now the Seed is being XOR-ed with the Dimension ID to prevent that. This has the convenient Side Effect of the Overworld staying the same as before, because it's ID is Zero.
21
+[CHANGED] Barrels and Drums did not have the same Melting Points that Pipes have. I fixed that. Metal Drums now have 1.25 times more Heat Resistance, while Wooden Barrels and Plastic Cans got a properly assigned fixed Value, which in most cases should not make them burn up.
21 22
 [CHANGED] Blue Steel is Red Steel now and vice versa. This should fix my ages old fuckup of the Recipes. Everything should still be the same as before when it comes to Stats, just the Color of the Material changed. If you used Matter Fabricators to make Red/Blue Steel for some reason, you may need to check the USB Stick with the Recipe.
22 23
 [CHANGED] Oil and Natural Gas can now pass through Water. In the case of Oil this will result in Buildcraft alike Oil Fountains or puddles in the Ocean, should you be super lucky. If not, just dig a tunnel down and it happens too. XD
23 24
 [ADDED] Barbecue Sauce (BBQ Sauce), because why not.

+ 2
- 2
src/main/java/gregapi/tileentity/tank/TileEntityBase08Barrel.java View File

@@ -1,5 +1,5 @@
1 1
 /**
2
- * Copyright (c) 2020 GregTech-6 Team
2
+ * Copyright (c) 2021 GregTech-6 Team
3 3
  *
4 4
  * This file is part of GregTech.
5 5
  *
@@ -71,7 +71,7 @@ public abstract class TileEntityBase08Barrel extends TileEntityBase07Paintable i
71 71
 		if (aNBT.hasKey(NBT_GASPROOF)) mGasProof = aNBT.getBoolean(NBT_GASPROOF);
72 72
 		if (aNBT.hasKey(NBT_ACIDPROOF)) mAcidProof = aNBT.getBoolean(NBT_ACIDPROOF);
73 73
 		if (aNBT.hasKey(NBT_PLASMAPROOF)) mPlasmaProof = aNBT.getBoolean(NBT_PLASMAPROOF);
74
-		if (aNBT.hasKey(NBT_CAPACITY_HU)) mMeltingPoint = aNBT.getLong(NBT_CAPACITY_HU); else mMeltingPoint = mMaterial.mMeltingPoint;
74
+		if (aNBT.hasKey(NBT_CAPACITY_HU)) mMeltingPoint = aNBT.getLong(NBT_CAPACITY_HU); else mMeltingPoint = (long)(mMaterial.mMeltingPoint * 1.25);
75 75
 		mMode = aNBT.getByte(NBT_MODE);
76 76
 		mSealedTime = aNBT.getLong(NBT_PROGRESS);
77 77
 		mTank.setPreventDraining(keepsFilter()).setCapacity(aNBT.getLong(NBT_TANK_CAPACITY)).readFromNBT(aNBT, NBT_TANK);

+ 34
- 34
src/main/java/gregtech/loaders/b/Loader_MultiTileEntities.java View File

@@ -2073,40 +2073,40 @@ public class Loader_MultiTileEntities implements Runnable {
2073 2073
 		aMat = MT.Ta4HfC5;          aRegistry.add("Tantalum Hafnium Carbide Cap Nozzle"                 , "Misc Tool Blocks"                    , 32082, 32720, MultiTileEntityFluidCapNozzle.class                     ,                 0, 64, aUtilMetal     , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   0.5F, NBT_RESISTANCE,  10.0F, NBT_ACIDPROOF, F), "Rw", "BT", "Nd", 'N', aRegistry.getItem(32749), 'R', OP.ring.dat(aMat), 'B', OP.round.dat(aMat), 'T', OP.screw.dat(aMat));
2074 2074
 		aMat = MT.Ad;               aRegistry.add("Adamantium Cap Nozzle"                               , "Misc Tool Blocks"                    , 32062, 32720, MultiTileEntityFluidCapNozzle.class                     ,                 0, 64, aUtilMetal     , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   0.5F, NBT_RESISTANCE, 100.0F, NBT_ACIDPROOF, T), "Rw", "BT", "Nd", 'N', aRegistry.getItem(32750), 'R', OP.ring.dat(aMat), 'B', OP.round.dat(aMat), 'T', OP.screw.dat(aMat));
2075 2075
 		
2076
-		aMat = ANY.Wood;            aRegistry.add("Wooden Barrel (Cheap)"                               , "Fluid Containers"                    , 32733, 32719, MultiTileEntityBarrelWood.class                         ,                 0, 16, aUtilWood      , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   1.0F, NBT_RESISTANCE,   5.0F, NBT_TANK_CAPACITY,        8000L, NBT_PLASMAPROOF, F, NBT_GASPROOF, F, NBT_ACIDPROOF, F, NBT_FLAMMABILITY,       100), "rGs", "PSP", "PSP", 'G', OD.itemGlue, 'P', OD.plankAnyWood, 'S', OP.stickLong.dat(MT.Pb));
2077
-		aMat = ANY.Wood;            aRegistry.add("Wooden Barrel (Cheap)"                               , "Fluid Containers"                    , 32752, 32719, MultiTileEntityBarrelWood.class                         ,                 0, 16, aUtilWood      , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   1.0F, NBT_RESISTANCE,   5.0F, NBT_TANK_CAPACITY,        8000L, NBT_PLASMAPROOF, F, NBT_GASPROOF, F, NBT_ACIDPROOF, F, NBT_FLAMMABILITY,       100), "rGs", "PSP", "PSP", 'G', OD.itemGlue, 'P', OD.plankAnyWood, 'S', OP.stickLong.dat(MT.Bi));
2078
-		aMat = ANY.Wood;            aRegistry.add("Wooden Barrel (Cheap)"                               , "Fluid Containers"                    , 32753, 32719, MultiTileEntityBarrelWood.class                         ,                 0, 16, aUtilWood      , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   1.0F, NBT_RESISTANCE,   5.0F, NBT_TANK_CAPACITY,        8000L, NBT_PLASMAPROOF, F, NBT_GASPROOF, F, NBT_ACIDPROOF, F, NBT_FLAMMABILITY,       100), "rGs", "PSP", "PSP", 'G', OD.itemGlue, 'P', OD.plankAnyWood, 'S', OP.stickLong.dat(MT.Bronze));
2079
-		aMat = ANY.Wood;            aRegistry.add("Wooden Barrel (Cheap)"                               , "Fluid Containers"                    , 32754, 32719, MultiTileEntityBarrelWood.class                         ,                 0, 16, aUtilWood      , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   1.0F, NBT_RESISTANCE,   5.0F, NBT_TANK_CAPACITY,        8000L, NBT_PLASMAPROOF, F, NBT_GASPROOF, F, NBT_ACIDPROOF, F, NBT_FLAMMABILITY,       100), "rGs", "PSP", "PSP", 'G', OD.itemGlue, 'P', OD.plankAnyWood, 'S', OP.stickLong.dat(MT.Brass));
2080
-		aMat = MT.WoodSealed;       aRegistry.add("Wooden Barrel"                                       , "Fluid Containers"                    , 32714, 32719, MultiTileEntityBarrelWood.class                         ,                 0, 16, aUtilWood      , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   1.0F, NBT_RESISTANCE,   5.0F, NBT_TANK_CAPACITY,       16000L, NBT_PLASMAPROOF, F, NBT_GASPROOF, F, NBT_ACIDPROOF, F, NBT_FLAMMABILITY,       100), "rGs", "PSP", "PSP", 'G', OD.itemGlue, 'P', OP.plate.dat(aMat), 'S', OP.stickLong.dat(ANY.Iron));
2081
-		aMat = MT.Skyroot;          aRegistry.add("Skyroot Barrel"                                      , "Fluid Containers"                    , 32019, 32719, MultiTileEntityBarrelWood.class                         ,                 0, 16, aUtilWood      , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   1.0F, NBT_RESISTANCE,   5.0F, NBT_TANK_CAPACITY,       16000L, NBT_PLASMAPROOF, F, NBT_GASPROOF, F, NBT_ACIDPROOF, F, NBT_FLAMMABILITY,       100), "rGs", "PSP", "PSP", 'G', OD.itemGlue, 'P', OD.plankSkyroot, 'S', OP.stickLong.dat(ANY.Iron));
2082
-		aMat = MT.Weedwood;         aRegistry.add("Weedwood Barrel"                                     , "Fluid Containers"                    , 32008, 32719, MultiTileEntityBarrelWood.class                         ,                 0, 16, aUtilWood      , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   1.0F, NBT_RESISTANCE,   5.0F, NBT_TANK_CAPACITY,        8000L, NBT_PLASMAPROOF, F, NBT_GASPROOF, F, NBT_ACIDPROOF, F                             ), "rGs", "PSP", "PSP", 'G', OD.itemGlue, 'P', OD.plankWeedwood, 'S', OP.stickLong.dat(MT.Syrmorite));
2083
-		aMat = MT.Livingwood;       aRegistry.add("Livingwood Barrel"                                   , "Fluid Containers"                    , 32010, 32719, MultiTileEntityBarrelWood.class                         ,                 0, 16, aUtilWood      , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   1.0F, NBT_RESISTANCE,   5.0F, NBT_TANK_CAPACITY,       16000L, NBT_PLASMAPROOF, F, NBT_GASPROOF, F, NBT_ACIDPROOF, F, NBT_FLAMMABILITY,       100), "rGs", "PSP", "PSP", 'G', OD.itemGlue, 'P', OP.plate.dat(aMat), 'S', OP.stickLong.dat(ANY.Iron));
2084
-		aMat = MT.Dreamwood;        aRegistry.add("Dreamwood Barrel"                                    , "Fluid Containers"                    , 32009, 32719, MultiTileEntityBarrelWood.class                         ,                 0, 16, aUtilWood      , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   1.0F, NBT_RESISTANCE,   5.0F, NBT_TANK_CAPACITY,       64000L, NBT_PLASMAPROOF, F, NBT_GASPROOF, F, NBT_ACIDPROOF, F                             ), "rGs", "PSP", "PSP", 'G', OD.itemGlue, 'P', OP.plate.dat(aMat), 'S', OP.stickLong.dat(MT.Manasteel));
2085
-		aMat = MT.Shimmerwood;      aRegistry.add("Shimmerwood Barrel"                                  , "Fluid Containers"                    , 32016, 32719, MultiTileEntityBarrelWood.class                         ,                 0, 16, aUtilWood      , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   1.0F, NBT_RESISTANCE,   5.0F, NBT_TANK_CAPACITY,       64000L, NBT_PLASMAPROOF, F, NBT_GASPROOF, F, NBT_ACIDPROOF, F                             ), "rGs", "PSP", "PSP", 'G', OD.itemGlue, 'P', OP.plate.dat(aMat), 'S', OP.stickLong.dat(MT.Manasteel));
2086
-		aMat = MT.IronWood;         aRegistry.add("Ironwood Barrel"                                     , "Fluid Containers"                    , 32734, 32719, MultiTileEntityBarrelWood.class                         ,                 0, 16, aUtilWood      , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   1.0F, NBT_RESISTANCE,   5.0F, NBT_TANK_CAPACITY,       32000L, NBT_PLASMAPROOF, F, NBT_GASPROOF, F, NBT_ACIDPROOF, F                             ), "rGs", "PSP", "PSP", 'G', OD.itemGlue, 'P', OP.plate.dat(aMat), 'S', OP.stickLong.dat(ANY.Iron));
2087
-		aMat = MT.Greatwood;        aRegistry.add("Greatwood Barrel"                                    , "Fluid Containers"                    , 32017, 32719, MultiTileEntityBarrelWood.class                         ,                 0, 16, aUtilWood      , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   1.0F, NBT_RESISTANCE,   5.0F, NBT_TANK_CAPACITY,       16000L, NBT_PLASMAPROOF, F, NBT_GASPROOF, F, NBT_ACIDPROOF, F, NBT_FLAMMABILITY,       100), "rGs", "PSP", "PSP", 'G', OD.itemGlue, 'P', OP.plate.dat(aMat), 'S', OP.stickLong.dat(ANY.Iron));
2088
-		aMat = MT.Silverwood;       aRegistry.add("Silverwood Barrel"                                   , "Fluid Containers"                    , 32018, 32719, MultiTileEntityBarrelWood.class                         ,                 0, 16, aUtilWood      , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   1.0F, NBT_RESISTANCE,   5.0F, NBT_TANK_CAPACITY,       64000L, NBT_PLASMAPROOF, F, NBT_GASPROOF, F, NBT_ACIDPROOF, F                             ), "rGs", "PSP", "PSP", 'G', OD.itemGlue, 'P', OP.plate.dat(aMat), 'S', OP.stickLong.dat(MT.Thaumium));
2089
-		aMat = MT.Plastic;          aRegistry.add("Plastic Can"                                         , "Fluid Containers"                    , 32715, 32719, MultiTileEntityBarrelPlastic.class                      ,                 0, 16, aUtilWood      , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   1.0F, NBT_RESISTANCE,   3.0F, NBT_TANK_CAPACITY,       32000L, NBT_PLASMAPROOF, F, NBT_GASPROOF, T, NBT_ACIDPROOF, F                             )); IL.PlasticCan.set(aRegistry.getItem(), new OreDictItemData(MT.Plastic, U*6));
2090
-		aMat = MT.StainlessSteel;   aRegistry.add("Drum"                                                , "Fluid Containers"                    , 32716, 32719, MultiTileEntityBarrelMetal.class                        ,                 0, 16, aUtilMetal     , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   1.0F, NBT_RESISTANCE,   6.0F, NBT_TANK_CAPACITY,       64000L, NBT_PLASMAPROOF, F, NBT_GASPROOF, T, NBT_ACIDPROOF, T                             ), " h ", "PSP", "PSP", 'P', OP.plateCurved.dat(aMat), 'S', OP.stickLong.dat(aMat));
2091
-		aMat = MT.Invar;            aRegistry.add("Invar Drum"                                          , "Fluid Containers"                    , 32064, 32719, MultiTileEntityBarrelMetal.class                        ,                 0, 16, aUtilMetal     , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   1.0F, NBT_RESISTANCE,   6.0F, NBT_TANK_CAPACITY,       64000L, NBT_PLASMAPROOF, F, NBT_GASPROOF, T, NBT_ACIDPROOF, F                             ), " h ", "PSP", "PSP", 'P', OP.plateCurved.dat(aMat), 'S', OP.stickLong.dat(aMat));
2092
-		aMat = MT.Desh;             aRegistry.add("Desh Drum"                                           , "Fluid Containers"                    , 32070, 32719, MultiTileEntityBarrelMetal.class                        ,                 0, 16, aUtilMetal     , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   1.0F, NBT_RESISTANCE,   6.0F, NBT_TANK_CAPACITY,       64000L, NBT_PLASMAPROOF, F, NBT_GASPROOF, T, NBT_ACIDPROOF, F                             ), " h ", "PSP", "PSP", 'P', OP.plateCurved.dat(aMat), 'S', OP.stickLong.dat(aMat));
2093
-		aMat = MT.Syrmorite;        aRegistry.add("Syrmorite Drum"                                      , "Fluid Containers"                    , 32020, 32719, MultiTileEntityBarrelMetal.class                        ,                 0, 16, aUtilMetal     , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   1.0F, NBT_RESISTANCE,   6.0F, NBT_TANK_CAPACITY,       64000L, NBT_PLASMAPROOF, F, NBT_GASPROOF, T, NBT_ACIDPROOF, T                             ), " h ", "PSP", "PSP", 'P', OP.plateCurved.dat(aMat), 'S', OP.stickLong.dat(aMat));
2094
-		aMat = MT.Efrine;           aRegistry.add("Efrine Drum"                                         , "Fluid Containers"                    , 32093, 32719, MultiTileEntityBarrelMetal.class                        ,                 0, 16, aUtilMetal     , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   1.0F, NBT_RESISTANCE,   6.0F, NBT_TANK_CAPACITY,       64000L, NBT_PLASMAPROOF, T, NBT_GASPROOF, T, NBT_ACIDPROOF, F                             ), " h ", "PSP", "PSP", 'P', OP.plateCurved.dat(aMat), 'S', OP.stickLong.dat(aMat));
2095
-		aMat = MT.Thaumium;         aRegistry.add("Thaumium Drum"                                       , "Fluid Containers"                    , 32022, 32719, MultiTileEntityBarrelMetal.class                        ,                 0, 16, aUtilMetal     , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   1.0F, NBT_RESISTANCE,   6.0F, NBT_TANK_CAPACITY,       64000L, NBT_PLASMAPROOF, F, NBT_GASPROOF, T, NBT_ACIDPROOF, T                             ), " h ", "PSP", "PSP", 'P', OP.plateCurved.dat(aMat), 'S', OP.stickLong.dat(aMat));
2096
-		aMat = MT.Manasteel;        aRegistry.add("Manasteel Drum"                                      , "Fluid Containers"                    , 32023, 32719, MultiTileEntityBarrelMetal.class                        ,                 0, 16, aUtilMetal     , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   1.0F, NBT_RESISTANCE,   6.0F, NBT_TANK_CAPACITY,       64000L, NBT_PLASMAPROOF, F, NBT_GASPROOF, T, NBT_ACIDPROOF, T                             ), " h ", "PSP", "PSP", 'P', OP.plateCurved.dat(aMat), 'S', OP.stickLong.dat(aMat));
2097
-		aMat = MT.TungstenAlloy;    aRegistry.add("Tungsten Alloy Drum"                                 , "Fluid Containers"                    , 32090, 32719, MultiTileEntityBarrelMetal.class                        ,                 0, 16, aUtilMetal     , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   1.0F, NBT_RESISTANCE,   9.0F, NBT_TANK_CAPACITY,      128000L, NBT_PLASMAPROOF, F, NBT_GASPROOF, T, NBT_ACIDPROOF, F                             ), " h ", "PSP", "PSP", 'P', OP.plateCurved.dat(aMat), 'S', OP.stickLong.dat(aMat));
2098
-		aMat = MT.Ti;               aRegistry.add("Titanium Drum"                                       , "Fluid Containers"                    , 32742, 32719, MultiTileEntityBarrelMetal.class                        ,                 0, 16, aUtilMetal     , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   1.0F, NBT_RESISTANCE,   9.0F, NBT_TANK_CAPACITY,      128000L, NBT_PLASMAPROOF, F, NBT_GASPROOF, T, NBT_ACIDPROOF, F                             ), " h ", "PSP", "PSP", 'P', OP.plateCurved.dat(aMat), 'S', OP.stickLong.dat(aMat));
2099
-		aMat = MT.Netherite;        aRegistry.add("Netherite Drum"                                      , "Fluid Containers"                    , 32087, 32719, MultiTileEntityBarrelMetal.class                        ,                 0, 16, aUtilMetal     , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   1.0F, NBT_RESISTANCE,   9.0F, NBT_TANK_CAPACITY,      128000L, NBT_PLASMAPROOF, T, NBT_GASPROOF, T, NBT_ACIDPROOF, T                             ), " h ", "PSP", "PSP", 'P', OP.plateCurved.dat(aMat), 'S', OP.stickLong.dat(aMat));
2100
-		aMat = MT.TungstenSteel;    aRegistry.add("Tungstensteel Drum"                                  , "Fluid Containers"                    , 32717, 32719, MultiTileEntityBarrelMetal.class                        ,                 0, 16, aUtilMetal     , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   1.0F, NBT_RESISTANCE,  12.5F, NBT_TANK_CAPACITY,      256000L, NBT_PLASMAPROOF, F, NBT_GASPROOF, T, NBT_ACIDPROOF, F                             ), " h ", "PSP", "PSP", 'P', OP.plateCurved.dat(aMat), 'S', OP.stickLong.dat(aMat));
2101
-		aMat = ANY.W;               aRegistry.add("Tungsten Drum"                                       , "Fluid Containers"                    , 32718, 32719, MultiTileEntityBarrelMetal.class                        ,                 0, 16, aUtilMetal     , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   1.0F, NBT_RESISTANCE,  10.0F, NBT_TANK_CAPACITY,      256000L, NBT_PLASMAPROOF, F, NBT_GASPROOF, T, NBT_ACIDPROOF, T                             ), " h ", "PSP", "PSP", 'P', OP.plateCurved.dat(aMat), 'S', OP.stickLong.dat(aMat));
2102
-		aMat = MT.Ta4HfC5;          aRegistry.add("Tantalum Hafnium Carbide Drum"                       , "Fluid Containers"                    , 32083, 32719, MultiTileEntityBarrelMetal.class                        ,                 0, 16, aUtilMetal     , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   1.0F, NBT_RESISTANCE,  10.0F, NBT_TANK_CAPACITY,      512000L, NBT_PLASMAPROOF, F, NBT_GASPROOF, T, NBT_ACIDPROOF, F                             ), " h ", "PSP", "PSP", 'P', OP.plateCurved.dat(aMat), 'S', OP.stickLong.dat(aMat));
2103
-		aMat = MT.VoidMetal;        aRegistry.add("Voidmetal Drum"                                      , "Fluid Containers"                    , 32063, 32719, MultiTileEntityBarrelMetal.class                        ,                 0, 16, aUtilMetal     , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   1.0F, NBT_RESISTANCE,  10.0F, NBT_TANK_CAPACITY,      256000L, NBT_PLASMAPROOF, T, NBT_GASPROOF, T, NBT_ACIDPROOF, T                             ), " h ", "PSP", "PSP", 'P', OP.plateCurved.dat(aMat), 'S', OP.stickLong.dat(aMat));
2104
-		aMat = MT.GaiaSpirit;       aRegistry.add("Gaia Drum"                                           , "Fluid Containers"                    , 32024, 32719, MultiTileEntityBarrelMetal.class                        ,                 0, 16, aUtilMetal     , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   1.0F, NBT_RESISTANCE,  25.0F, NBT_TANK_CAPACITY,     1024000L, NBT_PLASMAPROOF, T, NBT_GASPROOF, T, NBT_ACIDPROOF, T                             ), " h ", "PSP", "PSP", 'P', OP.plateCurved.dat(aMat), 'S', OP.stickLong.dat(aMat));
2105
-		aMat = MT.Ad;               aRegistry.add("Adamantium Drum"                                     , "Fluid Containers"                    , 32719, 32719, MultiTileEntityBarrelMetal.class                        ,                 0, 16, aUtilMetal     , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   1.0F, NBT_RESISTANCE, 100.0F, NBT_TANK_CAPACITY,     4096000L, NBT_PLASMAPROOF, T, NBT_GASPROOF, T, NBT_ACIDPROOF, T                             ), " h ", "PSP", "PSP", 'P', OP.plateCurved.dat(aMat), 'S', OP.stickLong.dat(aMat));
2106
-		aMat = MT.Draconium;        aRegistry.add("Draconium Drum"                                      , "Fluid Containers"                    , 32021, 32719, MultiTileEntityBarrelMetal.class                        ,                 0, 16, aUtilMetal     , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   1.0F, NBT_RESISTANCE, 100.0F, NBT_TANK_CAPACITY,     4096000L, NBT_PLASMAPROOF, T, NBT_GASPROOF, T, NBT_ACIDPROOF, T                             ), " h ", "PSP", "PSP", 'P', OP.plateCurved.dat(aMat), 'S', OP.stickLong.dat(aMat));
2107
-		aMat = MT.DraconiumAwakened;aRegistry.add("Awakened Draconium Drum"                             , "Fluid Containers"                    , 32066, 32719, MultiTileEntityBarrelMetal.class                        ,                 0, 16, aUtilMetal     , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   1.0F, NBT_RESISTANCE, 100.0F, NBT_TANK_CAPACITY,     8192000L, NBT_PLASMAPROOF, T, NBT_GASPROOF, T, NBT_ACIDPROOF, T, NBT_CAPACITY_HU,      10000), " h ", "PSP", "PSP", 'P', OP.plateCurved.dat(aMat), 'S', OP.stickLong.dat(aMat));
2108
-		aMat = MT.Infinity;         aRegistry.add("Infinity Drum"                                       , "Fluid Containers"                    , 32067, 32719, MultiTileEntityBarrelMetal.class                        ,                 0, 16, aUtilMetal     , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   1.0F, NBT_RESISTANCE, 100.0F, NBT_TANK_CAPACITY, 10000000000L, NBT_PLASMAPROOF, T, NBT_GASPROOF, T, NBT_ACIDPROOF, T, NBT_CAPACITY_HU, 1000000000), " h ", "PSP", "PSP", 'P', OP.plateCurved.dat(aMat), 'S', OP.stickLong.dat(aMat));
2109
-		aMat = ANY.W;               aRegistry.add("Logistics Tank"                                      , "Logistics"                           , 32072, 17997, MultiTileEntityBarrelLogistics.class                    ,                 0, 16, aUtilMetal     , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   1.0F, NBT_RESISTANCE,  10.0F, NBT_TANK_CAPACITY,     1000000L, NBT_PLASMAPROOF, T, NBT_GASPROOF, T, NBT_ACIDPROOF, T, NBT_CAPACITY_HU,     100000), "TQT", "wFd", "TMT", 'M', aRegistry.getItem(32718), 'T', OP.screw.dat(aMat), 'Q', IL.Cover_Logistics_Generic_Storage, 'F', IL.FIELD_GENERATORS[0]);
2076
+		aMat = ANY.Wood;            aRegistry.add("Wooden Barrel (Cheap)"                               , "Fluid Containers"                    , 32733, 32719, MultiTileEntityBarrelWood.class                         ,                 0, 16, aUtilWood      , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   1.0F, NBT_RESISTANCE,   5.0F, NBT_TANK_CAPACITY,        8000L, NBT_PLASMAPROOF, F, NBT_GASPROOF, F, NBT_ACIDPROOF, F, NBT_CAPACITY_HU,        340, NBT_FLAMMABILITY,       100), "rGs", "PSP", "PSP", 'G', OD.itemGlue, 'P', OD.plankAnyWood, 'S', OP.stickLong.dat(MT.Pb));
2077
+		aMat = ANY.Wood;            aRegistry.add("Wooden Barrel (Cheap)"                               , "Fluid Containers"                    , 32752, 32719, MultiTileEntityBarrelWood.class                         ,                 0, 16, aUtilWood      , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   1.0F, NBT_RESISTANCE,   5.0F, NBT_TANK_CAPACITY,        8000L, NBT_PLASMAPROOF, F, NBT_GASPROOF, F, NBT_ACIDPROOF, F, NBT_CAPACITY_HU,        340, NBT_FLAMMABILITY,       100), "rGs", "PSP", "PSP", 'G', OD.itemGlue, 'P', OD.plankAnyWood, 'S', OP.stickLong.dat(MT.Bi));
2078
+		aMat = ANY.Wood;            aRegistry.add("Wooden Barrel (Cheap)"                               , "Fluid Containers"                    , 32753, 32719, MultiTileEntityBarrelWood.class                         ,                 0, 16, aUtilWood      , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   1.0F, NBT_RESISTANCE,   5.0F, NBT_TANK_CAPACITY,        8000L, NBT_PLASMAPROOF, F, NBT_GASPROOF, F, NBT_ACIDPROOF, F, NBT_CAPACITY_HU,        340, NBT_FLAMMABILITY,       100), "rGs", "PSP", "PSP", 'G', OD.itemGlue, 'P', OD.plankAnyWood, 'S', OP.stickLong.dat(MT.Bronze));
2079
+		aMat = ANY.Wood;            aRegistry.add("Wooden Barrel (Cheap)"                               , "Fluid Containers"                    , 32754, 32719, MultiTileEntityBarrelWood.class                         ,                 0, 16, aUtilWood      , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   1.0F, NBT_RESISTANCE,   5.0F, NBT_TANK_CAPACITY,        8000L, NBT_PLASMAPROOF, F, NBT_GASPROOF, F, NBT_ACIDPROOF, F, NBT_CAPACITY_HU,        340, NBT_FLAMMABILITY,       100), "rGs", "PSP", "PSP", 'G', OD.itemGlue, 'P', OD.plankAnyWood, 'S', OP.stickLong.dat(MT.Brass));
2080
+		aMat = MT.WoodSealed;       aRegistry.add("Wooden Barrel"                                       , "Fluid Containers"                    , 32714, 32719, MultiTileEntityBarrelWood.class                         ,                 0, 16, aUtilWood      , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   1.0F, NBT_RESISTANCE,   5.0F, NBT_TANK_CAPACITY,       16000L, NBT_PLASMAPROOF, F, NBT_GASPROOF, F, NBT_ACIDPROOF, F, NBT_CAPACITY_HU,        340, NBT_FLAMMABILITY,       100), "rGs", "PSP", "PSP", 'G', OD.itemGlue, 'P', OP.plate.dat(aMat), 'S', OP.stickLong.dat(ANY.Iron));
2081
+		aMat = MT.Skyroot;          aRegistry.add("Skyroot Barrel"                                      , "Fluid Containers"                    , 32019, 32719, MultiTileEntityBarrelWood.class                         ,                 0, 16, aUtilWood      , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   1.0F, NBT_RESISTANCE,   5.0F, NBT_TANK_CAPACITY,       16000L, NBT_PLASMAPROOF, F, NBT_GASPROOF, F, NBT_ACIDPROOF, F, NBT_CAPACITY_HU,        340, NBT_FLAMMABILITY,       100), "rGs", "PSP", "PSP", 'G', OD.itemGlue, 'P', OD.plankSkyroot, 'S', OP.stickLong.dat(ANY.Iron));
2082
+		aMat = MT.Weedwood;         aRegistry.add("Weedwood Barrel"                                     , "Fluid Containers"                    , 32008, 32719, MultiTileEntityBarrelWood.class                         ,                 0, 16, aUtilWood      , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   1.0F, NBT_RESISTANCE,   5.0F, NBT_TANK_CAPACITY,        8000L, NBT_PLASMAPROOF, F, NBT_GASPROOF, F, NBT_ACIDPROOF, F, NBT_CAPACITY_HU,        340                             ), "rGs", "PSP", "PSP", 'G', OD.itemGlue, 'P', OD.plankWeedwood, 'S', OP.stickLong.dat(MT.Syrmorite));
2083
+		aMat = MT.Livingwood;       aRegistry.add("Livingwood Barrel"                                   , "Fluid Containers"                    , 32010, 32719, MultiTileEntityBarrelWood.class                         ,                 0, 16, aUtilWood      , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   1.0F, NBT_RESISTANCE,   5.0F, NBT_TANK_CAPACITY,       16000L, NBT_PLASMAPROOF, F, NBT_GASPROOF, F, NBT_ACIDPROOF, F, NBT_CAPACITY_HU,        340, NBT_FLAMMABILITY,       100), "rGs", "PSP", "PSP", 'G', OD.itemGlue, 'P', OP.plate.dat(aMat), 'S', OP.stickLong.dat(ANY.Iron));
2084
+		aMat = MT.Dreamwood;        aRegistry.add("Dreamwood Barrel"                                    , "Fluid Containers"                    , 32009, 32719, MultiTileEntityBarrelWood.class                         ,                 0, 16, aUtilWood      , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   1.0F, NBT_RESISTANCE,   5.0F, NBT_TANK_CAPACITY,       64000L, NBT_PLASMAPROOF, F, NBT_GASPROOF, F, NBT_ACIDPROOF, F, NBT_CAPACITY_HU,        340                             ), "rGs", "PSP", "PSP", 'G', OD.itemGlue, 'P', OP.plate.dat(aMat), 'S', OP.stickLong.dat(MT.Manasteel));
2085
+		aMat = MT.Shimmerwood;      aRegistry.add("Shimmerwood Barrel"                                  , "Fluid Containers"                    , 32016, 32719, MultiTileEntityBarrelWood.class                         ,                 0, 16, aUtilWood      , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   1.0F, NBT_RESISTANCE,   5.0F, NBT_TANK_CAPACITY,       64000L, NBT_PLASMAPROOF, F, NBT_GASPROOF, F, NBT_ACIDPROOF, F, NBT_CAPACITY_HU,        340                             ), "rGs", "PSP", "PSP", 'G', OD.itemGlue, 'P', OP.plate.dat(aMat), 'S', OP.stickLong.dat(MT.Manasteel));
2086
+		aMat = MT.IronWood;         aRegistry.add("Ironwood Barrel"                                     , "Fluid Containers"                    , 32734, 32719, MultiTileEntityBarrelWood.class                         ,                 0, 16, aUtilWood      , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   1.0F, NBT_RESISTANCE,   5.0F, NBT_TANK_CAPACITY,       32000L, NBT_PLASMAPROOF, F, NBT_GASPROOF, F, NBT_ACIDPROOF, F                                                          ), "rGs", "PSP", "PSP", 'G', OD.itemGlue, 'P', OP.plate.dat(aMat), 'S', OP.stickLong.dat(ANY.Iron));
2087
+		aMat = MT.Greatwood;        aRegistry.add("Greatwood Barrel"                                    , "Fluid Containers"                    , 32017, 32719, MultiTileEntityBarrelWood.class                         ,                 0, 16, aUtilWood      , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   1.0F, NBT_RESISTANCE,   5.0F, NBT_TANK_CAPACITY,       16000L, NBT_PLASMAPROOF, F, NBT_GASPROOF, F, NBT_ACIDPROOF, F, NBT_CAPACITY_HU,        390, NBT_FLAMMABILITY,       100), "rGs", "PSP", "PSP", 'G', OD.itemGlue, 'P', OP.plate.dat(aMat), 'S', OP.stickLong.dat(ANY.Iron));
2088
+		aMat = MT.Silverwood;       aRegistry.add("Silverwood Barrel"                                   , "Fluid Containers"                    , 32018, 32719, MultiTileEntityBarrelWood.class                         ,                 0, 16, aUtilWood      , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   1.0F, NBT_RESISTANCE,   5.0F, NBT_TANK_CAPACITY,       64000L, NBT_PLASMAPROOF, F, NBT_GASPROOF, F, NBT_ACIDPROOF, F, NBT_CAPACITY_HU,        440                             ), "rGs", "PSP", "PSP", 'G', OD.itemGlue, 'P', OP.plate.dat(aMat), 'S', OP.stickLong.dat(MT.Thaumium));
2089
+		aMat = MT.Plastic;          aRegistry.add("Plastic Can"                                         , "Fluid Containers"                    , 32715, 32719, MultiTileEntityBarrelPlastic.class                      ,                 0, 16, aUtilWood      , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   1.0F, NBT_RESISTANCE,   3.0F, NBT_TANK_CAPACITY,       32000L, NBT_PLASMAPROOF, F, NBT_GASPROOF, T, NBT_ACIDPROOF, F, NBT_CAPACITY_HU,        370                             )); IL.PlasticCan.set(aRegistry.getItem(), new OreDictItemData(MT.Plastic, U*6));
2090
+		aMat = MT.StainlessSteel;   aRegistry.add("Drum"                                                , "Fluid Containers"                    , 32716, 32719, MultiTileEntityBarrelMetal.class                        ,                 0, 16, aUtilMetal     , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   1.0F, NBT_RESISTANCE,   6.0F, NBT_TANK_CAPACITY,       64000L, NBT_PLASMAPROOF, F, NBT_GASPROOF, T, NBT_ACIDPROOF, T                                                          ), " h ", "PSP", "PSP", 'P', OP.plateCurved.dat(aMat), 'S', OP.stickLong.dat(aMat));
2091
+		aMat = MT.Invar;            aRegistry.add("Invar Drum"                                          , "Fluid Containers"                    , 32064, 32719, MultiTileEntityBarrelMetal.class                        ,                 0, 16, aUtilMetal     , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   1.0F, NBT_RESISTANCE,   6.0F, NBT_TANK_CAPACITY,       64000L, NBT_PLASMAPROOF, F, NBT_GASPROOF, T, NBT_ACIDPROOF, F                                                          ), " h ", "PSP", "PSP", 'P', OP.plateCurved.dat(aMat), 'S', OP.stickLong.dat(aMat));
2092
+		aMat = MT.Desh;             aRegistry.add("Desh Drum"                                           , "Fluid Containers"                    , 32070, 32719, MultiTileEntityBarrelMetal.class                        ,                 0, 16, aUtilMetal     , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   1.0F, NBT_RESISTANCE,   6.0F, NBT_TANK_CAPACITY,       64000L, NBT_PLASMAPROOF, F, NBT_GASPROOF, T, NBT_ACIDPROOF, F                                                          ), " h ", "PSP", "PSP", 'P', OP.plateCurved.dat(aMat), 'S', OP.stickLong.dat(aMat));
2093
+		aMat = MT.Syrmorite;        aRegistry.add("Syrmorite Drum"                                      , "Fluid Containers"                    , 32020, 32719, MultiTileEntityBarrelMetal.class                        ,                 0, 16, aUtilMetal     , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   1.0F, NBT_RESISTANCE,   6.0F, NBT_TANK_CAPACITY,       64000L, NBT_PLASMAPROOF, F, NBT_GASPROOF, T, NBT_ACIDPROOF, T                                                          ), " h ", "PSP", "PSP", 'P', OP.plateCurved.dat(aMat), 'S', OP.stickLong.dat(aMat));
2094
+		aMat = MT.Efrine;           aRegistry.add("Efrine Drum"                                         , "Fluid Containers"                    , 32093, 32719, MultiTileEntityBarrelMetal.class                        ,                 0, 16, aUtilMetal     , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   1.0F, NBT_RESISTANCE,   6.0F, NBT_TANK_CAPACITY,       64000L, NBT_PLASMAPROOF, T, NBT_GASPROOF, T, NBT_ACIDPROOF, F                                                          ), " h ", "PSP", "PSP", 'P', OP.plateCurved.dat(aMat), 'S', OP.stickLong.dat(aMat));
2095
+		aMat = MT.Thaumium;         aRegistry.add("Thaumium Drum"                                       , "Fluid Containers"                    , 32022, 32719, MultiTileEntityBarrelMetal.class                        ,                 0, 16, aUtilMetal     , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   1.0F, NBT_RESISTANCE,   6.0F, NBT_TANK_CAPACITY,       64000L, NBT_PLASMAPROOF, F, NBT_GASPROOF, T, NBT_ACIDPROOF, T                                                          ), " h ", "PSP", "PSP", 'P', OP.plateCurved.dat(aMat), 'S', OP.stickLong.dat(aMat));
2096
+		aMat = MT.Manasteel;        aRegistry.add("Manasteel Drum"                                      , "Fluid Containers"                    , 32023, 32719, MultiTileEntityBarrelMetal.class                        ,                 0, 16, aUtilMetal     , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   1.0F, NBT_RESISTANCE,   6.0F, NBT_TANK_CAPACITY,       64000L, NBT_PLASMAPROOF, F, NBT_GASPROOF, T, NBT_ACIDPROOF, T                                                          ), " h ", "PSP", "PSP", 'P', OP.plateCurved.dat(aMat), 'S', OP.stickLong.dat(aMat));
2097
+		aMat = MT.TungstenAlloy;    aRegistry.add("Tungsten Alloy Drum"                                 , "Fluid Containers"                    , 32090, 32719, MultiTileEntityBarrelMetal.class                        ,                 0, 16, aUtilMetal     , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   1.0F, NBT_RESISTANCE,   9.0F, NBT_TANK_CAPACITY,      128000L, NBT_PLASMAPROOF, F, NBT_GASPROOF, T, NBT_ACIDPROOF, F                                                          ), " h ", "PSP", "PSP", 'P', OP.plateCurved.dat(aMat), 'S', OP.stickLong.dat(aMat));
2098
+		aMat = MT.Ti;               aRegistry.add("Titanium Drum"                                       , "Fluid Containers"                    , 32742, 32719, MultiTileEntityBarrelMetal.class                        ,                 0, 16, aUtilMetal     , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   1.0F, NBT_RESISTANCE,   9.0F, NBT_TANK_CAPACITY,      128000L, NBT_PLASMAPROOF, F, NBT_GASPROOF, T, NBT_ACIDPROOF, F                                                          ), " h ", "PSP", "PSP", 'P', OP.plateCurved.dat(aMat), 'S', OP.stickLong.dat(aMat));
2099
+		aMat = MT.Netherite;        aRegistry.add("Netherite Drum"                                      , "Fluid Containers"                    , 32087, 32719, MultiTileEntityBarrelMetal.class                        ,                 0, 16, aUtilMetal     , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   1.0F, NBT_RESISTANCE,   9.0F, NBT_TANK_CAPACITY,      128000L, NBT_PLASMAPROOF, T, NBT_GASPROOF, T, NBT_ACIDPROOF, T                                                          ), " h ", "PSP", "PSP", 'P', OP.plateCurved.dat(aMat), 'S', OP.stickLong.dat(aMat));
2100
+		aMat = MT.TungstenSteel;    aRegistry.add("Tungstensteel Drum"                                  , "Fluid Containers"                    , 32717, 32719, MultiTileEntityBarrelMetal.class                        ,                 0, 16, aUtilMetal     , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   1.0F, NBT_RESISTANCE,  12.5F, NBT_TANK_CAPACITY,      256000L, NBT_PLASMAPROOF, F, NBT_GASPROOF, T, NBT_ACIDPROOF, F                                                          ), " h ", "PSP", "PSP", 'P', OP.plateCurved.dat(aMat), 'S', OP.stickLong.dat(aMat));
2101
+		aMat = ANY.W;               aRegistry.add("Tungsten Drum"                                       , "Fluid Containers"                    , 32718, 32719, MultiTileEntityBarrelMetal.class                        ,                 0, 16, aUtilMetal     , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   1.0F, NBT_RESISTANCE,  10.0F, NBT_TANK_CAPACITY,      256000L, NBT_PLASMAPROOF, F, NBT_GASPROOF, T, NBT_ACIDPROOF, T                                                          ), " h ", "PSP", "PSP", 'P', OP.plateCurved.dat(aMat), 'S', OP.stickLong.dat(aMat));
2102
+		aMat = MT.Ta4HfC5;          aRegistry.add("Tantalum Hafnium Carbide Drum"                       , "Fluid Containers"                    , 32083, 32719, MultiTileEntityBarrelMetal.class                        ,                 0, 16, aUtilMetal     , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   1.0F, NBT_RESISTANCE,  10.0F, NBT_TANK_CAPACITY,      512000L, NBT_PLASMAPROOF, F, NBT_GASPROOF, T, NBT_ACIDPROOF, F                                                          ), " h ", "PSP", "PSP", 'P', OP.plateCurved.dat(aMat), 'S', OP.stickLong.dat(aMat));
2103
+		aMat = MT.VoidMetal;        aRegistry.add("Voidmetal Drum"                                      , "Fluid Containers"                    , 32063, 32719, MultiTileEntityBarrelMetal.class                        ,                 0, 16, aUtilMetal     , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   1.0F, NBT_RESISTANCE,  10.0F, NBT_TANK_CAPACITY,      256000L, NBT_PLASMAPROOF, T, NBT_GASPROOF, T, NBT_ACIDPROOF, T                                                          ), " h ", "PSP", "PSP", 'P', OP.plateCurved.dat(aMat), 'S', OP.stickLong.dat(aMat));
2104
+		aMat = MT.GaiaSpirit;       aRegistry.add("Gaia Drum"                                           , "Fluid Containers"                    , 32024, 32719, MultiTileEntityBarrelMetal.class                        ,                 0, 16, aUtilMetal     , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   1.0F, NBT_RESISTANCE,  25.0F, NBT_TANK_CAPACITY,     1024000L, NBT_PLASMAPROOF, T, NBT_GASPROOF, T, NBT_ACIDPROOF, T                                                          ), " h ", "PSP", "PSP", 'P', OP.plateCurved.dat(aMat), 'S', OP.stickLong.dat(aMat));
2105
+		aMat = MT.Ad;               aRegistry.add("Adamantium Drum"                                     , "Fluid Containers"                    , 32719, 32719, MultiTileEntityBarrelMetal.class                        ,                 0, 16, aUtilMetal     , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   1.0F, NBT_RESISTANCE, 100.0F, NBT_TANK_CAPACITY,     4096000L, NBT_PLASMAPROOF, T, NBT_GASPROOF, T, NBT_ACIDPROOF, T                                                          ), " h ", "PSP", "PSP", 'P', OP.plateCurved.dat(aMat), 'S', OP.stickLong.dat(aMat));
2106
+		aMat = MT.Draconium;        aRegistry.add("Draconium Drum"                                      , "Fluid Containers"                    , 32021, 32719, MultiTileEntityBarrelMetal.class                        ,                 0, 16, aUtilMetal     , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   1.0F, NBT_RESISTANCE, 100.0F, NBT_TANK_CAPACITY,     4096000L, NBT_PLASMAPROOF, T, NBT_GASPROOF, T, NBT_ACIDPROOF, T                                                          ), " h ", "PSP", "PSP", 'P', OP.plateCurved.dat(aMat), 'S', OP.stickLong.dat(aMat));
2107
+		aMat = MT.DraconiumAwakened;aRegistry.add("Awakened Draconium Drum"                             , "Fluid Containers"                    , 32066, 32719, MultiTileEntityBarrelMetal.class                        ,                 0, 16, aUtilMetal     , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   1.0F, NBT_RESISTANCE, 100.0F, NBT_TANK_CAPACITY,     8192000L, NBT_PLASMAPROOF, T, NBT_GASPROOF, T, NBT_ACIDPROOF, T, NBT_CAPACITY_HU,      10000                             ), " h ", "PSP", "PSP", 'P', OP.plateCurved.dat(aMat), 'S', OP.stickLong.dat(aMat));
2108
+		aMat = MT.Infinity;         aRegistry.add("Infinity Drum"                                       , "Fluid Containers"                    , 32067, 32719, MultiTileEntityBarrelMetal.class                        ,                 0, 16, aUtilMetal     , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   1.0F, NBT_RESISTANCE, 100.0F, NBT_TANK_CAPACITY, 10000000000L, NBT_PLASMAPROOF, T, NBT_GASPROOF, T, NBT_ACIDPROOF, T, NBT_CAPACITY_HU, 1000000000                             ), " h ", "PSP", "PSP", 'P', OP.plateCurved.dat(aMat), 'S', OP.stickLong.dat(aMat));
2109
+		aMat = ANY.W;               aRegistry.add("Logistics Tank"                                      , "Logistics"                           , 32072, 17997, MultiTileEntityBarrelLogistics.class                    ,                 0, 16, aUtilMetal     , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   1.0F, NBT_RESISTANCE,  10.0F, NBT_TANK_CAPACITY,     1000000L, NBT_PLASMAPROOF, T, NBT_GASPROOF, T, NBT_ACIDPROOF, T, NBT_CAPACITY_HU,     100000                             ), "TQT", "wFd", "TMT", 'M', aRegistry.getItem(32718), 'T', OP.screw.dat(aMat), 'Q', IL.Cover_Logistics_Generic_Storage, 'F', IL.FIELD_GENERATORS[0]);
2110 2110
 		
2111 2111
 		aMat = ANY.Wood;            aRegistry.add("Wooden Bathing Pot"                                  , "Misc Tool Blocks"                    , 32721, 32720, MultiTileEntityBathingPotWood.class                     ,                 0, 16, aUtilWood      , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   1.0F, NBT_RESISTANCE,   5.0F, NBT_RECIPEMAP, RM.Bath   , NBT_TANK_CAPACITY,           4000, NBT_FLAMMABILITY, 100), "sGh", "PLP", "PPP", 'P', OD.plankAnyWood, 'L', OP.stickLong.dat(MT.Pb), 'G', OD.itemGlue);
2112 2112
 		aMat = ANY.Wood;            aRegistry.add("Wooden Bathing Pot Table"                            , "Misc Tool Blocks"                    , 32720, 32720, MultiTileEntityBathingPotTableWood.class                ,                 0, 16, aUtilWood      , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   1.0F, NBT_RESISTANCE,   5.0F, NBT_RECIPEMAP, RM.Bath   , NBT_TANK_CAPACITY,           4000, NBT_FLAMMABILITY, 100), "M", "S", 'M', aRegistry.getItem(), 'S', ST.make(Blocks.stone_slab, 1, 4));

Loading…
Cancel
Save