Skip to content

Commit

Permalink
Automatic Commit Message for when Greg does not type before hitting E…
Browse files Browse the repository at this point in the history 
…nter.
  • Loading branch information
@GregoriusT
GregoriusT committed Sep 9, 2023
1 parent 8d659c1 commit 9954917
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 21 deletions.
2 changes: 2 additions & 0 deletions src/main/java/gregapi/data/FL.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -620,6 +620,8 @@ private FL(String aName, String aOldName1, String aOldName2, Collection<String>.
public boolean is(String aFluidName) {return mName.equalsIgnoreCase(aFluidName);}
public boolean is(Collection<String> aFluidSet) {return aFluidSet.contains(mName);}

public ItemStack fill(ItemStack aStack) {return fill(make(Integer.MAX_VALUE), aStack, F, T, T, F);}




Expand Down
6 changes: 3 additions & 3 deletions src/main/java/gregtech/GT_Proxy.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -227,21 +227,21 @@ public void onPlayerInteraction(PlayerInteractEvent aEvent) {
return;
}
if (tBlock == BlocksGT.River || WD.waterstream(tBlock)) {
ItemStack tStack = FL.fill(FL.Water.make(Integer.MAX_VALUE), aStack, F, T, F, T);
ItemStack tStack = FL.Water.fill(aStack);
if (tStack == null) return;
ST.use(aEvent.entityPlayer, aStack);
UT.Inventories.addStackToPlayerInventoryOrDrop(aEvent.entityPlayer, tStack, F);
return;
}
if (tBlock == BlocksGT.Ocean) {
ItemStack tStack = FL.fill(FL.Ocean.make(Integer.MAX_VALUE), aStack, F, T, F, T);
ItemStack tStack = FL.Ocean.fill(aStack);
if (tStack == null) return;
ST.use(aEvent.entityPlayer, aStack);
UT.Inventories.addStackToPlayerInventoryOrDrop(aEvent.entityPlayer, tStack, F);
return;
}
if (tBlock == BlocksGT.Swamp) {
ItemStack tStack = FL.fill(FL.Dirty_Water.make(Integer.MAX_VALUE), aStack, F, T, F, T);
ItemStack tStack = FL.Dirty_Water.fill(aStack);
if (tStack == null) return;
ST.use(aEvent.entityPlayer, aStack);
UT.Inventories.addStackToPlayerInventoryOrDrop(aEvent.entityPlayer, tStack, F);
Expand Down
26 changes: 13 additions & 13 deletions src/main/java/gregtech/compat/Compat_Recipes_Thaumcraft.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,19 +116,19 @@ public class Compat_Recipes_Thaumcraft extends CompatMods {
, LH.add("gt.research.page.1." + tKey, "You have discovered a way of filling a Bucket with aqua essentia in order to simply get Water.")
, COMPAT_TC.addCrucibleRecipe(tKey, ST.make(Items.bucket , 1, W), ST.make(Items.water_bucket, 1, 0), TC.stack(TC.AQUA, 4))
, COMPAT_TC.addCrucibleRecipe(tKey, IL.Cell_Empty .get(1), IL.Cell_Water.get(1), TC.stack(TC.AQUA, 4))
, COMPAT_TC.addCrucibleRecipe(tKey, IL.FR_MagicCapsule .get(1), FL.fill(FL.Water.make(16000), IL.FR_MagicCapsule .get(1), F, F), TC.stack(TC.AQUA,10))
, COMPAT_TC.addCrucibleRecipe(tKey, IL.FR_TinCapsule .get(1), FL.fill(FL.Water.make( 1000), IL.FR_TinCapsule .get(1), F, F), TC.stack(TC.AQUA, 4))
, COMPAT_TC.addCrucibleRecipe(tKey, IL.FR_WaxCapsule .get(1), FL.fill(FL.Water.make( 1000), IL.FR_WaxCapsule .get(1), F, F), TC.stack(TC.AQUA, 4))
, COMPAT_TC.addCrucibleRecipe(tKey, IL.FR_RefractoryCapsule .get(1), FL.fill(FL.Water.make( 1000), IL.FR_RefractoryCapsule .get(1), F, F), TC.stack(TC.AQUA, 4))
, COMPAT_TC.addCrucibleRecipe(tKey, IL.Wooden_Bucket_Copper .get(1), FL.fill(FL.Water.make( 1000), IL.Wooden_Bucket_Copper .get(1), F, F), TC.stack(TC.AQUA, 4))
, COMPAT_TC.addCrucibleRecipe(tKey, IL.Wooden_Bucket_Tin .get(1), FL.fill(FL.Water.make( 1000), IL.Wooden_Bucket_Tin .get(1), F, F), TC.stack(TC.AQUA, 4))
, COMPAT_TC.addCrucibleRecipe(tKey, IL.Wooden_Bucket_Zinc .get(1), FL.fill(FL.Water.make( 1000), IL.Wooden_Bucket_Zinc .get(1), F, F), TC.stack(TC.AQUA, 4))
, COMPAT_TC.addCrucibleRecipe(tKey, IL.Wooden_Bucket_Lead .get(1), FL.fill(FL.Water.make( 1000), IL.Wooden_Bucket_Lead .get(1), F, F), TC.stack(TC.AQUA, 4))
, COMPAT_TC.addCrucibleRecipe(tKey, IL.Wooden_Bucket_Bismuth .get(1), FL.fill(FL.Water.make( 1000), IL.Wooden_Bucket_Bismuth .get(1), F, F), TC.stack(TC.AQUA, 4))
, COMPAT_TC.addCrucibleRecipe(tKey, IL.Wooden_Bucket_Brass .get(1), FL.fill(FL.Water.make( 1000), IL.Wooden_Bucket_Brass .get(1), F, F), TC.stack(TC.AQUA, 4))
, COMPAT_TC.addCrucibleRecipe(tKey, IL.Wooden_Bucket_Bronze .get(1), FL.fill(FL.Water.make( 1000), IL.Wooden_Bucket_Bronze .get(1), F, F), TC.stack(TC.AQUA, 4))
, COMPAT_TC.addCrucibleRecipe(tKey, IL.Wooden_Bucket_BismuthBronze .get(1), FL.fill(FL.Water.make( 1000), IL.Wooden_Bucket_BismuthBronze .get(1), F, F), TC.stack(TC.AQUA, 4))
, COMPAT_TC.addCrucibleRecipe(tKey, IL.Wooden_Bucket_Gold .get(1), FL.fill(FL.Water.make( 1000), IL.Wooden_Bucket_Gold .get(1), F, F), TC.stack(TC.AQUA, 4))
, COMPAT_TC.addCrucibleRecipe(tKey, IL.FR_MagicCapsule .get(1), FL.Water.fill(IL.FR_MagicCapsule .get(1)), TC.stack(TC.AQUA,10))
, COMPAT_TC.addCrucibleRecipe(tKey, IL.FR_TinCapsule .get(1), FL.Water.fill(IL.FR_TinCapsule .get(1)), TC.stack(TC.AQUA, 4))
, COMPAT_TC.addCrucibleRecipe(tKey, IL.FR_WaxCapsule .get(1), FL.Water.fill(IL.FR_WaxCapsule .get(1)), TC.stack(TC.AQUA, 4))
, COMPAT_TC.addCrucibleRecipe(tKey, IL.FR_RefractoryCapsule .get(1), FL.Water.fill(IL.FR_RefractoryCapsule .get(1)), TC.stack(TC.AQUA, 4))
, COMPAT_TC.addCrucibleRecipe(tKey, IL.Wooden_Bucket_Copper .get(1), FL.Water.fill(IL.Wooden_Bucket_Copper .get(1)), TC.stack(TC.AQUA, 4))
, COMPAT_TC.addCrucibleRecipe(tKey, IL.Wooden_Bucket_Tin .get(1), FL.Water.fill(IL.Wooden_Bucket_Tin .get(1)), TC.stack(TC.AQUA, 4))
, COMPAT_TC.addCrucibleRecipe(tKey, IL.Wooden_Bucket_Zinc .get(1), FL.Water.fill(IL.Wooden_Bucket_Zinc .get(1)), TC.stack(TC.AQUA, 4))
, COMPAT_TC.addCrucibleRecipe(tKey, IL.Wooden_Bucket_Lead .get(1), FL.Water.fill(IL.Wooden_Bucket_Lead .get(1)), TC.stack(TC.AQUA, 4))
, COMPAT_TC.addCrucibleRecipe(tKey, IL.Wooden_Bucket_Bismuth .get(1), FL.Water.fill(IL.Wooden_Bucket_Bismuth .get(1)), TC.stack(TC.AQUA, 4))
, COMPAT_TC.addCrucibleRecipe(tKey, IL.Wooden_Bucket_Brass .get(1), FL.Water.fill(IL.Wooden_Bucket_Brass .get(1)), TC.stack(TC.AQUA, 4))
, COMPAT_TC.addCrucibleRecipe(tKey, IL.Wooden_Bucket_Bronze .get(1), FL.Water.fill(IL.Wooden_Bucket_Bronze .get(1)), TC.stack(TC.AQUA, 4))
, COMPAT_TC.addCrucibleRecipe(tKey, IL.Wooden_Bucket_BismuthBronze .get(1), FL.Water.fill(IL.Wooden_Bucket_BismuthBronze .get(1)), TC.stack(TC.AQUA, 4))
, COMPAT_TC.addCrucibleRecipe(tKey, IL.Wooden_Bucket_Gold .get(1), FL.Water.fill(IL.Wooden_Bucket_Gold .get(1)), TC.stack(TC.AQUA, 4))
);
tMat = MT.Zn;
COMPAT_TC.addResearch(tKey = TRANSZINC
Expand Down
7 changes: 2 additions & 5 deletions src/main/java/gregtech/worldgen/TwilightTreasureReplacer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,7 @@
package gregtech.worldgen;

import gregapi.block.multitileentity.MultiTileEntityRegistry;
import gregapi.data.IL;
import gregapi.data.MD;
import gregapi.data.MT;
import gregapi.data.OP;
import gregapi.data.*;
import gregapi.util.ST;
import gregapi.util.UT;
import gregapi.util.WD;
Expand Down Expand Up @@ -126,7 +123,7 @@ public TwilightTreasureReplacer(TFTreasure aTreasure, int aIndex, String aCatego
useless .add(IL.Dye_SquidInk.get(36));
useless .add(IL.Bottle_Ink.get(16));
useless .add(Items.feather, 8);
useless .add(IL.Porcelain_Cup.get(4));
useless .add(FL.Potion_NightVision_1L.fill(IL.Porcelain_Cup.get(1)));
useless .add(IL.Food_Pickle.get(8));
// Add a Death Compass to the Ultra Rares, even though it is super easy to get.
ultrarare.add(IL.Compass_Death.get(1));
Expand Down

0 comments on commit 9954917

Please sign in to comment.