tweak to not name conflict with minecraft.js

This commit is contained in:
Lily-129 2022-02-11 10:11:24 -05:00 committed by GitHub
parent efcd00a88b
commit 5dd103919e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 56 additions and 60 deletions

View File

@ -602,7 +602,6 @@ elements.wb1 = {
"XX|CR:water|XX", "XX|CR:water|XX",
], ],
category: "special", category: "special",
state: "liquid",
density: 997, density: 997,
hidden: true, hidden: true,
excludeRandom: true, excludeRandom: true,
@ -645,7 +644,6 @@ elements.lb1 = {
"XX|CR:magma|XX", "XX|CR:magma|XX",
], ],
category: "special", category: "special",
state: "liquid",
density: 997, density: 997,
hidden: true, hidden: true,
excludeRandom: true, excludeRandom: true,
@ -723,66 +721,44 @@ elements.seb = {
hidden: true, hidden: true,
excludeRandom: true, excludeRandom: true,
hardness: 0.3, hardness: 0.3,
}, }
elements.netherrack = { if(!enabledMods.includes("mods/minecraft.js")) {
color: ["#802b2b","#4f1b1b","#943232"], elements.netherrack = {
behavior: behaviors.POWDER, color: ["#802b2b","#4f1b1b","#943232"],
tempHigh: 7550, behavior: behaviors.POWDER,
category: "land", tempHigh: 7550,
state: "solid", category: "land",
density: 2550, state: "solid",
hardness: 0.07, density: 2550,
breakInto: ["crushed_netherrack","crushed_netherrack","crushed_netherrack","crushed_netherrack","crushed_netherrack","crushed_netherrack","crushed_netherrack","sulfur"], // and some copper, gold, iron, nickel after processing //sulfur closer to 1/7 in-game hardness: 0.07,
burn: 9, breakInto: ["crushed_netherrack","crushed_netherrack","crushed_netherrack","crushed_netherrack","crushed_netherrack","crushed_netherrack","crushed_netherrack","sulfur"], // and some copper, gold, iron, nickel after processing //sulfur closer to 1/7 in-game
burnTime: 9007199254740995, burn: 9,
burnInto: "netherrack", burnTime: 9007199254740995,
}, burnInto: "netherrack",
}
minecraftModEnabled = false
} else if(enabledMods.includes("mods/minecraft.js")) {
minecraftModEnabled = true
}
elements.crushed_netherrack = { if(!enabledMods.includes("mods/minecraft.js")) {
color: ["#e34b46","#b04235","#73431f","#522510","#7a3326"], elements.crushed_netherrack = {
behavior: behaviors.POWDER, color: ["#e34b46","#b04235","#73431f","#522510","#7a3326"],
category:"land", behavior: behaviors.POWDER,
tempHigh: 7550, category:"land",
stateHigh: "molten_netherrack", tempHigh: 7550,
state: "solid", stateHigh: "molten_netherrack",
density: 1680, state: "solid",
burn: 20, density: 1680,
burnTime: 9007199254740995, burn: 20,
hardness: 0.02, burnTime: 9007199254740995,
hidden: true, hardness: 0.02,
}, hidden: true,
}
elements.soul_sand = { minecraftModEnabled = false
color: "#755e35", } else if(enabledMods.includes("mods/minecraft.js")) {
behavior: behaviors.POWDER, minecraftModEnabled = true
tempHigh: 3000,
stateHigh: "molten_soul_glass",
category: "land",
state: "solid",
density: 1602,
},
elements.soul_glass = {
color: ["#998060","#a18654"],
behavior: behaviors.WALL,
tempHigh: 3000,
category: "solids",
state: "solid",
density: 2500,
breakInto: "soul_glass_shard",
hidden: true,
},
elements.soul_glass_shard = {
color: ["#998060","#a18654","#8f764a"],
behavior: behaviors.POWDER,
tempHigh: 3000,
stateHigh: "molten_soul_glass",
category: "powders",
state: "solid",
density: 2500,
hidden: true,
} }
runAfterLoad(function() { runAfterLoad(function() {
@ -797,6 +773,26 @@ runAfterLoad(function() {
"DL:"+eLists.FAIRY+" AND M2|XX|DL:"+eLists.FAIRY+" AND M2", "DL:"+eLists.FAIRY+" AND M2|XX|DL:"+eLists.FAIRY+" AND M2",
"M1|DL:"+eLists.FAIRY+"|M1", "M1|DL:"+eLists.FAIRY+"|M1",
] ]
}
if(minecraftModEnabled) {
elements.netherrack.hardness = 0.07
elements.netherrack.breakInto = ["crushed_netherrack","crushed_netherrack","crushed_netherrack","crushed_netherrack","crushed_netherrack","crushed_netherrack","crushed_netherrack","sulfur"] // and some copper, gold, iron, nickel after processing //sulfur closer to 1/7 in-game
elements.netherrack.burn = 9
elements.netherrack.burnTime = 9007199254740995
elements.netherrack.burnInto = "netherrack"
elements.crushed_netherrack = {
color: ["#e34b46","#b04235","#73431f","#522510","#7a3326"],
behavior: behaviors.POWDER,
category:"land",
tempHigh: 2750,
stateHigh: "molten_netherrack",
state: "solid",
density: 1680,
burn: 20,
burnTime: 9007199254740995,
hardness: 0.02,
hidden: true,
}
} }
elements.vaporized_histrelin = elements.molten_histrelin elements.vaporized_histrelin = elements.molten_histrelin
delete elements.molten_histrelin delete elements.molten_histrelin