Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Undoing of updated JAOPCA #2125

Merged
merged 7 commits into from
May 21, 2023
Merged

Undoing of updated JAOPCA #2125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e1fbd21
Fixed coin name
Discomanco May 16, 2023
0d7af00
Removal of Aluminium
Discomanco May 16, 2023
c6f40bb
Merge branch 'master' into master
Discomanco May 17, 2023
3b48f36
Merge pull request #102 from EnigmaticaModpacks/master
Discomanco May 17, 2023
ac32456
The undoing of JAOPCA
Discomanco May 18, 2023
d8d73af
Update Aluminium.toml
Discomanco May 21, 2023
d1d69d6
Update Aluminium.toml
Discomanco May 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion config/exnihilocreatio/OreRegistry.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
}
},
{
"name": "aluminium",
"name": "aluminum",
"color": {
"r": 0.7490196,
"g": 0.7490196,
Expand Down
18 changes: 9 additions & 9 deletions config/exnihilocreatio/SieveRegistry.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,23 +396,23 @@
},
{
"drop": {
"name": "exnihilocreatio:item_ore_aluminium",
"name": "exnihilocreatio:item_ore_aluminum",
"meta": 0
},
"chance": 0.2,
"meshLevel": 2
},
{
"drop": {
"name": "exnihilocreatio:item_ore_aluminium",
"name": "exnihilocreatio:item_ore_aluminum",
"meta": 0
},
"chance": 0.2,
"meshLevel": 3
},
{
"drop": {
"name": "exnihilocreatio:item_ore_aluminium",
"name": "exnihilocreatio:item_ore_aluminum",
"meta": 0
},
"chance": 0.1,
Expand Down Expand Up @@ -930,23 +930,23 @@
},
{
"drop": {
"name": "exnihilocreatio:item_ore_aluminium",
"name": "exnihilocreatio:item_ore_aluminum",
"meta": 0
},
"chance": 0.2,
"meshLevel": 2
},
{
"drop": {
"name": "exnihilocreatio:item_ore_aluminium",
"name": "exnihilocreatio:item_ore_aluminum",
"meta": 0
},
"chance": 0.2,
"meshLevel": 3
},
{
"drop": {
"name": "exnihilocreatio:item_ore_aluminium",
"name": "exnihilocreatio:item_ore_aluminum",
"meta": 0
},
"chance": 0.1,
Expand Down Expand Up @@ -1148,23 +1148,23 @@
},
{
"drop": {
"name": "exnihilocreatio:item_ore_aluminium",
"name": "exnihilocreatio:item_ore_aluminum",
"meta": 0
},
"chance": 0.2,
"meshLevel": 2
},
{
"drop": {
"name": "exnihilocreatio:item_ore_aluminium",
"name": "exnihilocreatio:item_ore_aluminum",
"meta": 0
},
"chance": 0.2,
"meshLevel": 3
},
{
"drop": {
"name": "exnihilocreatio:item_ore_aluminium",
"name": "exnihilocreatio:item_ore_aluminum",
"meta": 0
},
"chance": 0.1,
Expand Down
41 changes: 23 additions & 18 deletions config/ic2/block_cutter.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,21 +58,26 @@ minecraft:lapis_block = ic2:plate#lapis*9 @hardness:5
OreDict:blockCopper = thermalfoundation:material@320*9 @hardness:2
; Wooden Planks
OreDict:plankWood*2 = minecraft:stick*6 @hardness:1

;OreDict:blockElectrumFlux = redstonearsenal:material@128*9 @hardness:5
;OreDict:blockSilver = thermalfoundation:material@322*9 @hardness:5
;OreDict:blockAluminum = thermalfoundation:material@324*9 @hardness:5
;OreDict:blockNickel = thermalfoundation:material@325*9 @hardness:5
;OreDict:blockPlatinum = thermalfoundation:material@326*9 @hardness:5
;OreDict:blockIridium = thermalfoundation:material@327*9 @hardness:5
;OreDict:blockMithril = thermalfoundation:material@328*9 @hardness:5
;OreDict:blockElectrum = thermalfoundation:material@353*9 @hardness:5
;OreDict:blockInvar = thermalfoundation:material@354*9 @hardness:5
;OreDict:blockConstantan = thermalfoundation:material@356*9 @hardness:5
;OreDict:blockSignalum = thermalfoundation:material@357*9 @hardness:5
;OreDict:blockLumium = thermalfoundation:material@358*9 @hardness:5
;OreDict:blockEnderium = thermalfoundation:material@359*9 @hardness:5
;OreDict:blockTitanium = libvulpes:productplate@7*9 @hardness:5
;OreDict:blockTitaniumAluminide = advancedrocketry:productplate*9 @hardness:5
;OreDict:blockTitaniumIridium = advancedrocketry:productplate@1*9 @hardness:5
;OreDict:blockUranium = immersiveengineering:metal@35*9 @hardness:5
; Brass Plates
OreDict:blockBrass = thaumcraft:plate*9 @hardness:1
; Thaumium Plates
OreDict:blockThaumium = thaumcraft:plate@2*9 @hardness:2
; Void Plates
OreDict:blockVoid = thaumcraft:plate@3*9 @hardness:8
OreDict:blockElectrumFlux = redstonearsenal:material@128*9 @hardness:5
OreDict:blockSilver = thermalfoundation:material@322*9 @hardness:5
OreDict:blockAluminum = thermalfoundation:material@324*9 @hardness:5
OreDict:blockNickel = thermalfoundation:material@325*9 @hardness:5
OreDict:blockPlatinum = thermalfoundation:material@326*9 @hardness:5
OreDict:blockIridium = thermalfoundation:material@327*9 @hardness:5
OreDict:blockMithril = thermalfoundation:material@328*9 @hardness:5
OreDict:blockElectrum = thermalfoundation:material@353*9 @hardness:5
OreDict:blockInvar = thermalfoundation:material@354*9 @hardness:5
OreDict:blockConstantan = thermalfoundation:material@356*9 @hardness:5
OreDict:blockSignalum = thermalfoundation:material@357*9 @hardness:5
OreDict:blockLumium = thermalfoundation:material@358*9 @hardness:5
OreDict:blockEnderium = thermalfoundation:material@359*9 @hardness:5
OreDict:blockTitanium = libvulpes:productplate@7*9 @hardness:5
OreDict:blockTitaniumAluminide = advancedrocketry:productplate*9 @hardness:5
OreDict:blockTitaniumIridium = advancedrocketry:productplate@1*9 @hardness:5
OreDict:blockUranium = immersiveengineering:metal@35*9 @hardness:5
10 changes: 10 additions & 0 deletions config/ic2/macerator.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,16 @@ ic2:misc_resource#iridium_ore = ic2:misc_resource#iridium_shard*9
; Coke Dust
immersiveengineering:material@6 = immersiveengineering:material@17
thermalfoundation:material@802 = immersiveengineering:material@17
; Quartz to Quartz Dust
minecraft:quartz = actuallyadditions:item_dust@5
; Certus Quartz to Certus Quartz Dust
appliedenergistics2:material = appliedenergistics2:material@2
; Charged Certus Quartz to Certus Quartz Dust
appliedenergistics2:material@1 = appliedenergistics2:material@2
; Fluix Crystal to Fluix Dust
appliedenergistics2:material@7 = appliedenergistics2:material@8
; Lithium Ingot to Lithium Dust
nuclearcraft:ingot@6 = ic2:dust@11
; Charcoal Dust
OreDict:itemCharcoal = thermalfoundation:material@769
OreDict:blockCharcoal = thermalfoundation:material@769*9
Expand Down
27 changes: 26 additions & 1 deletion config/ic2/metal_former_rolling.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,4 +58,29 @@ OreDict:ingotCopper = thermalfoundation:material@320
; Lead Ingot
OreDict:ingotLead = thermalfoundation:material@323
; Tin Plate
OreDict:plateTin = ic2:casing#tin*2
OreDict:plateTin = ic2:casing#tin*2
; Brass Plate
OreDict:ingotBrass = thaumcraft:plate
; Thaumium Plate
OreDict:ingotThaumium = thaumcraft:plate@2
; Void Plate
OreDict:ingotVoid = thaumcraft:plate@3

OreDict:ingotElectrumFlux = redstonearsenal:material@128
OreDict:ingotSilver = thermalfoundation:material@322
OreDict:ingotAluminum = thermalfoundation:material@324
OreDict:ingotNickel = thermalfoundation:material@325
OreDict:ingotPlatinum = thermalfoundation:material@326
OreDict:ingotIridium = thermalfoundation:material@327
OreDict:ingotMithril = thermalfoundation:material@328
OreDict:ingotElectrum = thermalfoundation:material@353
OreDict:ingotInvar = thermalfoundation:material@354
OreDict:ingotConstantan = thermalfoundation:material@356
OreDict:ingotSignalum = thermalfoundation:material@357
OreDict:ingotLumium = thermalfoundation:material@358
OreDict:ingotEnderium = thermalfoundation:material@359
OreDict:ingotSilicon = libvulpes:productplate@3
OreDict:ingotTitanium = libvulpes:productplate@7
OreDict:ingotTitaniumAluminide = advancedrocketry:productplate
OreDict:ingotTitaniumIridium = advancedrocketry:productplate@1
OreDict:ingotUranium = immersiveengineering:metal@35
2 changes: 1 addition & 1 deletion config/jaopca/materials/Aluminium.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#Is the storage block of this material small (2x2).
isSmallStorageBlock = false
#The module blacklist of this material.
moduleBlacklist = []
moduleBlacklist = ["*"]
#Should items of this material have the enchanted glow.
hasEffect = false
#The model type of the material.
Expand Down
11 changes: 8 additions & 3 deletions scripts/ExNihilo&Compressum.zs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,19 +108,24 @@ import mods.jei.JEI.removeAndHide as rh;
rh(<exnihilocreatio:item_ore_iron:1>);
rh(<exnihilocreatio:item_ore_copper:1>);
rh(<exnihilocreatio:item_ore_tin:1>);
rh(<exnihilocreatio:item_ore_aluminium:1>);
rh(<exnihilocreatio:item_ore_aluminum:1>);
rh(<exnihilocreatio:item_ore_lead:1>);
rh(<exnihilocreatio:item_ore_silver:1>);
rh(<exnihilocreatio:item_ore_nickel:1>);
rh(<exnihilocreatio:item_ore_ardite:1>);
rh(<exnihilocreatio:item_ore_cobalt:1>);

rh(<jaopca:item_hunkosmium>);
rh(<jaopca:item_hunkboron>);
rh(<jaopca:item_hunklithium>);
rh(<jaopca:item_hunkmagnesium>);
rh(<jaopca:item_hunkthorium>);
rh(<jaopca:item_hunkuranium>);
# Ex Nihilo Dusts
rh(<exnihilocreatio:item_ore_gold:2>);
rh(<exnihilocreatio:item_ore_iron:2>);
rh(<exnihilocreatio:item_ore_copper:2>);
rh(<exnihilocreatio:item_ore_tin:2>);
rh(<exnihilocreatio:item_ore_aluminium:2>);
rh(<exnihilocreatio:item_ore_aluminum:2>);
rh(<exnihilocreatio:item_ore_lead:2>);
rh(<exnihilocreatio:item_ore_silver:2>);
rh(<exnihilocreatio:item_ore_nickel:2>);
Expand Down
2 changes: 1 addition & 1 deletion scripts/ThermalExpansion.zs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,4 +279,4 @@ mods.thermalexpansion.Compactor.addGearRecipe(<thermalfoundation:material:23>, <
# Remove AE2 Seeds from Phytogenic Insolator
mods.thermalexpansion.Insolator.removeRecipe(<appliedenergistics2:crystal_seed:0>, <minecraft:glowstone_dust>);
mods.thermalexpansion.Insolator.removeRecipe(<appliedenergistics2:crystal_seed:600>, <minecraft:glowstone_dust>);
mods.thermalexpansion.Insolator.removeRecipe(<appliedenergistics2:crystal_seed:1200>, <minecraft:glowstone_dust>);
mods.thermalexpansion.Insolator.removeRecipe(<appliedenergistics2:crystal_seed:1200>, <minecraft:glowstone_dust>);
2 changes: 1 addition & 1 deletion scripts/TwilightForest.zs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ val rockRecycleTable as IItemStack[][IIngredient] = {
<twilightforest:castle_pillar:1> : [<harvestcraft:saltitem>, <appliedenergistics2:material:3>, <astralsorcery:itemusabledust:1>],
<twilightforest:deadrock> |
<twilightforest:deadrock:1> |
<twilightforest:deadrock:2> : [<ic2:dust:1>, <nuclearcraft:dust:8>, <rftools:dimensional_shard>],
<twilightforest:deadrock:2> : [<ic2:dust:1>, <nuclearcraft:dust:8>, <jaopca:item_dustdimensionalshard>],
<twilightforest:castle_brick> |
<twilightforest:castle_brick:1> |
<twilightforest:castle_brick:2> |
Expand Down
2 changes: 1 addition & 1 deletion scripts/process.zs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ import crafttweaker.oredict.IOreDictEntry;
import crafttweaker.liquid.ILiquidStack;
import crafttweaker.data.IData;
import mods.jaopca.JAOPCA;

import mods.jaopca.OreEntry;
import scripts.processWork.work;
import scripts.processWork.workEx;
import scripts.processUtils.wholesCalc;
Expand Down
42 changes: 42 additions & 0 deletions scripts/utils.zs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,48 @@ zenClass Utils {

zenConstructor() { }

function getSomething(oreName as string, entryNames as string[]) as IItemStack { return getSomething(oreName, entryNames, 1); }
function getSomething(oreName as string, entryNames as string[], amount as int) as IItemStack {
if (isNull(oreName)) return null;

// Find with JAOPCA
val JOREoutput = mods.jaopca.JAOPCA.getOre(oreName);
var something as IItemStack = null;
if (!isNull(JOREoutput)) {
var k = 0;
while k < entryNames.length && isNull(something) {
something = JOREoutput.getItemStack(entryNames[k]);
k += 1;
}
}

// Find with Oredict
if (isNull(something)) {
for str in entryNames {
val oreItems = oreDict[str~oreName].items;
if (oreItems.length>0) {
for preffer in modPreference {
for item in oreItems {
if(item.definition.id.startsWith(preffer))
return countOutput(item * amount, oreName);
}
}
return countOutput(oreDict[str~oreName].firstItem * amount, oreName);
}
}
}

// Find with smelting
if (isNull(something) && entryNames has "any") {
val oreItems = oreDict['ore'~oreName].items;
if (oreItems.length>0) {
something = smelt(oreDict['ore'~oreName]);
}
}

return isNull(something) ? null : countOutput(something * amount, oreName);
}

# Return result of smelting in vanilla furnace
function smelt(input as IIngredient) as IItemStack {
for r in furnace.all {
Expand Down