diff --git a/scripts/CustomBlockDrops.zs b/scripts/CustomBlockDrops.zs index a3a43838..21dc6d5d 100644 --- a/scripts/CustomBlockDrops.zs +++ b/scripts/CustomBlockDrops.zs @@ -186,262 +186,6 @@ events.onBlockHarvestDrops(function (event as BlockHarvestDropsEvent) { -events.onBlockHarvestDrops(function (event as BlockHarvestDropsEvent) { - if ("extratrees:leaves.default.0".matches(event.block.definition.id)) { - if (event.silkTouch) { - event.drops = []; - } else { - return; - } - } -}); - -events.onBlockHarvestDrops(function (event as BlockHarvestDropsEvent) { - if ("extratrees:leaves.default.1".matches(event.block.definition.id)) { - if (event.silkTouch) { - event.drops = []; - } else { - return; - } - } -}); - -events.onBlockHarvestDrops(function (event as BlockHarvestDropsEvent) { - if ("extratrees:leaves.default.2".matches(event.block.definition.id)) { - if (event.silkTouch) { - event.drops = []; - } else { - return; - } - } -}); - -events.onBlockHarvestDrops(function (event as BlockHarvestDropsEvent) { - if ("extratrees:leaves.default.3".matches(event.block.definition.id)) { - if (event.silkTouch) { - event.drops = []; - } else { - return; - } - } -}); - -events.onBlockHarvestDrops(function (event as BlockHarvestDropsEvent) { - if ("extratrees:leaves.default.4".matches(event.block.definition.id)) { - if (event.silkTouch) { - event.drops = []; - } else { - return; - } - } -}); - -events.onBlockHarvestDrops(function (event as BlockHarvestDropsEvent) { - if ("extratrees:leaves.default.5".matches(event.block.definition.id)) { - if (event.silkTouch) { - event.drops = []; - } else { - return; - } - } -}); - -events.onBlockHarvestDrops(function (event as BlockHarvestDropsEvent) { - if ("extratrees:leaves.default.6".matches(event.block.definition.id)) { - if (event.silkTouch) { - event.drops = []; - } else { - return; - } - } -}); -import crafttweaker.item.IItemStack; -import crafttweaker.events.IEventManager; -import crafttweaker.event.BlockHarvestDropsEvent; -import crafttweaker.event.IBlockEvent; -import crafttweaker.world.IWorld; -import crafttweaker.event.PlayerBreakSpeedEvent; - - - - - -events.onBlockHarvestDrops(function (event as BlockHarvestDropsEvent) { - if ("railcraft:ore".matches(event.block.definition.id)) { - if (event.block.meta == 0){ - if (event.silkTouch) { - return; - } else { - event.drops = [*3]; - } - } - } -}); - -events.onBlockHarvestDrops(function (event as BlockHarvestDropsEvent) { - if ("railcraft:ore".matches(event.block.definition.id)) { - if (event.block.meta == 1){ - if (event.silkTouch) { - return; - } else { - event.drops = [*3]; - } - } - } -}); - - -events.onBlockHarvestDrops(function (event as BlockHarvestDropsEvent) { - if ("abyssalcraft:nitreore".matches(event.block.definition.id)) { - if (event.silkTouch) { - return; - } else { - event.drops = [*1]; - } - } -}); -events.onBlockHarvestDrops(function (event as BlockHarvestDropsEvent) { - if ("abyssalcraft:abynitore".matches(event.block.definition.id)) { - if (event.silkTouch) { - return; - } else { - event.drops = [*2]; - } - } -}); - -events.onBlockHarvestDrops(function (event as BlockHarvestDropsEvent) { - if ("forestry:leaves.default.0".matches(event.block.definition.id)) { - if (event.silkTouch) { - event.drops = []; - } else { - return; - } - } -}); - -events.onBlockHarvestDrops(function (event as BlockHarvestDropsEvent) { - if ("forestry:leaves.default.1".matches(event.block.definition.id)) { - if (event.silkTouch) { - event.drops = []; - } else { - return; - } - } -}); - -events.onBlockHarvestDrops(function (event as BlockHarvestDropsEvent) { - if ("forestry:leaves.default.2".matches(event.block.definition.id)) { - if (event.silkTouch) { - event.drops = []; - } else { - return; - } - } -}); - -events.onBlockHarvestDrops(function (event as BlockHarvestDropsEvent) { - if ("forestry:leaves.default.3".matches(event.block.definition.id)) { - if (event.silkTouch) { - event.drops = []; - } else { - return; - } - } -}); - -events.onBlockHarvestDrops(function (event as BlockHarvestDropsEvent) { - if ("forestry:leaves.default.4".matches(event.block.definition.id)) { - if (event.silkTouch) { - event.drops = []; - } else { - return; - } - } -}); - -events.onBlockHarvestDrops(function (event as BlockHarvestDropsEvent) { - if ("forestry:leaves.default.5".matches(event.block.definition.id)) { - if (event.silkTouch) { - event.drops = []; - } else { - return; - } - } -}); - -events.onBlockHarvestDrops(function (event as BlockHarvestDropsEvent) { - if ("forestry:leaves.default.6".matches(event.block.definition.id)) { - if (event.silkTouch) { - event.drops = []; - } else { - return; - } - } -}); - -events.onBlockHarvestDrops(function (event as BlockHarvestDropsEvent) { - if ("forestry:leaves.default.7".matches(event.block.definition.id)) { - if (event.silkTouch) { - event.drops = []; - } else { - return; - } - } -}); - -events.onBlockHarvestDrops(function (event as BlockHarvestDropsEvent) { - if ("forestry:leaves.default.8".matches(event.block.definition.id)) { - if (event.silkTouch) { - event.drops = []; - } else { - return; - } - } -}); - -events.onBlockHarvestDrops(function (event as BlockHarvestDropsEvent) { - if ("forestry:leaves.default.fruit.0".matches(event.block.definition.id)) { - if (event.silkTouch) { - event.drops = []; - } else { - return; - } - } -}); - -events.onBlockHarvestDrops(function (event as BlockHarvestDropsEvent) { - if ("forestry:leaves.default.fruit.1".matches(event.block.definition.id)) { - if (event.silkTouch) { - event.drops = []; - } else { - return; - } - } -}); - -events.onBlockHarvestDrops(function (event as BlockHarvestDropsEvent) { - if ("forestry:leaves.default.fruit.2".matches(event.block.definition.id)) { - if (event.silkTouch) { - event.drops = []; - } else { - return; - } - } -}); - -events.onBlockHarvestDrops(function (event as BlockHarvestDropsEvent) { - if ("forestry:leaves.default.fruit.3".matches(event.block.definition.id)) { - if (event.silkTouch) { - event.drops = []; - } else { - return; - } - } -}); - - - events.onBlockHarvestDrops(function (event as BlockHarvestDropsEvent) { if ("extratrees:leaves.default.0".matches(event.block.definition.id)) { if (event.silkTouch) { diff --git a/scripts/GameStagesItems.zs b/scripts/GameStagesItems.zs index 8bedbfa8..14089beb 100644 --- a/scripts/GameStagesItems.zs +++ b/scripts/GameStagesItems.zs @@ -9,7 +9,9 @@ mods.ItemStages.stageEnchant("bloodmasterstage", ); -mods.ItemStages.stageEnchant("lostcitiesstage", ); +mods.ItemStages.stageEnchant("brightsteelforging", ); + +mods.ItemStages.stageEnchant("camerastage", ); mods.ItemStages.addItemStage("camerastage", ); mods.ItemStages.addItemStage("camerastage", ); diff --git a/scripts/RandomThings.zs b/scripts/RandomThings.zs index 593389d2..8d75ba0d 100644 --- a/scripts/RandomThings.zs +++ b/scripts/RandomThings.zs @@ -26,4 +26,11 @@ divinationodoredict.add(); recipes.addShaped(, [[, , ], [, , ], -[, , ]]); \ No newline at end of file +[, , ]]); + + +recipes.remove(); +recipes.addShaped(, +[[, , ], +[, , ], +[, , ]]); \ No newline at end of file diff --git a/scripts/RecipeConflicts.zs b/scripts/RecipeConflicts.zs index 31e738db..00998098 100644 --- a/scripts/RecipeConflicts.zs +++ b/scripts/RecipeConflicts.zs @@ -1409,6 +1409,12 @@ recipes.addShapeless(, recipes.addShapeless(, []); +recipes.addShapeless(, +[]); + +recipes.addShapeless(, +[]); + recipes.addShapeless(, []); @@ -2096,7 +2102,7 @@ recipes.addShapeless(, , ]); -mods.nuclearcraft.melter.addRecipe([, *144]); +// mods.nuclearcraft.melter.addRecipe([, *144]); recipes.remove(); @@ -2187,3 +2193,260 @@ mods.nuclearcraft.infuser.addRecipe([, , *144]); +recipes.remove(); + + +recipes.addShapeless(, +[, ]); +recipes.addShapeless(, +[, ]); +recipes.addShapeless(, +[, ]); +recipes.addShapeless(, +[, ]); +recipes.addShapeless(, +[, ]); +recipes.addShapeless(, +[, ]); +recipes.addShapeless(, +[, ]); +recipes.addShapeless(, +[, ]); +recipes.addShapeless(, +[, ]); +recipes.addShapeless(, +[, ]); +recipes.addShapeless(, +[, ]); +recipes.addShapeless(, +[, ]); +recipes.addShapeless(, +[, ]); +recipes.addShapeless(, +[, ]); +recipes.addShapeless(, +[, ]); + + +mods.nuclearcraft.melter.addRecipe([, *360]); + + +// mods.immersiveengineering.ArcFurnace.removeRecipe(); +mods.immersiveengineering.ArcFurnace.removeRecipe(); +mods.immersiveengineering.ArcFurnace.removeRecipe(); + + +brewing.removeRecipe(.withTag({Potion: "mod_lavacow:strong_corrosive"}), ); + +brewing.addBrew(.withTag({Potion: "mod_lavacow:corrosive"}), , .withTag({Potion: "mod_lavacow:strong_corrosive"})); + + + +brewing.removeRecipe(.withTag({Potion: "extrautils2:xu2.doom"}), ); + + +recipes.remove(); +recipes.addShaped(*4, +[[, , null], +[, , ], +[null, , ]]); + + +recipes.addShapeless(, +[, , , ]); + +recipes.addShapeless(, +[, , , ]); + +recipes.addShapeless(, +[, , , ]); + +recipes.addShapeless(, +[, , , ]); + +recipes.addShapeless(, +[, , , ]); + +recipes.addShapeless(, +[, , , ]); + +recipes.addShapeless(, +[, , , ]); + +recipes.addShapeless(, +[, , , ]); + +recipes.addShapeless(, +[, , , ]); + +recipes.addShapeless(, +[, , , ]); + +recipes.addShapeless(, +[, , , ]); + +recipes.addShapeless(, +[, , , ]); + +recipes.addShapeless(, +[, , , ]); + +mods.nuclearcraft.manufactory.addRecipe([, *2]); + +recipes.remove(); + +recipes.addShaped(*8, +[[, null, ], +[null, , null]]); + +recipes.addShapeless(, +[]); + + +recipes.addShapeless(, +[]); +recipes.addShapeless(, +[]); +recipes.addShapeless(, +[]); +recipes.addShapeless(, +[]); +recipes.addShapeless(, +[]); +recipes.addShapeless(, +[]); +recipes.addShapeless(, +[]); +recipes.addShapeless(, +[]); +recipes.addShapeless(, +[]); +recipes.addShapeless(, +[]); +recipes.addShapeless(, +[]); +recipes.addShapeless(, +[]); + + +mods.nuclearcraft.alloy_furnace.addRecipe([, , ]); + + +recipes.addShapeless(, +[, ]); +recipes.addShapeless(, +[, ]); +recipes.addShapeless(, +[, ]); +recipes.addShapeless(, +[, ]); +recipes.addShapeless(, +[, ]); +recipes.addShapeless(, +[, ]); +recipes.addShapeless(, +[, ]); +recipes.addShapeless(, +[, ]); +recipes.addShapeless(, +[, ]); +recipes.addShapeless(, +[, ]); +recipes.addShapeless(, +[, ]); +recipes.addShapeless(, +[, ]); +recipes.addShapeless(, +[, ]); +recipes.addShapeless(, +[, ]); +recipes.addShapeless(, +[, ]); +recipes.addShapeless(, +[, ]); +recipes.addShapeless(, +[, ]); +recipes.addShapeless(, +[, ]); +recipes.addShapeless(, +[, ]); +recipes.addShapeless(, +[, ]); +recipes.addShapeless(, +[, ]); +recipes.addShapeless(, +[, ]); +recipes.addShapeless(, +[, ]); +recipes.addShapeless(, +[, ]); +recipes.addShapeless(, +[, ]); + + +recipes.addShapeless(, +[, , , , ]); +recipes.addShapeless(, +[, , , , ]); +recipes.addShapeless(, +[, , , , ]); +recipes.addShapeless(, +[, , , , ]); +recipes.addShapeless(, +[, , , , ]); +recipes.addShapeless(, +[, , , , ]); +recipes.addShapeless(, +[, , , , ]); +recipes.addShapeless(, +[, , , , ]); +recipes.addShapeless(, +[, , , , ]); +recipes.addShapeless(, +[, , , , ]); +recipes.addShapeless(, +[, , , , ]); +recipes.addShapeless(, +[, , , , ]); +recipes.addShapeless(, +[, , , , ]); +recipes.addShapeless(, +[, , , , ]); + + +recipes.addShapeless(, +[, , , , , ]); +recipes.addShapeless(, +[, , , , , ]); +recipes.addShapeless(, +[, , , , , ]); +recipes.addShapeless(, +[, , , , , ]); +recipes.addShapeless(, +[, , , , , ]); +recipes.addShapeless(, +[, , , , , ]); +recipes.addShapeless(, +[, , , , , ]); +recipes.addShapeless(, +[, , , , , ]); +recipes.addShapeless(, +[, , , , , ]); +recipes.addShapeless(, +[, , , , , ]); +recipes.addShapeless(, +[, , , , , ]); +recipes.addShapeless(, +[, , , , , ]); +recipes.addShapeless(, +[, , , , , ]); +recipes.addShapeless(, +[, , , , , ]); +recipes.addShapeless(, +[, , , , , ]); +recipes.addShapeless(, +[, , , , , ]); + + + +mods.nuclearcraft.dissolver.addRecipe([, , ]); diff --git a/scripts/ToolTips.zs b/scripts/ToolTips.zs index 1f5f20fd..4c2c9d15 100644 --- a/scripts/ToolTips.zs +++ b/scripts/ToolTips.zs @@ -1689,7 +1689,7 @@ .addTooltip(format.red("Light喜欢均等消耗物品!")); -.addTooltip(format.red("警告:不要为试验假人穿戴盔甲,会导致bug")); +.addTooltip(format.red("警告:不要为试验假人穿戴盔甲,会导致bug")); .addTooltip(format.red("感谢Vamael搞清楚了护盾属性!")); @@ -1849,6 +1849,10 @@ .addTooltip(format.red("感谢NerdySpider绘制的纹理!")); .addTooltip(format.red("感谢NerdySpider绘制的纹理!")); +.addTooltip(format.red("感谢NerdySpider绘制的纹理!")); +.addTooltip(format.red("感谢NerdySpider绘制的纹理!")); +.addTooltip(format.red("感谢NerdySpider绘制的纹理!")); +.addTooltip(format.red("感谢NerdySpider绘制的纹理!")); .addTooltip(format.red("感谢NerdySpider为裂影界之光系列物品绘制的纹理!")); .addTooltip(format.red("感谢NerdySpider为裂影界之光系列物品绘制的纹理!")); @@ -1913,7 +1917,6 @@ .addTooltip(format.red("Shift右击以激活,重复该操作以绑定物品")); .addTooltip(format.red("感谢ChaotkKiller整理的产率")); - .addTooltip(format.red("从梦魇世界的饥饿者处获得")); .addTooltip(format.red("从梦魇世界的饥饿者处获得")); .addTooltip(format.red("从梦魇世界的饥饿者处获得")); @@ -2167,6 +2170,43 @@ .addTooltip(format.red("但在某些子网设置中依旧很实用")); .addTooltip(format.red("感谢kurrycat对其性能的优化")); +.addTooltip(format.red("跃迁器")); +.addTooltip(format.red("站在JEI中显示的结构中心来激活")); +.addTooltip(format.red("警告:若世界是在beta-0.15版本之前创建的,你需要手动生成维度")); +.addTooltip(format.red("关闭整合包,备份存档")); +.addTooltip(format.red("从config > advRocketry文件夹中复制'plantDefs.xml'文件到saves > worldname > advRocketry")); +.addTooltip(format.red("打开整合包,重新使用该物品")); + +.addTooltip(format.red("感谢UselessForce绘制的幸运盒子纹理")); +.addTooltip(format.red("感谢UselessForce绘制的幸运盒子纹理")); + +.addTooltip(format.red("bwuh提醒你该洗澡了!")); + +.addTooltip(format.red("感谢bwuh和DrMirrus为召唤石添加的维度信息提示!")); +.addTooltip(format.red("感谢bwuh和DrMirrus为召唤石添加的维度信息提示!")); +.addTooltip(format.red("感谢bwuh和DrMirrus为召唤石添加的维度信息提示!")); + +.addTooltip(format.red("感谢Darkromano绘制的纹理!")); + +.addTooltip(format.red("警告:非常卡顿,没必要使用")); +.addTooltip(format.red("警告:非常卡顿,没必要使用")); + +.addTooltip(format.red("警告:使用其升级抽屉后不要取出")); + +.addTooltip(format.red("感谢osto添加的Shift+右击选项!")); + +.addTooltip(format.red("可使用ME机械输入总线在多方块中合成")); + +.withTag({Material: "dragonsteel_lightning"}).addTooltip(format.red("AshThaMoth对匠魂盔甲的移除十分遗憾")); + +.addTooltip(format.red("与选定物品合成,以防止其被放入转化桌")); +.addTooltip(format.red("注意:若稳定化了过多物品,会造成卡顿")); +.addTooltip(format.red("使用剪刀来去稳定化")); + +.addTooltip(format.red("对于神话处理器,ME机械输出总线是输出产物最快的方式")); +.addTooltip(format.red("对于神话处理器,ME机械输出总线是输出产物最快的方式")); +.addTooltip(format.red("对于神话处理器,ME机械输出总线是输出产物最快的方式")); +