diff --git a/overrides/resources/contenttweaker/textures/items/tiernineship_stabilized.png b/overrides/resources/contenttweaker/textures/items/tiernineship_stabilized.png deleted file mode 100644 index 452c8b2..0000000 Binary files a/overrides/resources/contenttweaker/textures/items/tiernineship_stabilized.png and /dev/null differ diff --git a/overrides/resources/contenttweaker/textures/items/tiernineship_stabilized.png.mcmeta b/overrides/resources/contenttweaker/textures/items/tiernineship_stabilized.png.mcmeta deleted file mode 100644 index ce30804..0000000 --- a/overrides/resources/contenttweaker/textures/items/tiernineship_stabilized.png.mcmeta +++ /dev/null @@ -1,51 +0,0 @@ -{ - "animation": { - "interpolate": true, - "frametime": 5, - "frames": [ - { - "index": 0, - "time": 3 - }, - { - "index": 1, - "time": 3 - }, - { - "index": 2, - "time": 3 - }, - { - "index": 3, - "time": 2 - }, - { - "index": 4, - "time": 2 - }, - 5, - 6, - 7, - 8, - 7, - 6, - 5, - { - "index": 4, - "time": 2 - }, - { - "index": 3, - "time": 2 - }, - { - "index": 2, - "time": 3 - }, - { - "index": 1, - "time": 3 - } - ] - } -} \ No newline at end of file diff --git a/overrides/resources/contenttweaker/textures/items/tiernineship_stabilized_matter.png b/overrides/resources/contenttweaker/textures/items/tiernineship_stabilized_matter.png deleted file mode 100644 index 53d4b87..0000000 Binary files a/overrides/resources/contenttweaker/textures/items/tiernineship_stabilized_matter.png and /dev/null differ diff --git a/overrides/resources/contenttweaker/textures/items/tiertenship_stabilized.png b/overrides/resources/contenttweaker/textures/items/tiertenship_stabilized.png deleted file mode 100644 index 5fa5c10..0000000 Binary files a/overrides/resources/contenttweaker/textures/items/tiertenship_stabilized.png and /dev/null differ diff --git a/overrides/resources/contenttweaker/textures/items/tiertenship_stabilized.png.mcmeta b/overrides/resources/contenttweaker/textures/items/tiertenship_stabilized.png.mcmeta deleted file mode 100644 index ce30804..0000000 --- a/overrides/resources/contenttweaker/textures/items/tiertenship_stabilized.png.mcmeta +++ /dev/null @@ -1,51 +0,0 @@ -{ - "animation": { - "interpolate": true, - "frametime": 5, - "frames": [ - { - "index": 0, - "time": 3 - }, - { - "index": 1, - "time": 3 - }, - { - "index": 2, - "time": 3 - }, - { - "index": 3, - "time": 2 - }, - { - "index": 4, - "time": 2 - }, - 5, - 6, - 7, - 8, - 7, - 6, - 5, - { - "index": 4, - "time": 2 - }, - { - "index": 3, - "time": 2 - }, - { - "index": 2, - "time": 3 - }, - { - "index": 1, - "time": 3 - } - ] - } -} \ No newline at end of file diff --git a/overrides/resources/contenttweaker/textures/items/tiertenship_stabilized_matter.png b/overrides/resources/contenttweaker/textures/items/tiertenship_stabilized_matter.png deleted file mode 100644 index 3a132ad..0000000 Binary files a/overrides/resources/contenttweaker/textures/items/tiertenship_stabilized_matter.png and /dev/null differ diff --git a/overrides/scripts/ContentTweaker.zs b/overrides/scripts/ContentTweaker.zs index 7ca8401..c417a99 100644 --- a/overrides/scripts/ContentTweaker.zs +++ b/overrides/scripts/ContentTweaker.zs @@ -594,17 +594,6 @@ tierfourship_stabilized_matter.glowing = true; tierfourship_stabilized_matter.maxStackSize = 64; tierfourship_stabilized_matter.register(); -var tiernineship_stabilized = VanillaFactory.createItem("tiernineship_stabilized"); -tiernineship_stabilized.rarity = "epic"; -tiernineship_stabilized.maxStackSize = 1; -tiernineship_stabilized.register(); - -var tiernineship_stabilized_matter = VanillaFactory.createItem("tiernineship_stabilized_matter"); -tiernineship_stabilized_matter.rarity = "epic"; -tiernineship_stabilized_matter.glowing = true; -tiernineship_stabilized_matter.maxStackSize = 64; -tiernineship_stabilized_matter.register(); - var tieroneship_stabilized = VanillaFactory.createItem("tieroneship_stabilized"); tieroneship_stabilized.rarity = "epic"; tieroneship_stabilized.maxStackSize = 1; @@ -638,17 +627,6 @@ tiersixship_stabilized_matter.glowing = true; tiersixship_stabilized_matter.maxStackSize = 64; tiersixship_stabilized_matter.register(); -var tiertenship_stabilized = VanillaFactory.createItem("tiertenship_stabilized"); -tiertenship_stabilized.rarity = "epic"; -tiertenship_stabilized.maxStackSize = 1; -tiertenship_stabilized.register(); - -var tiertenship_stabilized_matter = VanillaFactory.createItem("tiertenship_stabilized_matter"); -tiertenship_stabilized_matter.rarity = "epic"; -tiertenship_stabilized_matter.glowing = true; -tiertenship_stabilized_matter.maxStackSize = 64; -tiertenship_stabilized_matter.register(); - var tierthreeship_stabilized = VanillaFactory.createItem("tierthreeship_stabilized"); tierthreeship_stabilized.rarity = "epic"; tierthreeship_stabilized.maxStackSize = 1; diff --git a/overrides/scripts/Endgame.zs b/overrides/scripts/Endgame.zs index 6b85ff3..07d7b25 100644 --- a/overrides/scripts/Endgame.zs +++ b/overrides/scripts/Endgame.zs @@ -332,89 +332,73 @@ assembler.recipeBuilder() .duration(100).EUt(30).buildAndRegister(); // Stabilized Miners Tooltips +.addTooltip(format.italic( + format.white("A stabilized version, injected with a Heart of a Universe."))); +.addTooltip(format.italic( + format.white("Lasts indefinitely. Reusable. Totally not overpowered."))); +.addTooltip(format.italic( + format.white("It looks oddly familiar."))); + + +.addTooltip(format.italic( + format.white("A stabilized version, injected with a Heart of a Universe."))); +.addTooltip(format.italic( + format.white("Lasts indefinitely. Reusable. Totally not overpowered."))); +.addTooltip(format.italic( + format.white("It looks oddly familiar."))); + + +.addTooltip(format.italic( + format.white("A stabilized version, injected with a Heart of a Universe."))); +.addTooltip(format.italic( + format.white("Lasts indefinitely. Reusable. Totally not overpowered."))); +.addTooltip(format.italic( + format.white("It looks oddly familiar."))); + + +.addTooltip(format.italic( + format.white("A stabilized version, injected with a Heart of a Universe."))); +.addTooltip(format.italic( + format.white("Lasts indefinitely. Reusable. Totally not overpowered."))); +.addTooltip(format.italic( + format.white("It looks oddly familiar."))); + + +.addTooltip(format.italic( + format.white("A stabilized version, injected with a Heart of a Universe."))); +.addTooltip(format.italic( + format.white("Lasts indefinitely. Reusable. Totally not overpowered."))); +.addTooltip(format.italic( + format.white("It looks oddly familiar."))); + + +.addTooltip(format.italic( + format.white("A stabilized version, injected with a Heart of a Universe."))); +.addTooltip(format.italic( + format.white("Lasts indefinitely. Reusable. Totally not overpowered."))); +.addTooltip(format.italic( + format.white("It looks oddly familiar."))); + + +.addTooltip(format.italic( + format.white("A stabilized version, injected with a Heart of a Universe."))); +.addTooltip(format.italic( + format.white("Lasts indefinitely. Reusable. Totally not overpowered."))); +.addTooltip(format.italic( + format.white("It looks oddly familiar."))); + + +.addTooltip(format.italic( + format.white("A stabilized version, injected with a Heart of a Universe."))); +.addTooltip(format.italic( + format.white("Lasts indefinitely. Reusable. Totally not overpowered."))); +.addTooltip(format.italic( + format.white("It looks oddly familiar."))); + + .addTooltip(format.italic( format.white("A stabilized version, injected with a Heart of a Universe."))); .addTooltip(format.italic( format.white("Lasts indefinitely. Reusable. Totally not overpowered."))); .addTooltip(format.italic( - format.white("It looks oddly familiar."))); - - -.addTooltip(format.italic( - format.white("A stabilized version, injected with a Heart of a Universe."))); -.addTooltip(format.italic( - format.white("Lasts indefinitely. Reusable. Totally not overpowered."))); -.addTooltip(format.italic( - format.white("It looks oddly familiar."))); - - -.addTooltip(format.italic( - format.white("A stabilized version, injected with a Heart of a Universe."))); -.addTooltip(format.italic( - format.white("Lasts indefinitely. Reusable. Totally not overpowered."))); -.addTooltip(format.italic( - format.white("It looks oddly familiar."))); - - -.addTooltip(format.italic( - format.white("A stabilized version, injected with a Heart of a Universe."))); -.addTooltip(format.italic( - format.white("Lasts indefinitely. Reusable. Totally not overpowered."))); -.addTooltip(format.italic( - format.white("It looks oddly familiar."))); - - -.addTooltip(format.italic( - format.white("A stabilized version, injected with a Heart of a Universe."))); -.addTooltip(format.italic( - format.white("Lasts indefinitely. Reusable. Totally not overpowered."))); -.addTooltip(format.italic( - format.white("It looks oddly familiar."))); - - -.addTooltip(format.italic( - format.white("A stabilized version, injected with a Heart of a Universe."))); -.addTooltip(format.italic( - format.white("Lasts indefinitely. Reusable. Totally not overpowered."))); -.addTooltip(format.italic( - format.white("It looks oddly familiar."))); - - -.addTooltip(format.italic( - format.white("A stabilized version, injected with a Heart of a Universe."))); -.addTooltip(format.italic( - format.white("Lasts indefinitely. Reusable. Totally not overpowered."))); -.addTooltip(format.italic( - format.white("It looks oddly familiar."))); - - -.addTooltip(format.italic( - format.white("A stabilized version, injected with a Heart of a Universe."))); -.addTooltip(format.italic( - format.white("Lasts indefinitely. Reusable. Totally not overpowered."))); -.addTooltip(format.italic( - format.white("It looks oddly familiar."))); - - -.addTooltip(format.italic( - format.white("A stabilized version, injected with a Heart of a Universe."))); -.addTooltip(format.italic( - format.white("Lasts indefinitely. Reusable. Totally not overpowered."))); -.addTooltip(format.italic( - format.white("It looks oddly familiar."))); - - -.addTooltip(format.italic( - format.white("A stabilized version, injected with a Heart of a Universe."))); -.addTooltip(format.italic( - format.white("Lasts indefinitely. Reusable. Totally not overpowered."))); -.addTooltip(format.italic( - format.white("It looks oddly familiar."))); - - -.addTooltip(format.italic( - format.white("A stabilized version, injected with a Heart of a Universe."))); -.addTooltip(format.italic( - format.white("Lasts indefinitely. Reusable. Totally not overpowered."))); -.addTooltip(format.italic( format.white("It looks oddly familiar."))); \ No newline at end of file diff --git a/overrides/scripts/Microverse.zs b/overrides/scripts/Microverse.zs index 92e2d3f..4d00289 100644 --- a/overrides/scripts/Microverse.zs +++ b/overrides/scripts/Microverse.zs @@ -24,8 +24,8 @@ makeShaped("of_tieroneship", , ); .addTooltip( - format.italic( - format.white("Harvests Titanium and other light metals from asteroids in the microverse."))); + format.white( + format.italic("Harvests Titanium and other light metals from asteroids in the microverse."))); // Tier 1 Guidance makeShaped("of_t1guidance", , @@ -364,22 +364,22 @@ fluid_extractor.recipeBuilder() format.italic("Harvests ultra cold materials from the deepest parts of empty space."))); .addTooltip(format.white( format.italic("Harvests strange materials from End microverses."))); -.addTooltip(format.italic( - format.white("Harvests extremely rare materials from every concievable reality."))); +.addTooltip(format.white( + format.italic("Harvests extremely rare materials from every concievable reality."))); .addTooltip(format.white( format.italic("Hunts Wyrms and End Dragons from the microverse"))); .addTooltip(format.white( format.italic("and returns with parts from their carapaces."))); -.addTooltip(format.italic( - format.white("Hunts inconcievable monstrosities from beyond the End"))); -.addTooltip(format.italic( - format.white("and returns with bizzare trinkets."))); -.addTooltip(format.italic( - format.white("Collapses microverse stars and harvests their delicious neutronium cores."))); -.addTooltip(format.italic( - format.white("Collapses an entire microverse and harvests it whole."))); -.addTooltip(format.italic( - format.white("Try to aim for uninhabited ones."))); +.addTooltip(format.white( + format.italic("Hunts inconcievable monstrosities from beyond the End"))); +.addTooltip(format.white( + format.italic("and returns with bizzare trinkets."))); +.addTooltip(format.white( + format.italic("Collapses microverse stars and harvests their delicious neutronium cores."))); +.addTooltip(format.white( + format.italic("Collapses an entire microverse and harvests it whole."))); +.addTooltip(format.white( + format.italic("Try to aim for uninhabited ones."))); // Dense Hydrogen diff --git a/overrides/scripts/_oreDict.zs b/overrides/scripts/_oreDict.zs index f7a55d3..c75ac88 100644 --- a/overrides/scripts/_oreDict.zs +++ b/overrides/scripts/_oreDict.zs @@ -2129,6 +2129,9 @@ mods.jei.JEI.removeAndHide(); //mods.jei.JEI.removeAndHide(); mods.jei.JEI.removeAndHide(); +// Extended Crafting Removals +mods.jei.JEI.removeAndHide(); + //Thermal Removals mods.jei.JEI.removeAndHide(); diff --git a/overrides/scripts/expertmode.zs b/overrides/scripts/expertmode.zs index 442d6a8..ca74c33 100644 --- a/overrides/scripts/expertmode.zs +++ b/overrides/scripts/expertmode.zs @@ -111,18 +111,38 @@ makeExtremeRecipe7(, I : } ); -// t8.5 mm -mods.extendedcrafting.TableCrafting.addShaped(, [ - [null, null, null, , , , null, null, null], - [null, null, , , , , , null, null], - [null, , , , , , , , null], - [null, , , , , , , , null], - [null, , , , , , , , null], - [, , , , , , , , ], - [, , , , , , , , ], - [, , , , , , , , ], - [null, , , , null, , , , null] -]); +.addTooltip( + format.white( + format.italic("Kills mobs in dangerous microverses and collects their highly prized skeletons and parts."))); + +///////////// Tier Eight and Half Space Ship ////////////////// +makeExtremeRecipe9(, + [" LLL ", + " LNNNL ", + " GNTTTNG ", + " NNTFTNN ", + " NTECETN ", + "NNTSFSTNN", + "NTTQAQTTN", + "NTTBABTTN", + " DDD DDD "], + { L : , + N : , + G : , + T : , + F : , + E : , + C : , + S : , + Q : , + A : , + B : , + D : } +); + +.addTooltip( + format.white( + format.italic("Harvests exclusive Gems and Metals from unexplored corners, from beyond the microverse."))); // Exchanging Gadget recipes.removeByRecipeName("buildinggadgets:exchangingtool"); diff --git a/overrides/scripts/multiblocks_expert.zs b/overrides/scripts/multiblocks_expert.zs index b17f0d7..250cd6d 100644 --- a/overrides/scripts/multiblocks_expert.zs +++ b/overrides/scripts/multiblocks_expert.zs @@ -1215,6 +1215,7 @@ actualization_chamber.recipeMap .outputs( * 64, * 64, * 64, + * 64, * 64, * 64, * 64, @@ -1228,6 +1229,17 @@ actualization_chamber.recipeMap .buildAndRegister(); +// t2 stellar creation data +actualization_chamber.recipeMap + .recipeBuilder() + .duration(780) + .EUt(30720) + .inputs() + .circuit(2) + .outputs( * 4) + .buildAndRegister(); + + // t3 gems actualization_chamber.recipeMap .recipeBuilder() @@ -1352,8 +1364,14 @@ actualization_chamber.recipeMap .EUt(30720) .inputs() .circuit(2) - .outputs( * 64, - * 64, + .outputs( * 50, + * 50, + * 50, + * 50, + * 50, + * 50, + * 50, + * 50, * 64, * 48, * 64, @@ -1487,7 +1505,7 @@ actualization_chamber.recipeMap .EUt(30720) .inputs() .circuit(1) - .outputs( * 4, + .outputs( * 32, * 64, * 64, * 64, diff --git a/overrides/scripts/normalmode.zs b/overrides/scripts/normalmode.zs index 57e651d..aa24222 100644 --- a/overrides/scripts/normalmode.zs +++ b/overrides/scripts/normalmode.zs @@ -757,16 +757,12 @@ mods.jei.JEI.removeAndHide(); mods.jei.JEI.removeAndHide(); mods.jei.JEI.removeAndHide(); mods.jei.JEI.removeAndHide(); -mods.jei.JEI.removeAndHide(); -mods.jei.JEI.removeAndHide(); mods.jei.JEI.removeAndHide(); mods.jei.JEI.removeAndHide(); mods.jei.JEI.removeAndHide(); mods.jei.JEI.removeAndHide(); mods.jei.JEI.removeAndHide(); mods.jei.JEI.removeAndHide(); -mods.jei.JEI.removeAndHide(); -mods.jei.JEI.removeAndHide(); mods.jei.JEI.removeAndHide(); mods.jei.JEI.removeAndHide(); mods.jei.JEI.removeAndHide();