Skip to content

Commit 4665cb1

Browse files
GregoriusTGregoriusT
committed
that endergarbagebin thingy that was recently suggested on IRC
1 parent bdfeb64 commit 4665cb1

10 files changed

Lines changed: 37 additions & 30 deletions

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ Nothing (I tend to only add finished Stuff to the Changelog).
1212
[CHANGED] Mobs can no longer drop Wooden or Stone Tools of Vanilla Minecraft and instead will drop Sticks in those cases. This should very much declutter some Mob Farms.
1313
[CHANGED] Oil Shale in Coke Oven now gives you 10x the Oil, making it actually worthwhile to use at all.
1414
[CHANGED] The 3 Types of Golden Juices now make roughly ten times less Biomass than before, they now either produce 65x (64x plus base value), 9x (8x plus base value) or 2x (1x plus base value) the output of Juice based Biomass.
15+
[CHANGED] Can now rightclick a Tap or Nozzle with an Ender Garbage Bin or similar other Mod Voiding Items, to drain one attached Fluid Tank entirely.
1516
[ADDED] Steel Rope, which is just another type of Rope.
1617
[ADDED] Ultimet Boilers corresponding to the TaHFC Burning Boxes.
1718
[ADDED] Yellow and Brown Grass now indicate Lava, Gas and Oil Springs. Greener Grass indicates Water Springs.

‎src/main/java/gregapi/data/CS.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1612,6 +1612,7 @@ public static class ItemsGT {
16121612
public static final ItemStackSet<ItemStackContainer> CONTAINER_DURABILITY = ST.hashset();
16131613
public static final ItemStackSet<ItemStackContainer> SPECIAL_CASE_TOOLS = ST.hashset();
16141614
public static final ItemStackSet<ItemStackContainer> SHOW_RESISTANCE = ST.hashset();
1615+
public static final ItemStackSet<ItemStackContainer> VOIDING_ITEMS = ST.hashset();
16151616
public static final ItemStackSet<ItemStackContainer> RECIPE_REMOVED_USE_TRASH_BIN_INSTEAD = ST.hashset();
16161617
public static final ItemStackSet<ItemStackContainer> NEI_DONT_SHOW_FLUIDS = ST.hashset();
16171618

‎src/main/java/gregtech/compat/Compat_Recipes_BuildCraft.java‎

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright (c) 2021 GregTech-6 Team
2+
* Copyright (c) 2025 GregTech-6 Team
33
*
44
* This file is part of GregTech.
55
*
@@ -19,24 +19,12 @@
1919

2020
package gregtech.compat;
2121

22-
import static gregapi.data.CS.*;
23-
import static gregapi.util.CR.*;
24-
2522
import cpw.mods.fml.common.event.FMLPostInitializationEvent;
2623
import gregapi.api.Abstract_Mod;
2724
import gregapi.code.ModData;
2825
import gregapi.compat.CompatMods;
2926
import gregapi.config.ConfigCategories;
30-
import gregapi.data.ANY;
31-
import gregapi.data.CS.ConfigsGT;
32-
import gregapi.data.CS.ItemsGT;
33-
import gregapi.data.FL;
34-
import gregapi.data.IL;
35-
import gregapi.data.MD;
36-
import gregapi.data.MT;
37-
import gregapi.data.OD;
38-
import gregapi.data.OP;
39-
import gregapi.data.RM;
27+
import gregapi.data.*;
4028
import gregapi.oredict.OreDictMaterial;
4129
import gregapi.util.CR;
4230
import gregapi.util.OM;
@@ -46,6 +34,9 @@
4634
import net.minecraft.item.ItemStack;
4735
import net.minecraftforge.fluids.FluidStack;
4836

37+
import static gregapi.data.CS.*;
38+
import static gregapi.util.CR.*;
39+
4940
public class Compat_Recipes_BuildCraft extends CompatMods {
5041
public Compat_Recipes_BuildCraft(ModData aMod, Abstract_Mod aGTMod) {super(aMod, aGTMod);}
5142

@@ -88,12 +79,14 @@ public class Compat_Recipes_BuildCraft extends CompatMods {
8879
}
8980

9081
if (MD.BC_TRANSPORT.mLoaded) {
82+
ItemsGT.VOIDING_ITEMS.add(MD.BC_TRANSPORT, "item.buildcraftPipe.pipeitemsvoid", 0);
9183
if (ConfigsGT.RECIPES.get(ConfigCategories.Recipes.disabledrecipes, "buildcraft-void-pipe-items", T)) {
92-
ItemsGT.RECIPE_REMOVED_USE_TRASH_BIN_INSTEAD.add(ST.make(MD.BC_TRANSPORT, "item.buildcraftPipe.pipeitemsvoid", 1, 0));
84+
ItemsGT.RECIPE_REMOVED_USE_TRASH_BIN_INSTEAD.add(MD.BC_TRANSPORT, "item.buildcraftPipe.pipeitemsvoid", 0);
9385
CR.delate(MD.BC_TRANSPORT, "item.buildcraftPipe.pipeitemsvoid", 0);
9486
}
87+
ItemsGT.VOIDING_ITEMS.add(MD.BC_TRANSPORT, "item.buildcraftPipe.pipefluidsvoid", 0);
9588
if (ConfigsGT.RECIPES.get(ConfigCategories.Recipes.disabledrecipes, "buildcraft-void-pipe-fluids", T)) {
96-
ItemsGT.RECIPE_REMOVED_USE_TRASH_BIN_INSTEAD.add(ST.make(MD.BC_TRANSPORT, "item.buildcraftPipe.pipefluidsvoid", 1, 0));
89+
ItemsGT.RECIPE_REMOVED_USE_TRASH_BIN_INSTEAD.add(MD.BC_TRANSPORT, "item.buildcraftPipe.pipefluidsvoid", 0);
9790
CR.delate(MD.BC_TRANSPORT, "item.buildcraftPipe.pipefluidsvoid", 0);
9891
}
9992

‎src/main/java/gregtech/compat/Compat_Recipes_ExtraUtilities.java‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright (c) 2019 Gregorius Techneticies
2+
* Copyright (c) 2025 GregTech-6 Team
33
*
44
* This file is part of GregTech.
55
*
@@ -19,15 +19,11 @@
1919

2020
package gregtech.compat;
2121

22-
import static gregapi.data.CS.*;
23-
2422
import cpw.mods.fml.common.event.FMLPostInitializationEvent;
2523
import gregapi.api.Abstract_Mod;
2624
import gregapi.code.ModData;
2725
import gregapi.compat.CompatMods;
2826
import gregapi.config.ConfigCategories;
29-
import gregapi.data.CS.ConfigsGT;
30-
import gregapi.data.CS.ItemsGT;
3127
import gregapi.data.MD;
3228
import gregapi.data.RM;
3329
import gregapi.oredict.event.IOreDictListenerEvent;
@@ -36,20 +32,25 @@
3632
import gregapi.util.ST;
3733
import net.minecraft.init.Blocks;
3834

35+
import static gregapi.data.CS.*;
36+
3937
public class Compat_Recipes_ExtraUtilities extends CompatMods {
4038
public Compat_Recipes_ExtraUtilities(ModData aMod, Abstract_Mod aGTMod) {super(aMod, aGTMod);}
4139

4240
@Override public void onPostLoad(FMLPostInitializationEvent aInitEvent) {OUT.println("GT_Mod: Doing Extra Utilities Recipes.");
41+
ItemsGT.VOIDING_ITEMS.add(MD.ExU, "trashcan", 0);
4342
if (ConfigsGT.RECIPES.get(ConfigCategories.Recipes.disabledrecipes, "extra-utilities-trash-can-items", T)) {
44-
ItemsGT.RECIPE_REMOVED_USE_TRASH_BIN_INSTEAD.add(ST.make(MD.ExU, "trashcan", 1, 0));
43+
ItemsGT.RECIPE_REMOVED_USE_TRASH_BIN_INSTEAD.add(MD.ExU, "trashcan", 0);
4544
CR.delate(MD.ExU, "trashcan", 0);
4645
}
46+
ItemsGT.VOIDING_ITEMS.add(MD.ExU, "trashcan", 1);
4747
if (ConfigsGT.RECIPES.get(ConfigCategories.Recipes.disabledrecipes, "extra-utilities-trash-can-fluids", T)) {
48-
ItemsGT.RECIPE_REMOVED_USE_TRASH_BIN_INSTEAD.add(ST.make(MD.ExU, "trashcan", 1, 1));
48+
ItemsGT.RECIPE_REMOVED_USE_TRASH_BIN_INSTEAD.add(MD.ExU, "trashcan", 1);
4949
CR.delate(MD.ExU, "trashcan", 1);
5050
}
51+
ItemsGT.VOIDING_ITEMS.add(MD.ExU, "trashcan", 2);
5152
if (ConfigsGT.RECIPES.get(ConfigCategories.Recipes.disabledrecipes, "extra-utilities-trash-can-energy", F)) {
52-
ItemsGT.RECIPE_REMOVED_USE_TRASH_BIN_INSTEAD.add(ST.make(MD.ExU, "trashcan", 1, 2));
53+
ItemsGT.RECIPE_REMOVED_USE_TRASH_BIN_INSTEAD.add(MD.ExU, "trashcan", 2);
5354
CR.delate(MD.ExU, "trashcan", 2);
5455
}
5556

‎src/main/java/gregtech/compat/Compat_Recipes_Railcraft.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright (c) 2023 GregTech-6 Team
2+
* Copyright (c) 2025 GregTech-6 Team
33
*
44
* This file is part of GregTech.
55
*
@@ -90,8 +90,9 @@ public class Compat_Recipes_Railcraft extends CompatMods {
9090
CR.shaped(ST.make(MD.RC, "machine.beta" , 8, 14), tBits | DEL_IF_NO_DYES , "GPG" , "PGP" , "GPG" , 'P', OP.plate.dat(ANY.Steel) , 'G', OD.paneGlassColorless);
9191
CR.shaped(ST.make(MD.RC, "machine.beta" , 8, 15), tBits | DEL_IF_NO_DYES , "BPB" , "PLP" , "BPB" , 'P', OP.plate.dat(ANY.Steel) , 'B', Blocks.iron_bars, 'L', OD.lever);
9292

93+
ItemsGT.VOIDING_ITEMS.add(MD.RC, "machine.beta", 11);
9394
if (ConfigsGT.RECIPES.get(ConfigCategories.Recipes.disabledrecipes, "railcraft-void-chests", T)) {
94-
ItemsGT.RECIPE_REMOVED_USE_TRASH_BIN_INSTEAD.add(ST.make(MD.RC, "machine.beta", 1, 11));
95+
ItemsGT.RECIPE_REMOVED_USE_TRASH_BIN_INSTEAD.add(MD.RC, "machine.beta", 11);
9596
CR.delate(MD.RC, "machine.beta", 11);
9697
} else {
9798
CR.shaped(ST.make(MD.RC, "machine.beta", 1, 11), tBits, "OOO", "OEO", "OOO", 'E', OP.gem.dat(MT.EnderPearl), 'O', OP.blockSolid.dat(MT.Obsidian));

‎src/main/java/gregtech/loaders/a/Loader_Tools.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ public void run() {
123123
ToolsGT.add(ToolsGT.sMetaTool.addTool(ToolsGT.SAW , "Saw" , "Faster on Planks. Slower on Logs. Can harvest Ice." , new GT_Tool_Saw() .setMaterialAmount(toolHeadSaw .mAmount), OreDictToolNames.saw , TC.stack(TC.INSTRUMENTUM , 2), TC.stack(TC.METO , 2), TC.stack(TC.ARBOR , 2) ), TOOL_saw);
124124
ToolsGT.add(ToolsGT.sMetaTool.addTool(ToolsGT.HARDHAMMER , "Hammer" , "Crushes Ores instead of harvesting them" , new GT_Tool_HardHammer() .setMaterialAmount(toolHeadHammer .mAmount), OreDictToolNames.hammer , TC.stack(TC.INSTRUMENTUM , 2), TC.stack(TC.FABRICO , 2), TC.stack(TC.ORDO , 2) ), TOOL_hammer);
125125
ToolsGT.add(ToolsGT.sMetaTool.addTool(ToolsGT.SOFTHAMMER , "Soft Hammer" , "Can rotate vanilla-ish things and toggle Lamps/Rails", new GT_Tool_SoftHammer() .setMaterialAmount(toolHeadHammer .mAmount), OreDictToolNames.softhammer , TC.stack(TC.INSTRUMENTUM , 2), TC.stack(TC.LIMUS , 4) ), TOOL_softhammer);
126-
ToolsGT.add(ToolsGT.sMetaTool.addTool(ToolsGT.WRENCH , "Wrench" , "Hold Leftclick to dismantle Machines" , new GT_Tool_Wrench() .setMaterialAmount(6*U ), OreDictToolNames.wrench , TC.stack(TC.INSTRUMENTUM , 2), TC.stack(TC.MACHINA , 2), TC.stack(TC.ORDO , 2) ), TOOL_wrench);
126+
ToolsGT.add(ToolsGT.sMetaTool.addTool(ToolsGT.WRENCH , "Wrench" , "Hold Leftclick to dismantle Machines" , new GT_Tool_Wrench() .setMaterialAmount(4*U ), OreDictToolNames.wrench , TC.stack(TC.INSTRUMENTUM , 2), TC.stack(TC.MACHINA , 2), TC.stack(TC.ORDO , 2) ), TOOL_wrench);
127127
ToolsGT.add(ToolsGT.sMetaTool.addTool(ToolsGT.FILE , "File" , "Harvests Iron Bars and similar faster" , new GT_Tool_File() .setMaterialAmount(toolHeadFile .mAmount), OreDictToolNames.file , TC.stack(TC.INSTRUMENTUM , 2), TC.stack(TC.FABRICO , 2), TC.stack(TC.ORDO , 2) ), TOOL_file);
128128
ToolsGT.add(ToolsGT.sMetaTool.addTool(ToolsGT.CROWBAR , "Crowbar" , "Harvests anything that cannot be harvested otherwise", new GT_Tool_Crowbar() .setMaterialAmount(3*U2 ), OreDictToolNames.crowbar , TC.stack(TC.INSTRUMENTUM , 2), TC.stack(TC.FABRICO , 2), TC.stack(TC.TELUM , 2) ), TOOL_crowbar);
129129
ToolsGT.add(ToolsGT.sMetaTool.addTool(ToolsGT.SCREWDRIVER , "Screwdriver" , "" , new GT_Tool_Screwdriver() .setMaterialAmount(toolHeadScrewdriver .mAmount), OreDictToolNames.screwdriver , TC.stack(TC.INSTRUMENTUM , 2), TC.stack(TC.FABRICO , 2), TC.stack(TC.ORDO , 2) ), TOOL_screwdriver);
@@ -141,7 +141,7 @@ public void run() {
141141
ToolsGT.sMetaTool.addTool(ToolsGT.ROLLING_PIN , "Rolling Pin" , "" , new GT_Tool_RollingPin() .setMaterialAmount(2*U ), OreDictToolNames.rollingpin , TC.stack(TC.INSTRUMENTUM , 2), TC.stack(TC.LIMUS , 4) );
142142
ToolsGT.add(ToolsGT.sMetaTool.addTool(ToolsGT.CHISEL , "Chisel" , "Be slow/careful with it on Servers because Ping!" , new GT_Tool_Chisel() .setMaterialAmount(toolHeadChisel .mAmount), OreDictToolNames.chisel , TC.stack(TC.INSTRUMENTUM , 2), TC.stack(TC.PERMUTATIO , 1), TC.stack(TC.PERDITIO , 1) ), TOOL_chisel);
143143
ToolsGT.add(ToolsGT.sMetaTool.addTool(ToolsGT.FLINT_AND_TINDER , "Flint and Tinder" , "" , new GT_Tool_FlintAndTinder() .setMaterialAmount(0 ), OreDictToolNames.flintandtinder, OD.craftingFirestarter , TC.stack(TC.INSTRUMENTUM , 2), TC.stack(TC.IGNIS , 2) ), TOOL_igniter);
144-
ToolsGT.add(ToolsGT.sMetaTool.addTool(ToolsGT.MONKEY_WRENCH , "Monkey Wrench" , "Hold Leftclick to dismantle Machines" , new GT_Tool_MonkeyWrench() .setMaterialAmount(6*U ), OreDictToolNames.monkeywrench, OreDictToolNames.wrench , TC.stack(TC.INSTRUMENTUM , 2), TC.stack(TC.MACHINA , 2), TC.stack(TC.ORDO , 2) ), TOOL_monkeywrench);
144+
ToolsGT.add(ToolsGT.sMetaTool.addTool(ToolsGT.MONKEY_WRENCH , "Monkey Wrench" , "Hold Leftclick to dismantle Machines" , new GT_Tool_MonkeyWrench() .setMaterialAmount(4*U ), OreDictToolNames.monkeywrench, OreDictToolNames.wrench , TC.stack(TC.INSTRUMENTUM , 2), TC.stack(TC.MACHINA , 2), TC.stack(TC.ORDO , 2) ), TOOL_monkeywrench);
145145
ToolsGT.sMetaTool.addTool(ToolsGT.BENDING_CYLINDER , "Bending Cylinder" , "" , new GT_Tool_BendingCylinder() .setMaterialAmount(6*U ), OreDictToolNames.bendingcylinder , TC.stack(TC.INSTRUMENTUM , 2), TC.stack(TC.METALLUM , 4) );
146146
ToolsGT.sMetaTool.addTool(ToolsGT.BENDING_CYLINDER_SMALL , "Small Bending Cylinder" , "" , new GT_Tool_BendingCylinderSmall() .setMaterialAmount(3*U ), OreDictToolNames.bendingcylindersmall , TC.stack(TC.INSTRUMENTUM , 1), TC.stack(TC.METALLUM , 2) );
147147
ToolsGT.add(ToolsGT.sMetaTool.addTool(ToolsGT.CONSTRUCTION_PICK , "Construction Pick" , "Good for Bricks and alike, terrible for mining" , new GT_Tool_PickaxeConstruction() .setMaterialAmount(toolHeadConstructionPickaxe .mAmount), OreDictToolNames.pickaxe , TC.stack(TC.INSTRUMENTUM , 3), TC.stack(TC.PERFODIO , 3) ), TOOL_pickaxe);

‎src/main/java/gregtech/loaders/b/Loader_MultiTileEntities.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2227,7 +2227,7 @@ private static void misc(MultiTileEntityRegistry aRegistry, MultiTileEntityBlock
22272227
aMat = MT.Ceramic; aRegistry.add("Universal Plant Pot" , "Misc Tool Blocks" , 32065, 32720, MultiTileEntityPlantPot.class , 0, 16, aUtilStone , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS, 1.0F, NBT_RESISTANCE, 5.0F), "SEN", "GUC", "MBD", 'U', IL.Ceramic_Basin, 'G', OP.dust.dat(ANY.Stone), 'C', OP.dust.dat(ANY.Clay), 'B', OP.dust.dat(MT.Bone), 'E', OP.dust.dat(MT.Endstone), 'N', OP.dust.dat(MT.SoulSand), 'S', OP.dust.dat(MT.Sand), 'D', OD.itemMud, 'M', OD.listAllmushroom);
22282228

22292229
aMat = ANY.Steel; aRegistry.add("Ender Garbage Dump" , "Misc Tool Blocks" , 32710, 32720, MultiTileEntityEnderGarbageDump.class , aMat.mToolQuality, 16, aMachine , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS, 6.0F, NBT_RESISTANCE, 6.0F)); ItemsGT.DEBUG_ITEMS.add(aRegistry.getItem()); ItemsGT.ILLEGAL_DROPS.add(aRegistry.getItem()); GarbageGT.BLACKLIST.add(aRegistry.getItem());
2230-
aMat = ANY.Steel; aRegistry.add("Ender Garbage Bin" , "Misc Tool Blocks" , 32709, 32720, MultiTileEntityEnderGarbageBin.class , 0, 16, aUtilStone , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS, 0.5F, NBT_RESISTANCE, 6.0F), "OOO", "OXO", "PPP", 'O', OP.plate.dat(MT.Obsidian), 'P', OP.plate.dat(ANY.Iron), 'X', OP.gem.dat(MT.EnderEye));
2230+
aMat = ANY.Steel; aRegistry.add("Ender Garbage Bin" , "Misc Tool Blocks" , 32709, 32720, MultiTileEntityEnderGarbageBin.class , 0, 16, aUtilStone , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS, 0.5F, NBT_RESISTANCE, 6.0F), "OOO", "OXO", "PPP", 'O', OP.plate.dat(MT.Obsidian), 'P', OP.plate.dat(ANY.Iron), 'X', OP.gem.dat(MT.EnderEye)); ItemsGT.VOIDING_ITEMS.add(aRegistry.getItem());
22312231

22322232
aMat = MT.TinAlloy; OM.reg(aRegistry.add("Advanced Button" , "Misc Tool Blocks" , 32711, 32720, MultiTileEntityButtonAdvanced.class , aMat.mToolQuality, 64, aMachine , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS, 6.0F, NBT_RESISTANCE, 6.0F), "dPT", "WLW", "TSw", 'W', OP.wireFine.dat(MT.RedAlloy), 'L', OP.wireFine.dat(MT.Lumium), 'P', OP.plateTiny.dat(aMat), 'T', OP.screw.dat(aMat), 'S', OP.springSmall.dat(aMat)), OD.button); CR.shapeless(aRegistry.getItem(), CR.DEF_NCC, new Object[] {aRegistry.getItem()});
22332233

‎src/main/java/gregtech/tileentity/tools/MultiTileEntityBathingPot.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public class MultiTileEntityBathingPot extends TileEntityBase07Paintable impleme
6969
public void readFromNBT2(NBTTagCompound aNBT) {
7070
super.readFromNBT2(aNBT);
7171
if (aNBT.hasKey(NBT_RECIPEMAP)) mRecipes = RecipeMap.RECIPE_MAPS.get(aNBT.getString(NBT_RECIPEMAP));
72-
72+
7373
int tCapacity = 1000;
7474
if (aNBT.hasKey(NBT_TANK_CAPACITY)) tCapacity = UT.Code.bindInt(aNBT.getLong(NBT_TANK_CAPACITY));
7575
mTanksInput = new FluidTankGT[mRecipes.mInputFluidCount];

0 commit comments

Comments
 (0)