1
0
Fork 0
mirror of https://github.com/xHyroM/aetheria.git synced 2024-11-09 17:58:05 +01:00

feat: resolve conflicts w/ Ad Astra, Thermal, GT

This commit is contained in:
Jozef Steinhübl 2024-07-02 22:23:49 +02:00
parent 7a8143e0dc
commit 11be2da734
No known key found for this signature in database
GPG key ID: E6BC90C91973B08F
5 changed files with 164 additions and 93 deletions

View file

@ -0,0 +1,35 @@
ServerEvents.recipes((event) => {
const REMOVED_PLATE_RECIPES = ["steel", "iron"];
const REMOVED_ROD_RECIPES = ["steel", "iron"];
const REMOVED_NUGGET_RECIPES = ["steel"];
REMOVED_PLATE_RECIPES.forEach((metal) => {
event.remove({
id: `ad_astra:compressing/${metal}_plate_from_compressing_${metal}_ingot`,
});
event.remove({
id: `ad_astra:compressing/${metal}_plate_from_compressing_${metal}_ingots`,
});
event.remove({
id: `ad_astra:compressing/${metal}_plate_from_compressing_${metal}_block`,
});
event.remove({
id: `ad_astra:compressing/${metal}_plate_from_compressing_${metal}_blocks`,
});
});
REMOVED_ROD_RECIPES.forEach((metal) => {
event.remove({
id: `ad_astra:${metal}_rod`,
});
});
REMOVED_NUGGET_RECIPES.forEach((metal) => {
event.remove({
id: `ad_astra:${metal}_nugget`,
});
});
});

View file

@ -1,31 +0,0 @@
ServerEvents.recipes((event) => {
const AD_ASTRA_REMOVED_PLATE_RECIPES = ["steel", "iron"];
const AD_ASTRA_REMOVED_ROD_RECIPES = ["steel"];
const AD_ASTRA_REMOVED_NUGGET_RECIPES = ["steel"];
// Remove Ad Astra recipes for plates
AD_ASTRA_REMOVED_PLATE_RECIPES.forEach((metal) => {
event.remove({
id: `ad_astra:compressing/${metal}_plate_from_compressing_${metal}_ingots`,
});
event.remove({
id: `ad_astra:compressing/${metal}_plate_from_compressing_${metal}_blocks`,
});
});
// Remove Ad Astra recipes for gears
AD_ASTRA_REMOVED_ROD_RECIPES.forEach((metal) => {
event.remove({
id: `ad_astra:${metal}_rod`,
});
});
// Remove Ad Astra recipes for nuggets
AD_ASTRA_REMOVED_NUGGET_RECIPES.forEach((metal) => {
event.remove({
id: `ad_astra:${metal}_nugget`,
});
});
});

View file

@ -25,4 +25,6 @@ ServerEvents.recipes((event) => {
"regions_unexplored:willow_door", "regions_unexplored:willow_door",
"regions_unexplored:yellow_bioshroom_door", "regions_unexplored:yellow_bioshroom_door",
].forEach((d) => gregifyDoorRecipe(event, "<identifier>:<name>", d)); ].forEach((d) => gregifyDoorRecipe(event, "<identifier>:<name>", d));
event.remove({ id: "regions_unexplored:oak_door" });
}); });

View file

@ -0,0 +1,127 @@
ServerEvents.recipes((event) => {
const REMOVED_PLATE_RECIPES = [
"tin",
"lead",
"silver",
"nickel",
"bronze",
"invar",
"iron",
"gold",
"copper",
"electrum",
];
const REMOVED_GEAR_RECIPES = [
"tin",
"lead",
"silver",
"nickel",
"bronze",
"invar",
"iron",
"gold",
"copper",
"electrum",
"lapis",
"emerald",
//"quartz"
];
const REMOVED_NUGGET_RECIPES = [
"tin",
"lead",
"silver",
"nickel",
"bronze",
"electrum",
"invar",
"copper",
];
const REMOVED_BLEND_RECIPES = ["bronze", "electrum", "invar"];
const REMOVED_DUST_RECIPES = [
"bronze",
"tin",
"lead",
"silver",
"electrum",
"invar",
"nickel",
"ruby",
"sapphire",
"apatite",
"niter",
"lapis",
"diamond",
"emerald",
"sulfur",
"cinnabar",
];
REMOVED_PLATE_RECIPES.forEach((metal) => {
event.remove({
id: `thermal:machines/press/press_${metal}_ingot_to_plate`,
});
});
REMOVED_GEAR_RECIPES.forEach((metal) => {
event.remove({
id: `thermal:parts/${metal}_gear`,
});
event.remove({
id: `thermal:machines/press/press_${metal}_ingot_to_gear`,
});
});
REMOVED_NUGGET_RECIPES.forEach((metal) => {
event.remove({
id: `thermal:storage/${metal}_nugget_from_ingot`,
});
});
REMOVED_BLEND_RECIPES.forEach((metal) => {
event.remove({
id: `thermal:${metal}_dust_2`,
});
event.remove({
id: `thermal:${metal}_dust_3`,
});
event.remove({
id: `thermal:${metal}_dust_4`,
});
event.remove({
id: `thermal:machines/pulverizer/pulverizer_${metal}_plate_to_dust`,
});
event.remove({
id: `thermal:machines/pulverizer/pulverizer_${metal}_ingot_to_dust`,
});
});
REMOVED_DUST_RECIPES.forEach((metal) => {
event.remove({
id: `thermal:machines/centrifuge/centrifuge_${metal}_dust`,
});
event.remove({
id: `thermal:machines/pulverizer/pulverizer_${metal}`,
});
event.remove({
id: `thermal:machines/pulverizer/pulverizer_${metal}_ore`,
});
event.remove({
id: `thermal:machines/pulverizer/pulverizer_raw_${metal}`,
});
event.remove({
id: `thermal:machines/pulverizer/pulverizer_${metal}_ingot_to_dust`,
});
event.remove({
id: `thermal:machines/pulverizer/pulverizer_${metal}_plate_to_dust`,
});
event.remove({
id: `thermal:earth_charge/${metal}_dust_from_${metal}`,
});
});
});

View file

@ -1,62 +0,0 @@
ServerEvents.recipes((event) => {
const THERMAL_REMOVED_PLATE_RECIPES = [
"tin",
"lead",
"silver",
"nickel",
"bronze",
"invar",
"iron",
"gold",
"copper",
"electrum",
];
const THERMAL_REMOVED_GEAR_RECIPES = [
"tin",
"lead",
"silver",
"nickel",
"bronze",
"invar",
"iron",
"gold",
"copper",
"electrum",
"lapis",
"emerald",
//"quartz"
];
const THERMAL_REMOVED_NUGGET_RECIPES = [
"tin",
"lead",
"silver",
"nickel",
"bronze",
"electrum",
"invar",
"copper",
];
// Remove Thermal Foundation recipes for plates
THERMAL_REMOVED_PLATE_RECIPES.forEach((metal) => {
event.remove({
id: `thermal:machines/press/press_${metal}_ingot_to_plate`,
});
});
// Remove Thermal Foundation recipes for gears
THERMAL_REMOVED_GEAR_RECIPES.forEach((metal) => {
event.remove({
id: `thermal:parts/${metal}_gear`,
});
});
// Remove Thermal Foundation recipes for nuggets
THERMAL_REMOVED_NUGGET_RECIPES.forEach((metal) => {
event.remove({
id: `thermal:storage/${metal}_nugget_from_ingot`,
});
});
});