Skip to content

Commit 9a86694

Browse files
committed
Removed fluids containers
1 parent 5e27c09 commit 9a86694

2 files changed

Lines changed: 29 additions & 42 deletions

File tree

.gitignore

Lines changed: 25 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,32 @@
1-
/.git
2-
/.gradle
3-
/.settings
4-
/asm
5-
/bin
6-
/blueprints
7-
/build
8-
/config
9-
/crash-reports
10-
/dumps
11-
/eclipse
12-
/externalLibs
13-
/logs
14-
/mods
15-
/mod-config
16-
/resourcepacks
17-
/saves
18-
/screenshots
19-
/scripts
20-
/.classpath
21-
/.project
22-
/copy
23-
/git
24-
/world
1+
.gradle
2+
.settings
3+
/.idea/
4+
/.vscode/
5+
/run/
6+
/build/
7+
/eclipse/
8+
.classpath
9+
.project
10+
/bin/
11+
/config/
12+
/crash-reports/
13+
/logs/
2514
options.txt
26-
eula.txt
27-
server.properties
28-
usercache.json
15+
/saves/
2916
usernamecache.json
30-
whitelist.json
31-
ops.json
3217
banned-ips.json
3318
banned-players.json
19+
eula.txt
20+
ops.json
21+
server.properties
3422
servers.dat
35-
config.cfg
36-
GregTech.cfg
37-
GregTech.lang
38-
minetweaker.log
39-
BotaniaVars.dat
40-
tailslibrary.json
41-
.DS_Store
42-
*.log
43-
hs_err*
44-
*iml
23+
usercache.json
24+
whitelist.json
25+
/out/
26+
*.iml
4527
*.ipr
4628
*.iws
47-
/.idea
48-
/out
49-
*.dll
29+
src/main/resources/mixins.*.json
30+
*.bat
31+
*.DS_Store
32+
!gradlew.bat

src/main/java/blusunrize/immersiveengineering/common/IEContent.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -271,6 +271,7 @@ public static void preInit()
271271
itemToolbox = new ItemToolbox();
272272
itemRevolver = new ItemRevolver();
273273
itemBullet = new ItemBullet();
274+
/*
274275
itemFluidContainers = new ItemIEBase("fluidContainers", 64, "bottleCreosote","bucketCreosote", "bottlePlantoil","bucketPlantoil", "bottleEthanol","bucketEthanol", "bottleBiodiesel","bucketBiodiesel")
275276
{
276277
@Override
@@ -294,6 +295,7 @@ public int getItemStackLimit(ItemStack stack)
294295
return stack.getItemDamage()%2==0?16:1;
295296
}
296297
};
298+
*/
297299
itemDrill = new ItemDrill();
298300
itemDrillhead = new ItemDrillhead();
299301
itemToolUpgrades = new ItemToolUpgrade();
@@ -373,6 +375,7 @@ public void getSubItems(Item item, CreativeTabs tab, List list)
373375
OreDictionary.registerOre("craftingTableWood", new ItemStack(Blocks.crafting_table));
374376
OreDictionary.registerOre("rodBlaze", new ItemStack(Items.blaze_rod));
375377
OreDictionary.registerOre("charcoal", new ItemStack(Items.coal,1,1));
378+
/*
376379
//Fluid Containers
377380
FluidContainerRegistry.registerFluidContainer(fluidCreosote, new ItemStack(itemFluidContainers,1,0), new ItemStack(Items.glass_bottle));
378381
FluidContainerRegistry.registerFluidContainer(fluidCreosote, new ItemStack(itemFluidContainers,1,1), new ItemStack(Items.bucket));
@@ -382,6 +385,7 @@ public void getSubItems(Item item, CreativeTabs tab, List list)
382385
FluidContainerRegistry.registerFluidContainer(fluidEthanol, new ItemStack(itemFluidContainers,1,5), new ItemStack(Items.bucket));
383386
FluidContainerRegistry.registerFluidContainer(fluidBiodiesel, new ItemStack(itemFluidContainers,1,6), new ItemStack(Items.glass_bottle));
384387
FluidContainerRegistry.registerFluidContainer(fluidBiodiesel, new ItemStack(itemFluidContainers,1,7), new ItemStack(Items.bucket));
388+
*/
385389
//Mining
386390
blockOres.setHarvestLevel("pickaxe", 1, 0);//Copper
387391
blockOres.setHarvestLevel("pickaxe", 1, 1);//Bauxite

0 commit comments

Comments
 (0)