diff --git a/src/modpack.json b/src/modpack.json index 2ca8085..291e32b 100644 --- a/src/modpack.json +++ b/src/modpack.json @@ -62,10 +62,10 @@ ] }, { - "id": "ftbguides", + "id": "guidebook", "file": { "installer": "internal.dir:mods", - "artifact": "curse.maven:317586:2827161", + "artifact": "curse.maven:253874:2989594", "repository": "curse" }, "type": "mod", @@ -1246,21 +1246,6 @@ "included" ] }, - { - "id": "294335", - "file": { - "installer": "internal.dir:mods", - "artifact": "curse.maven:294335:2624990", - "repository": "curse" - }, - "type": "mod", - "options": [ - "required", - "client", - "server", - "included" - ] - }, { "id": "245211", "file": { @@ -2207,10 +2192,10 @@ ] }, { - "id": "246760", + "id": "akashictome", "file": { "installer": "internal.dir:mods", - "artifact": "curse.maven:246760:2965308", + "artifact": "curse.maven:250577:2648656", "repository": "curse" }, "type": "mod", @@ -2390,7 +2375,7 @@ "id": "spackenmobs", "file": { "installer": "internal.dir:mods", - "link": "https://github.com/ACGaming/Spackenmobs/releases/download/RC3/Spackenmobs-1.12.2-RC3.jar" + "link": "https://github.com/ACGaming/Spackenmobs/releases/download/RC4/Spackenmobs-1.12.2-RC4.jar" }, "type": "mod", "options": [ diff --git a/src/overrides/config/books/dimensions.xml b/src/overrides/config/books/dimensions.xml new file mode 100644 index 0000000..ca90d2f --- /dev/null +++ b/src/overrides/config/books/dimensions.xml @@ -0,0 +1,14 @@ + + + + + +
+

+ Docs upcoming! +

+
+
+
diff --git a/src/overrides/oresources/akashictome/textures/items/tome.png b/src/overrides/oresources/akashictome/textures/items/tome.png new file mode 100644 index 0000000..b7deddd Binary files /dev/null and b/src/overrides/oresources/akashictome/textures/items/tome.png differ diff --git a/src/overrides/oresources/deeznuts/lang/de_de.lang b/src/overrides/oresources/deeznuts/lang/de_de.lang deleted file mode 100644 index 657551b..0000000 --- a/src/overrides/oresources/deeznuts/lang/de_de.lang +++ /dev/null @@ -1 +0,0 @@ -entity.dncreeper.name=Smava-Creeper \ No newline at end of file diff --git a/src/overrides/oresources/deeznuts/lang/en_us.lang b/src/overrides/oresources/deeznuts/lang/en_us.lang deleted file mode 100644 index 3512e2e..0000000 --- a/src/overrides/oresources/deeznuts/lang/en_us.lang +++ /dev/null @@ -1 +0,0 @@ -entity.dncreeper.name=Smava Creeper \ No newline at end of file diff --git a/src/overrides/oresources/deeznuts/sounds.json b/src/overrides/oresources/deeznuts/sounds.json deleted file mode 100644 index a0cd04c..0000000 --- a/src/overrides/oresources/deeznuts/sounds.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "entities.dncreeper.fuse": { - "sounds": [ - { "name": "deeznuts:fuse" } - ] - }, - "entities.dncreeper.blow": { - "sounds": [ - { "name": "deeznuts:blow" } - ] - }, - "entities.dncreeper.hurt": { - "sounds": [ - { "name": "deeznuts:hurt1" }, - { "name": "deeznuts:hurt2" }, - { "name": "deeznuts:hurt3" } - ] - } -} \ No newline at end of file diff --git a/src/overrides/oresources/deeznuts/sounds/blow.ogg b/src/overrides/oresources/deeznuts/sounds/blow.ogg deleted file mode 100644 index 00117b2..0000000 Binary files a/src/overrides/oresources/deeznuts/sounds/blow.ogg and /dev/null differ diff --git a/src/overrides/oresources/deeznuts/sounds/fuse.ogg b/src/overrides/oresources/deeznuts/sounds/fuse.ogg deleted file mode 100644 index 36f9a33..0000000 Binary files a/src/overrides/oresources/deeznuts/sounds/fuse.ogg and /dev/null differ diff --git a/src/overrides/oresources/deeznuts/sounds/hurt1.ogg b/src/overrides/oresources/deeznuts/sounds/hurt1.ogg deleted file mode 100644 index a599466..0000000 Binary files a/src/overrides/oresources/deeznuts/sounds/hurt1.ogg and /dev/null differ diff --git a/src/overrides/oresources/deeznuts/sounds/hurt2.ogg b/src/overrides/oresources/deeznuts/sounds/hurt2.ogg deleted file mode 100644 index a599466..0000000 Binary files a/src/overrides/oresources/deeznuts/sounds/hurt2.ogg and /dev/null differ diff --git a/src/overrides/oresources/deeznuts/sounds/hurt3.ogg b/src/overrides/oresources/deeznuts/sounds/hurt3.ogg deleted file mode 100644 index a599466..0000000 Binary files a/src/overrides/oresources/deeznuts/sounds/hurt3.ogg and /dev/null differ diff --git a/src/overrides/oresources/deeznuts/textures/entities/dncreeper.png b/src/overrides/oresources/deeznuts/textures/entities/dncreeper.png deleted file mode 100644 index c9f0a64..0000000 Binary files a/src/overrides/oresources/deeznuts/textures/entities/dncreeper.png and /dev/null differ diff --git a/src/overrides/oresources/dimdoors/sounds/creepy.ogg b/src/overrides/oresources/dimdoors/sounds/creepy.ogg new file mode 100644 index 0000000..ef2b38a Binary files /dev/null and b/src/overrides/oresources/dimdoors/sounds/creepy.ogg differ diff --git a/src/overrides/oresources/dimdoors/sounds/creepy_faded.ogg b/src/overrides/oresources/dimdoors/sounds/creepy_faded.ogg new file mode 100644 index 0000000..d792f46 Binary files /dev/null and b/src/overrides/oresources/dimdoors/sounds/creepy_faded.ogg differ diff --git a/src/overrides/oresources/dimdoors/textures/blocks/gold_door_lower.png b/src/overrides/oresources/dimdoors/textures/blocks/gold_door_lower.png new file mode 100644 index 0000000..e2fbb2c Binary files /dev/null and b/src/overrides/oresources/dimdoors/textures/blocks/gold_door_lower.png differ diff --git a/src/overrides/oresources/dimdoors/textures/blocks/gold_door_upper.png b/src/overrides/oresources/dimdoors/textures/blocks/gold_door_upper.png new file mode 100644 index 0000000..fa13ed2 Binary files /dev/null and b/src/overrides/oresources/dimdoors/textures/blocks/gold_door_upper.png differ diff --git a/src/overrides/oresources/dimdoors/textures/blocks/iron_dimensional_door_lower.png b/src/overrides/oresources/dimdoors/textures/blocks/iron_dimensional_door_lower.png new file mode 100644 index 0000000..d174896 Binary files /dev/null and b/src/overrides/oresources/dimdoors/textures/blocks/iron_dimensional_door_lower.png differ diff --git a/src/overrides/oresources/dimdoors/textures/blocks/iron_dimensional_door_upper.png b/src/overrides/oresources/dimdoors/textures/blocks/iron_dimensional_door_upper.png new file mode 100644 index 0000000..d174896 Binary files /dev/null and b/src/overrides/oresources/dimdoors/textures/blocks/iron_dimensional_door_upper.png differ diff --git a/src/overrides/oresources/dimdoors/textures/blocks/oak_dimensional_door_lower.png b/src/overrides/oresources/dimdoors/textures/blocks/oak_dimensional_door_lower.png new file mode 100644 index 0000000..77030e1 Binary files /dev/null and b/src/overrides/oresources/dimdoors/textures/blocks/oak_dimensional_door_lower.png differ diff --git a/src/overrides/oresources/dimdoors/textures/blocks/oak_dimensional_door_upper.png b/src/overrides/oresources/dimdoors/textures/blocks/oak_dimensional_door_upper.png new file mode 100644 index 0000000..87b2268 Binary files /dev/null and b/src/overrides/oresources/dimdoors/textures/blocks/oak_dimensional_door_upper.png differ diff --git a/src/overrides/oresources/dimdoors/textures/blocks/quartz_door_lower.png b/src/overrides/oresources/dimdoors/textures/blocks/quartz_door_lower.png new file mode 100644 index 0000000..cdc9c39 Binary files /dev/null and b/src/overrides/oresources/dimdoors/textures/blocks/quartz_door_lower.png differ diff --git a/src/overrides/oresources/dimdoors/textures/blocks/quartz_door_upper.png b/src/overrides/oresources/dimdoors/textures/blocks/quartz_door_upper.png new file mode 100644 index 0000000..2e90b2c Binary files /dev/null and b/src/overrides/oresources/dimdoors/textures/blocks/quartz_door_upper.png differ diff --git a/src/overrides/oresources/morecreeps/lang/en_us.lang b/src/overrides/oresources/morecreeps/lang/en_us.lang deleted file mode 100644 index 9594c4e..0000000 --- a/src/overrides/oresources/morecreeps/lang/en_us.lang +++ /dev/null @@ -1 +0,0 @@ -entity.morecreeps.lawyer_from_hell.name=Jens Faymann \ No newline at end of file diff --git a/src/overrides/oresources/morecreeps/textures/entity/lawyerfromhell.png b/src/overrides/oresources/morecreeps/textures/entity/lawyerfromhell.png deleted file mode 100644 index 980b240..0000000 Binary files a/src/overrides/oresources/morecreeps/textures/entity/lawyerfromhell.png and /dev/null differ diff --git a/src/overrides/oresources/morecreeps/textures/entity/lawyerfromhellundead.png b/src/overrides/oresources/morecreeps/textures/entity/lawyerfromhellundead.png deleted file mode 100644 index 3aaf29e..0000000 Binary files a/src/overrides/oresources/morecreeps/textures/entity/lawyerfromhellundead.png and /dev/null differ diff --git a/src/overrides/scripts/darkhold.zs b/src/overrides/scripts/darkhold.zs new file mode 100644 index 0000000..4b18adc --- /dev/null +++ b/src/overrides/scripts/darkhold.zs @@ -0,0 +1,30 @@ +recipes.remove(); +recipes.remove(); +recipes.remove(); +recipes.remove(); +recipes.remove(); +recipes.remove(); +recipes.removeShapeless(, []); +recipes.remove(); +recipes.remove(); +recipes.remove(); +recipes.remove(); +recipes.remove(); +recipes.remove(); +recipes.remove(); + +recipes.addShaped( * 4, [[, , ],[, .reuse(), ], [, , ]]); +recipes.addShaped( * 4, [[, , ],[, .reuse(), ], [, , ]]); + +recipes.addShaped(, [[, null, ],[null, , null], [, null, ]]); +recipes.addShaped(, [[null, null, null],[, , ], [null, null, null]]); +recipes.addShaped(, [[null, null, null],[, , ], [null, null, null]]); +recipes.addShapeless(, [.reuse(),.reuse(),.reuse(), ]); +recipes.addShaped(, [[, , ],[, , ], [, , ]]); +recipes.addShapeless(, [.reuse(), ]); +recipes.addShaped(, [[, , ],[, , ], [, , ]]); +recipes.addShaped(, [[, , ],[, , ], [, , ]]); +recipes.addShaped(, [[, , ],[, , ], [, , ]]); + + +recipes.addShaped(.withTag({"akashictome:is_morphing": 1 as byte, "akashictome:data": {tconstruct: {ForgeCaps: {"astralsorcery:cap_item_amulet_holder": {}}, id: "tconstruct:book", Count: 1 as byte, tag: {"akashictome:definedMod": "tconstruct"}, Damage: 0 as short}, cyclicmagic1: {ForgeCaps: {"astralsorcery:cap_item_amulet_holder": {AS_Amulet_HolderLeast: -6745258256678342408 as long, AS_Amulet_HolderMost: -4726178680506464381 as long}}, id: "cyclicmagic:book_ender", Count: 1 as byte, tag: {location_back: "7777,-62.0,70.0,291.0,0,", backCounter: 469, "akashictome:displayName": "Ender Book", "akashictome:definedMod": "cyclicmagic1", "akashictome:is_morphing": 1 as byte, display: {Name: "§rAkashic Tome (§aEnder Book§r)"}, loc_largest: 2}, Damage: 0 as short}, lightningcraft: {ForgeCaps: {"astralsorcery:cap_item_amulet_holder": {}}, id: "lightningcraft:guide", Count: 1 as byte, tag: {"akashictome:definedMod": "lightningcraft"}, Damage: 0 as short}, astralsorcery: {ForgeCaps: {"astralsorcery:cap_item_amulet_holder": {}}, id: "astralsorcery:itemjournal", Count: 1 as byte, tag: {"akashictome:definedMod": "astralsorcery"}, Damage: 0 as short}, conarm: {ForgeCaps: {"astralsorcery:cap_item_amulet_holder": {}}, id: "conarm:book", Count: 1 as byte, tag: {"akashictome:definedMod": "conarm"}, Damage: 0 as short}, ftbquests: {ForgeCaps: {"astralsorcery:cap_item_amulet_holder": {AS_Amulet_HolderLeast: -6745258256678342408 as long, AS_Amulet_HolderMost: -4726178680506464381 as long}}, id: "ftbquests:book", Count: 1 as byte, tag: {"akashictome:displayName": "Quest Book", "akashictome:definedMod": "ftbquests", "akashictome:is_morphing": 1 as byte, display: {Name: "§rAkashic Tome (§aQuest Book§r)"}}, Damage: 0 as short}, wizardry: {ForgeCaps: {"astralsorcery:cap_item_amulet_holder": {}}, id: "wizardry:book", Count: 1 as byte, tag: {"akashictome:definedMod": "wizardry"}, Damage: 0 as short}, gbook: {ForgeCaps: {"astralsorcery:cap_item_amulet_holder": {}}, id: "gbook:guidebook", Count: 1 as byte, tag: {"akashictome:definedMod": "gbook", Book: "gbook:dimensions.xml"}, Damage: 0 as short}, rftools: {ForgeCaps: {"astralsorcery:cap_item_amulet_holder": {}}, id: "rftools:rftools_manual", Count: 1 as byte, tag: {"akashictome:definedMod": "rftools"}, Damage: 0 as short}, deepmoblearning: {ForgeCaps: {"astralsorcery:cap_item_amulet_holder": {}}, id: "patchouli:guide_book", Count: 1 as byte, tag: {"akashictome:definedMod": "deepmoblearning", "patchouli:book": "deepmoblearning:book"}, Damage: 0 as short}, ebwizardry: {ForgeCaps: {"astralsorcery:cap_item_amulet_holder": {}}, id: "ebwizardry:wizard_handbook", Count: 1 as byte, tag: {"akashictome:definedMod": "ebwizardry"}, Damage: 0 as short}, rftools1: {ForgeCaps: {"astralsorcery:cap_item_amulet_holder": {}}, id: "rftools:rftools_shape_manual", Count: 1 as byte, tag: {"akashictome:definedMod": "rftools1"}, Damage: 0 as short}, rftools2: {ForgeCaps: {"astralsorcery:cap_item_amulet_holder": {}}, id: "rftoolsdim:rftoolsdim_manual", Count: 1 as byte, tag: {"akashictome:definedMod": "rftools2"}, Damage: 0 as short}, aether_legacy: {ForgeCaps: {"astralsorcery:cap_item_amulet_holder": {}}, id: "aether_legacy:lore_book", Count: 1 as byte, tag: {"akashictome:definedMod": "aether_legacy"}, Damage: 0 as short}, botania: {ForgeCaps: {"astralsorcery:cap_item_amulet_holder": {AS_Amulet_HolderLeast: -6745258256678342408 as long, AS_Amulet_HolderMost: -4726178680506464381 as long}}, id: "botania:lexicon", Count: 1 as byte, tag: {"knowledge.minecraft": 1 as byte, "akashictome:displayName": "Lexica Botania", "akashictome:definedMod": "botania", "akashictome:is_morphing": 1 as byte, display: {Name: "§rAkashic Tome (§aLexica Botania§r)"}, "knowledge.alfheim": 1 as byte, "knowledge.dream": 1 as byte, "knowledge.relic": 1 as byte}, Damage: 0 as short}, thaumcraft: {ForgeCaps: {"astralsorcery:cap_item_amulet_holder": {}}, id: "thaumcraft:thaumonomicon", Count: 1 as byte, tag: {"akashictome:definedMod": "thaumcraft"}, Damage: 0 as short}, extrautils2: {ForgeCaps: {"astralsorcery:cap_item_amulet_holder": {}}, id: "extrautils2:book", Count: 1 as byte, tag: {"akashictome:definedMod": "extrautils2"}, Damage: 0 as short}, thermalfoundation: {ForgeCaps: {"astralsorcery:cap_item_amulet_holder": {AS_Amulet_HolderLeast: -6745258256678342408 as long, AS_Amulet_HolderMost: -4726178680506464381 as long}}, id: "thermalfoundation:tome_lexicon", Count: 1 as byte, tag: {"akashictome:displayName": "Forge Lexicon", "akashictome:definedMod": "thermalfoundation", "akashictome:is_morphing": 1 as byte, display: {Name: "§rAkashic Tome (§aForge Lexicon§r)"}, Inventory: {}}, Damage: 0 as short}, actuallyadditions: {ForgeCaps: {"astralsorcery:cap_item_amulet_holder": {}}, id: "actuallyadditions:item_booklet", Count: 1 as byte, tag: {"akashictome:definedMod": "actuallyadditions"}, Damage: 0 as short}, bloodmagic: {ForgeCaps: {"astralsorcery:cap_item_amulet_holder": {}}, id: "guideapi:bloodmagic-guide", Count: 1 as byte, tag: {"akashictome:definedMod": "bloodmagic"}, Damage: 0 as short}, abyssalcraft: {ForgeCaps: {"astralsorcery:cap_item_amulet_holder": {AS_Amulet_HolderLeast: -6745258256678342408 as long, AS_Amulet_HolderMost: -4726178680506464381 as long}}, id: "abyssalcraft:abyssalnomicon", Count: 1 as byte, tag: {owner: "tilera", "akashictome:displayName": "Abyssalnomicon", "akashictome:definedMod": "abyssalcraft", "akashictome:is_morphing": 1 as byte, display: {Name: "§rAkashic Tome (§aAbyssalnomicon§r)"}, PotEnergy: 0.0 as float}, Damage: 0 as short}, cyclicmagic: {ForgeCaps: {"astralsorcery:cap_item_amulet_holder": {}}, id: "guideapi:cyclicmagic-guide", Count: 1 as byte, tag: {"akashictome:definedMod": "cyclicmagic"}, Damage: 0 as short}, openblocks: {id: "openblocks:info_book", Count: 1 as byte, tag: {"akashictome:definedMod": "openblocks"}, Damage: 0 as short}, lordcraft: {ForgeCaps: {"astralsorcery:cap_item_amulet_holder": {}}, id: "lordcraft:knowledge_book", Count: 1 as byte, tag: {"akashictome:definedMod": "lordcraft", tile_unlocked_17: 0 as byte, tile_unlocked_16: 0 as byte, tile_unlocked_19: 0 as byte, tile_unlocked_18: 0 as byte, tile_unlocked_31: 0 as byte, tile_unlocked_30: 0 as byte, tile_unlocked_11: 0 as byte, tile_unlocked_33: 0 as byte, tile_unlocked_10: 0 as byte, tile_unlocked_32: 0 as byte, tile_unlocked_13: 0 as byte, tile_unlocked_35: 0 as byte, tile_unlocked_12: 0 as byte, tile_unlocked_34: 0 as byte, tile_unlocked_15: 0 as byte, tile_unlocked_14: 0 as byte, tile_unlocked_8: 0 as byte, tile_unlocked_7: 0 as byte, tile_unlocked_9: 0 as byte, tile_unlocked_4: 0 as byte, tile_unlocked_3: 0 as byte, tile_unlocked_6: 0 as byte, tile_unlocked_5: 0 as byte, tile_unlocked_0: 0 as byte, tile_unlocked_28: 0 as byte, tile_unlocked_27: 0 as byte, tile_unlocked_2: 0 as byte, tile_unlocked_1: 0 as byte, tile_unlocked_29: 0 as byte, tile_unlocked_20: 0 as byte, tile_unlocked_22: 0 as byte, tile_unlocked_21: 0 as byte, tile_unlocked_24: 0 as byte, tile_unlocked_23: 0 as byte, tile_unlocked_26: 0 as byte, research_prog: -1, tile_unlocked_25: 0 as byte, research_ord: -1}, Damage: 0 as short}}}), [[, , ],[, , ], [, , ]]); diff --git a/src/overrides/scripts/dims.zs b/src/overrides/scripts/dims.zs index a4f56c5..9b902e2 100644 --- a/src/overrides/scripts/dims.zs +++ b/src/overrides/scripts/dims.zs @@ -108,7 +108,7 @@ mob.addItemInput( * 5); mob.addItemInput(.withTag({EntityName: "minecraft:creeper"})); mob.addItemInput(.withTag({EntityName: "minecraft:blaze"})); mob.addItemInput(.withTag({EntityName: "minecraft:enderman"})); -mob.addItemInput(.withTag({EntityName: "morecreeps:lawyer_from_hell"})); //To be replaced with "Jens Faymann" +mob.addItemInput(.withTag({EntityName: "spackenmobs:jens"})); //To be replaced with "Jens Faymann" mob.addItemInput(.withTag({EntityName: "erebus:erebus.wasp"})); mob.addItemInput(.withTag({EntityName: "midnight:nova"})); mob.addItemInput(.withTag({EntityName: "iceandfire:myrmex_royal"})); diff --git a/src/overrides/scripts/engine.zs b/src/overrides/scripts/engine.zs new file mode 100644 index 0000000..f057569 --- /dev/null +++ b/src/overrides/scripts/engine.zs @@ -0,0 +1,10 @@ +var i = 32; +while i > 0 { + var eng = mods.modularmachinery.RecipeBuilder.newBuilder("engine" + i, "engine", 1200, 33 - i); + eng.addEnergyPerTickInput(4 * i); + eng.addItemOutput( * i); + eng.addItemInput( * i); + eng.addMysticalMechanicsOutput(10 * i, 1200); + eng.build(); + i -= 1; +} diff --git a/src/overrides/scripts/names.zs b/src/overrides/scripts/names.zs new file mode 100644 index 0000000..c110f5b --- /dev/null +++ b/src/overrides/scripts/names.zs @@ -0,0 +1,11 @@ +.displayName = "Space Monolith"; +.displayName = "Pure Space Monolith"; +.displayName = "Broken Space Monolith"; +.displayName = "Time Monolith"; +.displayName = "Creation Monolith"; +.displayName = "Grey Limestone Monolith"; +.displayName = "White Limestone Monolith"; +.displayName = "World Thread"; +.displayName = "Darkhold"; +.displayName = "Dark Matter Ingot"; +.displayName = "Quantum Ingot"; diff --git a/src/overrides/scripts/recipes.zs b/src/overrides/scripts/recipe.zs similarity index 100% rename from src/overrides/scripts/recipes.zs rename to src/overrides/scripts/recipe.zs