Merge pull request 'cleanup haxe code' (#3) from LordMZTE/Notex-3:scriptcleanup into master
Reviewed-on: https://data.tilera.xyz/git/Anvilcraft/Notex-3/pulls/3
This commit is contained in:
commit
4c7d8d4eeb
4 changed files with 203 additions and 188 deletions
|
|
@ -4,7 +4,6 @@ import kubejs.Events;
|
|||
import kubejs.Settings;
|
||||
import kubejs.events.server.RecipesEvent;
|
||||
import kubejs.Events.EventType;
|
||||
import kubejs.Item;
|
||||
|
||||
class Main {
|
||||
static function main() {
|
||||
|
|
@ -13,168 +12,6 @@ class Main {
|
|||
Settings.logSkippedRecipes = false;
|
||||
Settings.logErroringRecipes = true;
|
||||
|
||||
Events.onEvent(EventType.RecipesEventType, onRecipesEvent);
|
||||
}
|
||||
|
||||
static function onRecipesEvent(event:RecipesEvent) {
|
||||
// @formatter:off
|
||||
var removeByOutput = [
|
||||
"angelring:itemring",
|
||||
"angelring:itemdiamondring",
|
||||
"alchemistry:chemical_combiner",
|
||||
"alchemistry:chemical_dissolver",
|
||||
"compactmachines:wall",
|
||||
"compactmachines:machine_tiny",
|
||||
"compactmachines:machine_small",
|
||||
"compactmachines:machine_normal",
|
||||
"compactmachines:machine_large",
|
||||
"compactmachines:machine_giant",
|
||||
"compactmachines:machine_large",
|
||||
"compactmachines:machine_maximum",
|
||||
"compactmachines:personal_shrinking_device",
|
||||
"ring_of_teleport:ring_of_teleport",
|
||||
"ring_of_enderchest:ring_of_enderchest",
|
||||
"ring_of_repair:ring_of_repair",
|
||||
"ring_of_blink:ring_of_blink",
|
||||
"crossroads:gear_facade_glass",
|
||||
"assemblylinemachines:simple_grinder",
|
||||
"assemblylinemachines:steel_blade_piece",
|
||||
"assemblylinemachines:steel_fluid_tank",
|
||||
"enderrift:rift",
|
||||
"enderrift:rift_orb"
|
||||
];
|
||||
// @formatter:on
|
||||
for (i in removeByOutput) {
|
||||
event.remove({output: i});
|
||||
}
|
||||
|
||||
// SHAPED RECIPES
|
||||
event.shaped("alchemistry:chemical_combiner", ["SSS", "ACA", "SSS"], {
|
||||
S: "#forge:ingots/steel",
|
||||
C: "mekanism:chemical_crystallizer",
|
||||
A: "mekanism:alloy_atomic"
|
||||
});
|
||||
|
||||
event.shaped("alchemistry:chemical_dissolver", ["SSS", "ACA", "SSS"], {
|
||||
S: "#forge:ingots/steel",
|
||||
C: "mekanism:chemical_dissolution_chamber",
|
||||
A: "mekanism:alloy_atomic"
|
||||
});
|
||||
|
||||
event.shaped("compactmachines:wall", ["TTT", "TCT", "TTT"], {
|
||||
T: "chemlib:ingot_thorium",
|
||||
C: "#forge:ingots/chromium"
|
||||
});
|
||||
|
||||
event.shaped("compactmachines:machine_tiny", ["CCC", "CTC", "CCC"], {
|
||||
T: "mekanism:teleportation_core",
|
||||
C: "compactmachines:wall"
|
||||
});
|
||||
|
||||
event.shaped("compactmachines:machine_small", ["CCC", "CMC", "CCC"], {
|
||||
M: "compactmachines:machine_tiny",
|
||||
C: "compactmachines:wall"
|
||||
});
|
||||
|
||||
event.shaped("compactmachines:machine_normal", ["CCC", "CMC", "CCC"], {
|
||||
M: "compactmachines:machine_small",
|
||||
C: "compactmachines:wall"
|
||||
});
|
||||
|
||||
event.shaped("compactmachines:machine_large", ["CCC", "CMC", "CCC"], {
|
||||
M: "compactmachines:machine_normal",
|
||||
C: "compactmachines:wall"
|
||||
});
|
||||
|
||||
event.shaped("compactmachines:machine_giant", ["CCC", "CMC", "CCC"], {
|
||||
M: "compactmachines:machine_large",
|
||||
C: "compactmachines:wall"
|
||||
});
|
||||
|
||||
event.shaped("compactmachines:machine_maximum", ["CCC", "CMC", "CCC"], {
|
||||
M: "compactmachines:machine_giant",
|
||||
C: "compactmachines:wall"
|
||||
});
|
||||
|
||||
event.shaped("compactmachines:personal_shrinking_device", ["III", "ICI", "TTT"], {
|
||||
T: "mekanism:teleportation_core",
|
||||
C: "#forge:ingots/chromium",
|
||||
I: "#forge:ingots"
|
||||
});
|
||||
|
||||
event.shaped("ring_of_teleport:ring_of_teleport", ["EM ", "M M", " M "], {
|
||||
E: "#forge:ender_pearls",
|
||||
M: "botania:manasteel_ingot"
|
||||
});
|
||||
|
||||
event.shaped("ring_of_enderchest:ring_of_enderchest", ["EM ", "M M", " M "], {
|
||||
E: "#forge:chests/ender",
|
||||
M: "botania:manasteel_ingot"
|
||||
});
|
||||
|
||||
event.shaped("ring_of_repair:ring_of_repair", ["ME ", "E E", " E "], {
|
||||
M: Item.of("minecraft:enchanted_book", 1, {StoredEnchantments: [{lvl: 1, id: "minecraft:mending"}]}),
|
||||
E: "botania:elementium_ingot"
|
||||
});
|
||||
|
||||
event.shaped("angelring:itemring", ["WGW", "GRG", "TGT"], {
|
||||
G: "minecraft:gold_ingot",
|
||||
R: "angelring:itemdiamondring",
|
||||
W: "forbidden_arcanus:bat_wing",
|
||||
T: "minecraft:ghast_tear"
|
||||
});
|
||||
|
||||
event.shaped("angelring:itemdiamondring", ["DED", "ECE", "DED"], {
|
||||
C: "minecraft:nether_star",
|
||||
E: "botania:manasteel_ingot",
|
||||
D: "minecraft:diamond_block"
|
||||
});
|
||||
|
||||
event.shaped("angelring:itemdiamondring", ["DED", "ECE", "DED"], {
|
||||
C: "minecraft:elytra",
|
||||
E: "botania:manasteel_ingot",
|
||||
D: "minecraft:diamond_block"
|
||||
});
|
||||
|
||||
event.shaped(Item.of("minecraft:chest", 4), ["WWW", "W W", "WWW"], {
|
||||
W: "#minecraft:logs"
|
||||
});
|
||||
|
||||
event.shaped(Item.of("minecraft:stick", 16), ["W", "W"], {
|
||||
W: "#minecraft:logs"
|
||||
});
|
||||
|
||||
event.shaped("minecraft:hopper", ["IWI", "IWI", " I "], {I: "#forge:ingots/iron", W: "#minecraft:logs"});
|
||||
|
||||
event.shaped("minecraft:repeater", ["R R", "SRS", "sss"], {R: "#forge:dusts/redstone", S: "#forge:rods/wooden", s: "minecraft:stone"});
|
||||
|
||||
event.shaped("enderrift:rift", ["LEL", "ECE", "LEL"], {
|
||||
L: "#forge:ingots/lawrencium",
|
||||
E: "minecraft:ender_eye",
|
||||
C: "mekanism:teleportation_core"
|
||||
});
|
||||
|
||||
//Steel Fix
|
||||
event.shaped("assemblylinemachines:simple_grinder", ["sss", "rdr","iii"],{
|
||||
"s": "#forge:ingots/steel",
|
||||
"i": "#forge:ingots/iron",
|
||||
"r": "#forge:dusts/redstone",
|
||||
"d": "assemblylinemachines:hand_grinder"
|
||||
});
|
||||
|
||||
event.shaped("assemblylinemachines:steel_blade_piece", [" y ", "yxy"], {
|
||||
"x": "#forge:ingots/steel",
|
||||
"y": "#forge:nuggets/steel"
|
||||
});
|
||||
|
||||
event.shaped("assemblylinemachines:steel_fluid_tank", ["rsr", "gwg", "rsr"], {
|
||||
"r": "assemblylinemachines:steel_rod",
|
||||
"g": "#forge:glass_panes",
|
||||
"s": "#forge:ingots/steel",
|
||||
"w": "assemblylinemachines:wooden_fluid_tank"
|
||||
});
|
||||
|
||||
// SHAPELESS RECIPES
|
||||
event.shapeless("ring_of_blink:ring_of_blink", ["ring_of_teleport:ring_of_teleport", "botania:terrasteel_ingot"]);
|
||||
Events.onEvent(EventType.RecipesEventType, Recipes.onEvent);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
202
src/kubejs/server/src/Recipes.hx
Normal file
202
src/kubejs/server/src/Recipes.hx
Normal file
|
|
@ -0,0 +1,202 @@
|
|||
package;
|
||||
|
||||
import kubejs.events.server.RecipesEvent;
|
||||
import kubejs.Item;
|
||||
|
||||
class Recipes {
|
||||
// @formatter:off
|
||||
static final removeByOutput = [
|
||||
"angelring:itemring",
|
||||
"angelring:itemdiamondring",
|
||||
"alchemistry:chemical_combiner",
|
||||
"alchemistry:chemical_dissolver",
|
||||
"compactmachines:wall",
|
||||
"compactmachines:machine_tiny",
|
||||
"compactmachines:machine_small",
|
||||
"compactmachines:machine_normal",
|
||||
"compactmachines:machine_large",
|
||||
"compactmachines:machine_giant",
|
||||
"compactmachines:machine_large",
|
||||
"compactmachines:machine_maximum",
|
||||
"compactmachines:personal_shrinking_device",
|
||||
"ring_of_teleport:ring_of_teleport",
|
||||
"ring_of_enderchest:ring_of_enderchest",
|
||||
"ring_of_repair:ring_of_repair",
|
||||
"ring_of_blink:ring_of_blink",
|
||||
"crossroads:gear_facade_glass",
|
||||
"assemblylinemachines:simple_grinder",
|
||||
"assemblylinemachines:steel_blade_piece",
|
||||
"assemblylinemachines:steel_fluid_tank",
|
||||
"enderrift:rift",
|
||||
"enderrift:rift_orb"
|
||||
];
|
||||
// @formatter:on
|
||||
public static function onEvent(event:RecipesEvent) {
|
||||
for (i in removeByOutput) {
|
||||
event.remove({output: i});
|
||||
}
|
||||
|
||||
shapedRecipes(event);
|
||||
shapelessRecipes(event);
|
||||
customRecipes(event);
|
||||
}
|
||||
|
||||
static function shapedRecipes(event:RecipesEvent) {
|
||||
event.shaped("alchemistry:chemical_combiner", ["SSS", "ACA", "SSS"], {
|
||||
S: "#forge:ingots/steel",
|
||||
C: "mekanism:chemical_crystallizer",
|
||||
A: "mekanism:alloy_atomic"
|
||||
});
|
||||
|
||||
event.shaped("alchemistry:chemical_dissolver", ["SSS", "ACA", "SSS"], {
|
||||
S: "#forge:ingots/steel",
|
||||
C: "mekanism:chemical_dissolution_chamber",
|
||||
A: "mekanism:alloy_atomic"
|
||||
});
|
||||
|
||||
event.shaped("compactmachines:wall", ["TTT", "TCT", "TTT"], {
|
||||
T: "chemlib:ingot_thorium",
|
||||
C: "#forge:ingots/chromium"
|
||||
});
|
||||
|
||||
event.shaped("compactmachines:machine_tiny", ["CCC", "CTC", "CCC"], {
|
||||
T: "mekanism:teleportation_core",
|
||||
C: "compactmachines:wall"
|
||||
});
|
||||
|
||||
event.shaped("compactmachines:machine_small", ["CCC", "CMC", "CCC"], {
|
||||
M: "compactmachines:machine_tiny",
|
||||
C: "compactmachines:wall"
|
||||
});
|
||||
|
||||
event.shaped("compactmachines:machine_normal", ["CCC", "CMC", "CCC"], {
|
||||
M: "compactmachines:machine_small",
|
||||
C: "compactmachines:wall"
|
||||
});
|
||||
|
||||
event.shaped("compactmachines:machine_large", ["CCC", "CMC", "CCC"], {
|
||||
M: "compactmachines:machine_normal",
|
||||
C: "compactmachines:wall"
|
||||
});
|
||||
|
||||
event.shaped("compactmachines:machine_giant", ["CCC", "CMC", "CCC"], {
|
||||
M: "compactmachines:machine_large",
|
||||
C: "compactmachines:wall"
|
||||
});
|
||||
|
||||
event.shaped("compactmachines:machine_maximum", ["CCC", "CMC", "CCC"], {
|
||||
M: "compactmachines:machine_giant",
|
||||
C: "compactmachines:wall"
|
||||
});
|
||||
|
||||
event.shaped("compactmachines:personal_shrinking_device", ["III", "ICI", "TTT"], {
|
||||
T: "mekanism:teleportation_core",
|
||||
C: "#forge:ingots/chromium",
|
||||
I: "#forge:ingots"
|
||||
});
|
||||
|
||||
event.shaped("ring_of_teleport:ring_of_teleport", ["EM ", "M M", " M "], {
|
||||
E: "#forge:ender_pearls",
|
||||
M: "botania:manasteel_ingot"
|
||||
});
|
||||
|
||||
event.shaped("ring_of_enderchest:ring_of_enderchest", ["EM ", "M M", " M "], {
|
||||
E: "#forge:chests/ender",
|
||||
M: "botania:manasteel_ingot"
|
||||
});
|
||||
|
||||
event.shaped("ring_of_repair:ring_of_repair", ["ME ", "E E", " E "], {
|
||||
M: Item.of("minecraft:enchanted_book", 1, {StoredEnchantments: [{lvl: 1, id: "minecraft:mending"}]}),
|
||||
E: "botania:elementium_ingot"
|
||||
});
|
||||
|
||||
event.shaped("angelring:itemring", ["WGW", "GRG", "TGT"], {
|
||||
G: "minecraft:gold_ingot",
|
||||
R: "angelring:itemdiamondring",
|
||||
W: "forbidden_arcanus:bat_wing",
|
||||
T: "minecraft:ghast_tear"
|
||||
});
|
||||
|
||||
event.shaped("angelring:itemdiamondring", ["DED", "ECE", "DED"], {
|
||||
C: "minecraft:nether_star",
|
||||
E: "botania:manasteel_ingot",
|
||||
D: "minecraft:diamond_block"
|
||||
});
|
||||
|
||||
event.shaped("angelring:itemdiamondring", ["DED", "ECE", "DED"], {
|
||||
C: "minecraft:elytra",
|
||||
E: "botania:manasteel_ingot",
|
||||
D: "minecraft:diamond_block"
|
||||
});
|
||||
|
||||
event.shaped(Item.of("minecraft:chest", 4), ["WWW", "W W", "WWW"], {
|
||||
W: "#minecraft:logs"
|
||||
});
|
||||
|
||||
event.shaped(Item.of("minecraft:stick", 16), ["W", "W"], {
|
||||
W: "#minecraft:logs"
|
||||
});
|
||||
|
||||
event.shaped("minecraft:hopper", ["IWI", "IWI", " I "], {I: "#forge:ingots/iron", W: "#minecraft:logs"});
|
||||
|
||||
event.shaped("minecraft:repeater", ["R R", "SRS", "sss"], {R: "#forge:dusts/redstone", S: "#forge:rods/wooden", s: "minecraft:stone"});
|
||||
|
||||
event.shaped("enderrift:rift", ["LEL", "ECE", "LEL"], {
|
||||
L: "#forge:ingots/lawrencium",
|
||||
E: "minecraft:ender_eye",
|
||||
C: "mekanism:teleportation_core"
|
||||
});
|
||||
|
||||
// Steel Fix
|
||||
event.shaped("assemblylinemachines:simple_grinder", ["sss", "rdr", "iii"], {
|
||||
s: "#forge:ingots/steel",
|
||||
i: "#forge:ingots/iron",
|
||||
r: "#forge:dusts/redstone",
|
||||
d: "assemblylinemachines:hand_grinder"
|
||||
});
|
||||
|
||||
event.shaped("assemblylinemachines:steel_blade_piece", [" y ", "yxy"], {
|
||||
x: "#forge:ingots/steel",
|
||||
y: "#forge:nuggets/steel"
|
||||
});
|
||||
|
||||
event.shaped("assemblylinemachines:steel_fluid_tank", ["rsr", "gwg", "rsr"], {
|
||||
r: "assemblylinemachines:steel_rod",
|
||||
g: "#forge:glass_panes",
|
||||
s: "#forge:ingots/steel",
|
||||
w: "assemblylinemachines:wooden_fluid_tank"
|
||||
});
|
||||
}
|
||||
|
||||
static function shapelessRecipes(event:RecipesEvent) {
|
||||
event.shapeless("ring_of_blink:ring_of_blink", ["ring_of_teleport:ring_of_teleport", "botania:terrasteel_ingot"]);
|
||||
}
|
||||
|
||||
static function customRecipes(event:RecipesEvent) {
|
||||
// Steel plate with multiservo press
|
||||
event.custom({
|
||||
type: "thermal:press",
|
||||
ingredient: {
|
||||
tag: "forge:ingots/steel"
|
||||
},
|
||||
result: [
|
||||
{
|
||||
item: "immersiveengineering:plate_steel"
|
||||
}
|
||||
]
|
||||
});
|
||||
|
||||
// Certus Quartz dust with pulverizer
|
||||
event.custom({
|
||||
type: "thermal:pulverizer",
|
||||
ingredient: {
|
||||
tag: "forge:gems/certus_quartz"
|
||||
},
|
||||
result: [
|
||||
{
|
||||
item: "appliedenergistics2:certus_quartz_dust"
|
||||
}
|
||||
]
|
||||
});
|
||||
}
|
||||
}
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
{
|
||||
"type": "thermal:press",
|
||||
"ingredient": {
|
||||
"tag": "forge:ingots/steel"
|
||||
},
|
||||
"result": [
|
||||
{
|
||||
"item": "immersiveengineering:plate_steel"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
{
|
||||
"type": "thermal:pulverizer",
|
||||
"ingredient": {
|
||||
"tag": "forge:gems/certus_quartz"
|
||||
},
|
||||
"result": [
|
||||
{
|
||||
"item": "appliedenergistics2:certus_quartz_dust",
|
||||
"count": 1
|
||||
}
|
||||
],
|
||||
"energy_mod": 0.5
|
||||
}
|
||||
Loading…
Reference in a new issue