2024-08-02 22:35:19 +10:00
|
|
|
import com.nomiceu.nomilabs.util.LabsModeHelper
|
2024-10-15 08:12:50 +11:00
|
|
|
import gregtech.common.metatileentities.MetaTileEntities
|
2024-08-26 19:53:59 +10:00
|
|
|
import net.minecraft.item.ItemStack
|
2024-12-08 21:33:16 +11:00
|
|
|
import net.minecraftforge.fluids.FluidUtil
|
2024-08-02 22:35:19 +10:00
|
|
|
|
|
|
|
import static com.nomiceu.nomilabs.groovy.GroovyHelpers.JEIHelpers.*
|
2024-10-15 08:12:50 +11:00
|
|
|
import static gregtech.api.GTValues.*
|
2024-08-02 22:35:19 +10:00
|
|
|
|
2024-12-01 18:36:04 +11:00
|
|
|
// General Item/Category Removals. Some may be in other scripts.
|
|
|
|
|
2024-08-02 22:35:19 +10:00
|
|
|
/* Item Removals */
|
|
|
|
|
|
|
|
// AR
|
2024-12-08 21:33:16 +11:00
|
|
|
mods.jei.ingredient.hide(item('advancedrocketry:crystal:*')) // Random Crystal Blocks
|
2024-08-02 22:35:19 +10:00
|
|
|
|
2024-12-08 21:33:16 +11:00
|
|
|
hideItemIgnoreNBT(item('advancedrocketry:bucketrocketfuel'))
|
|
|
|
hideItemIgnoreNBT(item('advancedrocketry:bucketnitrogen'))
|
|
|
|
hideItemIgnoreNBT(item('advancedrocketry:buckethydrogen'))
|
|
|
|
hideItemIgnoreNBT(item('advancedrocketry:bucketoxygen'))
|
|
|
|
hideItemIgnoreNBT(item('advancedrocketry:bucketenrichedlava'))
|
2024-10-08 13:01:23 +11:00
|
|
|
|
2024-08-02 22:35:19 +10:00
|
|
|
// Armor Plus
|
2024-12-08 21:33:16 +11:00
|
|
|
mods.jei.ingredient.hide(item('armorplus:block_melting_obsidian')) // Null Texture Item
|
2024-08-02 22:35:19 +10:00
|
|
|
|
|
|
|
// Nomi Labs
|
|
|
|
if (LabsModeHelper.expert) {
|
2024-12-08 21:33:16 +11:00
|
|
|
mods.jei.ingredient.hide(item('nomilabs:impossiblerealmdata'))
|
2024-08-02 22:35:19 +10:00
|
|
|
}
|
|
|
|
|
2024-10-15 08:12:50 +11:00
|
|
|
// GregTech
|
|
|
|
// Higher Tier Muffler Hatches
|
|
|
|
for (var tier : [MV, HV, EV, IV, LuV, ZPM, UV]) {
|
|
|
|
mods.jei.ingredient.removeAndHide(MetaTileEntities.MUFFLER_HATCH[tier].getStackForm())
|
|
|
|
}
|
|
|
|
|
2024-08-26 19:53:59 +10:00
|
|
|
// Better Questing
|
|
|
|
List<ItemStack> lootBoxes = [
|
|
|
|
item('bq_standard:loot_chest'),
|
|
|
|
item('bq_standard:loot_chest', 25),
|
|
|
|
item('bq_standard:loot_chest', 50),
|
|
|
|
item('bq_standard:loot_chest', 75),
|
|
|
|
item('bq_standard:loot_chest', 100),
|
|
|
|
item('bq_standard:loot_chest', 101),
|
|
|
|
item('bq_standard:loot_chest', 102),
|
|
|
|
item('bq_standard:loot_chest', 103),
|
|
|
|
item('bq_standard:loot_chest', 104),
|
|
|
|
]
|
2024-12-08 21:33:16 +11:00
|
|
|
lootBoxes.forEach { hideItemIgnoreNBT(it) }
|
2024-08-26 19:53:59 +10:00
|
|
|
|
2024-12-08 21:33:16 +11:00
|
|
|
mods.jei.ingredient.hide(item('betterquesting:placeholder'))
|
|
|
|
mods.jei.ingredient.hide(fluid('betterquesting.placeholder'))
|
2024-08-26 20:02:48 +10:00
|
|
|
|
Hide Modded Buckets from JEI (#858)
[FEATURE]
[FIXUP]
sha = "bf4055fbe4092d72f68bb40bb5d88c624ce5b074"
changeFixes = false
newBody = '''
[EXPAND]
[[messages]]
messageTitle = "Upgrade AE2 Stuff to AE2 Stuff Unofficial"
messageBody = """
[BREAKING]
[DETAILS]
details = [
\"Pattern Encoders have been Removed!\",
\"Any existing Pattern Encoders, whether items, in patterns or placed, have been remapped to AE2 Interfaces.\",
\"All Usages in Recipes have also been changed to AE2 Interfaces!\",
]
[DETAILS]
[PRIORITY]
priority=25
[PRIORITY]
"""
[[messages]]
messageTitle = "Update GT to 2.8.10"
messageBody = """
[BREAKING]
[DETAILS]
details = [
\"Allows GregTech Data Sticks to Copy ME Hatch Settings\",
\"Adds an 'Stocking' Version of ME Hatches and Buses\",
\"Support for Displaying Power Substation on Central Monitor\",
]
[DETAILS]
[PRIORITY]
priority=20
[PRIORITY]
[IGNORE]
checks = { compareBefore = \"1.7-alpha-4\" } # Only apply this if the commit being compared against is 1.7-alpha-4 or newer
[IGNORE]
"""
[[messages]]
messageTitle = "Update Nomi Labs to 0.7.0"
messageBody = """
[BREAKING]
[DETAILS]
details = [
\"Improvement of the DME Simulation Chamber\",
[\"Now increases Tiers and Data Counts of Models\", \"Now is Parallelizable\"],
\"Improvement of the Universal Crystalizer\",
[\"Now Accepts Laser Hatches\", \"Now is Parallelizable\"],
\"Custom Implementation of Difficulty Lock, now works on Dedicated Servers\",
\"Replacement of the Void Dimension, fixing issues with Difficulty Changing\",
\"Replacement of Custom Window Titles and Logos, Allowing the Removal of Random Patches\",
\"Improvements to FTB Utils and Effortless Building\",
\"Allows Setting of Default Keybinds for New Players\",
]
[DETAILS]
[PRIORITY]
priority=15
[PRIORITY]
"""
[EXPAND]
'''
[FIXUP]
2024-08-04 20:49:42 +10:00
|
|
|
// Modded Buckets
|
|
|
|
hideItemIgnoreNBT(item('forge:bucketfilled'))
|
|
|
|
|
2024-12-08 21:33:16 +11:00
|
|
|
// Add back Creosote Bucket, has usages in recipes and furnace
|
|
|
|
mods.jei.ingredient.add(FluidUtil.getFilledBucket(fluid('creosote') * 1000))
|
|
|
|
|
Allow Usage of Fluid Containers in Crafting (#1142)
This PR allows the usage of any fluid container, such as GT cells and drums, or EIO portable tanks, or Thermal portable tanks, in crafting recipes involving buckets.
This is done through mass recipe replacing, replacing ingredients with a custom 'fluid bucket ingredient'. This ingredient also displays some options for containers in JEI, allowing for crafting auto-fill.
Some recipes have been changed:
- Cake + Cake Base + Chocolate Cake now supports dough or rice dough
- Cake + Cake Base no longer allow using unfilled buckets
- Concrete Bucket (for Firebricks Recipe) change:
- Now makes Concrete Cell (Iron)
- Takes a cell as input, and any fluid container (for water) as input
- New Recipe: Water + Lava = Obsidian
Reviewers:
- Anything else we should add to the display list? Should we remove something?
- Any recipes that are not replaced?
- Check for bugs involving crafting, e.g. crash, dupe, unexpected behaviours.
[EXPAND]
[[messages]]
messageBody = '''
[FEATURE]
[DETAILS]
details = [
"Allows using ANY Fluid Container (GT Drums/Cells, EIO Tanks, Thermal Tanks, etc.) in Crafting Recipes, Substituting Filled Buckets",
"Also adds Crafting Recipe for Obsidian (Water + Lava)"
]
[DETAILS]
'''
[[messages]]
messageTitle = "Revamp Concrete Bucket Crafting Recipe"
messageBody = '''
[BALANCING]
[HM]
[DETAILS]
detail = "Now takes an Empty Cell as Input, and outputs a Filled Cell"
[DETAILS]
'''
[EXPAND]
2024-12-11 09:11:28 +11:00
|
|
|
// Add Concrete Cell to JEI
|
|
|
|
mods.jei.ingredient.add(metaitem('fluid_cell').withNbt(['Fluid': ['FluidName': 'concrete', 'Amount': 1000]]))
|
2024-12-08 21:33:16 +11:00
|
|
|
|
2024-08-02 22:35:19 +10:00
|
|
|
/* Remove Categories (Appear Randomly after /gs reload) */
|
|
|
|
// Avatitia
|
|
|
|
mods.jei.category.hideCategory('Avatitia.Extreme')
|
|
|
|
|
|
|
|
// DME
|
|
|
|
if (LabsModeHelper.expert) {
|
|
|
|
mods.jei.category.hideCategory('deepmoblearning.simulation_chamber')
|
|
|
|
mods.jei.category.hideCategory('deepmoblearning.extraction_chamber')
|
|
|
|
mods.jei.category.hideCategory('deepmoblearning.trial_keystone')
|
|
|
|
}
|
|
|
|
|
|
|
|
// EIO
|
|
|
|
mods.jei.category.hideCategory('CombustionGenerator')
|
|
|
|
mods.jei.category.hideCategory('GrindingBall')
|
|
|
|
mods.jei.category.hideCategory('SagMill')
|
|
|
|
mods.jei.category.hideCategory('SolarPanel')
|
|
|
|
mods.jei.category.hideCategory('StirlingGenerator')
|
2024-12-09 22:36:27 +11:00
|
|
|
mods.jei.category.hideCategory('LavaGenerator')
|
2024-08-02 22:35:19 +10:00
|
|
|
|
|
|
|
// AR
|
|
|
|
mods.jei.category.hideCategory('zmaster587.AR.rollingMachine')
|
|
|
|
mods.jei.category.hideCategory('zmaster587.AR.lathe')
|
|
|
|
mods.jei.category.hideCategory('zmaster587.AR.precisionAssembler')
|
|
|
|
mods.jei.category.hideCategory('zmaster587.AR.sawMill')
|
|
|
|
mods.jei.category.hideCategory('zmaster587.AR.chemicalReactor')
|
|
|
|
mods.jei.category.hideCategory('zmaster587.AR.crystallizer')
|
|
|
|
mods.jei.category.hideCategory('zmaster587.AR.electrolyzer')
|
|
|
|
mods.jei.category.hideCategory('zmaster587.AR.arcFurnace')
|
|
|
|
mods.jei.category.hideCategory('zmaster587.AR.platePresser')
|
|
|
|
mods.jei.category.hideCategory('zmaster587.AR.centrifuge')
|
|
|
|
|
|
|
|
// Armor Plus
|
|
|
|
mods.jei.category.hideCategory('armorplus:lava_infuser_infusing')
|
|
|
|
mods.jei.category.hideCategory('armorplus:high_tech_bench')
|
|
|
|
mods.jei.category.hideCategory('armorplus:ulti_tech_bench')
|
|
|
|
mods.jei.category.hideCategory('armorplus:workbench')
|
|
|
|
|
|
|
|
// Vanilla
|
|
|
|
if (LabsModeHelper.expert) {
|
|
|
|
mods.jei.category.hideCategory('jeresources.mob')
|
|
|
|
}
|