diff --git a/config/acronym/base/General.cfg b/config/acronym/base/General.cfg deleted file mode 100644 index 7b6adbd84..000000000 --- a/config/acronym/base/General.cfg +++ /dev/null @@ -1,39 +0,0 @@ -# Configuration file - -general { - # Config entry for adding other items to count as tools. Format is "modid:item_name:meta" * is for any meta - S:"Other Tools" < - [immersiveengineering:tool:0 - thermalfoundation:wrench:* - techreborn:wrench:* - actuallyadditions:item_laser_wrench:* - hammercore:wrench:* - hammercore:iwrench:* - mekanism:configurator:* - calculator:wrench:* - ic2:wrench:* - appliedenergistics2:certus_quartz_wrench:* - appliedenergistics2:nether_quartz_wrench:* - enderio:item_yeta_wrench:* - botania:twigwand:* - essentials:wrench:* - factorytech:wrench:*] - > -} - - -materials { - # List for Prioritizing OreDict returns by modid - S:preferredOreDictIds < - contenttweaker - base - > -} - - -module { - B:"JourneyMap enabled"=true - B:"Tool enabled"=true -} - - diff --git a/config/acronym/contenttweaker/General.cfg b/config/acronym/contenttweaker/General.cfg deleted file mode 100644 index f4e2a591a..000000000 --- a/config/acronym/contenttweaker/General.cfg +++ /dev/null @@ -1,10 +0,0 @@ -# Configuration file - -module { - B:"Chickens enabled"=true - B:"Materials enabled"=true - B:"Tinkers enabled"=true - B:"Vanilla CraftTweaker enabled"=true -} - - diff --git a/config/acronym/material_system.cfg b/config/acronym/material_system.cfg deleted file mode 100644 index d35e79b3a..000000000 --- a/config/acronym/material_system.cfg +++ /dev/null @@ -1,8 +0,0 @@ -# Configuration file - -item { - # 0 - All Item Parts on a Single MC Item, 1 - All Item Parts have their own MC Item, > 1 - That many Parts per item - I:size=0 -} - - diff --git a/groovy/postInit/gameplay/StartingAge.groovy b/groovy/postInit/gameplay/StartingAge.groovy index ee5eb976c..6a9d3b6bd 100644 --- a/groovy/postInit/gameplay/StartingAge.groovy +++ b/groovy/postInit/gameplay/StartingAge.groovy @@ -1,4 +1,3 @@ -import crafttweaker.api.item.IItemStack; import Globals.* import appeng.api.AEApi; import appeng.api.features.IGrinderRegistry; diff --git a/groovy/postInit/mod/TechGuns.groovy b/groovy/postInit/mod/TechGuns.groovy index 88c5d644c..7ebfd34c5 100755 --- a/groovy/postInit/mod/TechGuns.groovy +++ b/groovy/postInit/mod/TechGuns.groovy @@ -1,6 +1,6 @@ -import techguns.items.guns.GenericGun; -import techguns.plugins.crafttweaker.GunStatTweaker; import globals.Globals +import techguns.items.guns.GenericGun; +import techguns.plugins.crafttweaker.EnumGunStat; def name_removals = [ "techguns:basicmachine_0_ammo_press", @@ -1286,70 +1286,76 @@ recipemap('canner').recipeBuilder() //MV weapons: 32 DPS //HV weapons: 64 DPS +SetWeaponStat = { String weapon, String stat, float value -> + def gun = (GenericGun) item('techguns:' + weapon).getItem(); + gun.setGunStat(EnumGunStat.parseFromString(stat), value); +} + + //Handcannon (1 shot per 1.5 seconds) -GunStatTweaker.setWeaponStat("handcannon","DAMAGE",13); -GunStatTweaker.setWeaponStat("handcannon","DAMAGE_MIN",11); +SetWeaponStat("handcannon","DAMAGE",13); +SetWeaponStat("handcannon","DAMAGE_MIN",11); //Bolt Action (1 shot per second) -GunStatTweaker.setWeaponStat("boltaction","DAMAGE",10); -GunStatTweaker.setWeaponStat("boltaction","DAMAGE_MIN",8); +SetWeaponStat("boltaction","DAMAGE",10); +SetWeaponStat("boltaction","DAMAGE_MIN",8); //Pistol (4 shots per second) -GunStatTweaker.setWeaponStat("pistol","DAMAGE",5); -GunStatTweaker.setWeaponStat("pistol","DAMAGE_MIN",4); +SetWeaponStat("pistol","DAMAGE",5); +SetWeaponStat("pistol","DAMAGE_MIN",4); //Double Barrel Shotgun (8 bullets per shot, 1 shot per second) -GunStatTweaker.setWeaponStat("sawedoff","DAMAGE",2.4); -GunStatTweaker.setWeaponStat("sawedoff","DAMAGE_MIN",2); +SetWeaponStat("sawedoff","DAMAGE",2.4); +SetWeaponStat("sawedoff","DAMAGE_MIN",2); //Revolver (2.5 shots per second) -GunStatTweaker.setWeaponStat("revolver","DAMAGE",6); -GunStatTweaker.setWeaponStat("revolver","DAMAGE_MIN",4); +SetWeaponStat("revolver","DAMAGE",6); +SetWeaponStat("revolver","DAMAGE_MIN",4); //Combat Shotgun (8 bullets per shot, 1 shot per second) -GunStatTweaker.setWeaponStat("combatshotgun","DAMAGE",2.4); -GunStatTweaker.setWeaponStat("combatshotgun","DAMAGE_MIN",2); +SetWeaponStat("combatshotgun","DAMAGE",2.4); +SetWeaponStat("combatshotgun","DAMAGE_MIN",2); //Thompson SMG (6 shots per second) -GunStatTweaker.setWeaponStat("thompson","DAMAGE",6); -GunStatTweaker.setWeaponStat("thompson","DAMAGE_MIN",5); +SetWeaponStat("thompson","DAMAGE",6); +SetWeaponStat("thompson","DAMAGE_MIN",5); //AK47 (6 shots per second) -GunStatTweaker.setWeaponStat("ak47","DAMAGE",6); -GunStatTweaker.setWeaponStat("ak47","DAMAGE_MIN",5); +SetWeaponStat("ak47","DAMAGE",6); +SetWeaponStat("ak47","DAMAGE_MIN",5); //M4 (6 shots per second) -GunStatTweaker.setWeaponStat("m4","DAMAGE",6); -GunStatTweaker.setWeaponStat("m4","DAMAGE_MIN",5); +SetWeaponStat("m4","DAMAGE",6); +SetWeaponStat("m4","DAMAGE_MIN",5); //Infiltrator (6 shots per second) -GunStatTweaker.setWeaponStat("m4_infiltrator","DAMAGE",6); -GunStatTweaker.setWeaponStat("m4_infiltrator","DAMAGE_MIN",5); +SetWeaponStat("m4_infiltrator","DAMAGE",6); +SetWeaponStat("m4_infiltrator","DAMAGE_MIN",5); //Mac-10 (6 shots per second) -GunStatTweaker.setWeaponStat("mac10","DAMAGE", 6); -GunStatTweaker.setWeaponStat("mac10","DAMAGE_MIN", 5); +SetWeaponStat("mac10","DAMAGE", 6); +SetWeaponStat("mac10","DAMAGE_MIN", 5); //AUG (6 shots per second) -GunStatTweaker.setWeaponStat("aug","DAMAGE", 12); -GunStatTweaker.setWeaponStat("aug","DAMAGE_MIN", 10); +SetWeaponStat("aug","DAMAGE", 12); +SetWeaponStat("aug","DAMAGE_MIN", 10); //LMG (10 shots per second) -GunStatTweaker.setWeaponStat("lmg","DAMAGE", 7); -GunStatTweaker.setWeaponStat("lmg","DAMAGE_MIN", 6); +SetWeaponStat("lmg","DAMAGE", 7); +SetWeaponStat("lmg","DAMAGE_MIN", 6); //AS50 (2 shots per second) -GunStatTweaker.setWeaponStat("as50","DAMAGE", 34); -GunStatTweaker.setWeaponStat("as50","DAMAGE_MIN", 30); +SetWeaponStat("as50","DAMAGE", 34); +SetWeaponStat("as50","DAMAGE_MIN", 30); //Vector (10 shots per second) -GunStatTweaker.setWeaponStat("vector","DAMAGE", 7); -GunStatTweaker.setWeaponStat("vector","DAMAGE_MIN", 6); +SetWeaponStat("vector","DAMAGE", 7); +SetWeaponStat("vector","DAMAGE_MIN", 6); //Scar (5 shots per second) -GunStatTweaker.setWeaponStat("scar","DAMAGE", 14); -GunStatTweaker.setWeaponStat("scar","DAMAGE_MIN", 12); +SetWeaponStat("scar","DAMAGE", 14); +SetWeaponStat("scar","DAMAGE_MIN", 12); //Minigun (20 shots per second) -GunStatTweaker.setWeaponStat("minigun","DAMAGE", 5); -GunStatTweaker.setWeaponStat("minigun","DAMAGE_MIN", 4); +SetWeaponStat("minigun","DAMAGE", 5); +SetWeaponStat("minigun","DAMAGE_MIN", 4); diff --git a/manifest.json b/manifest.json index 90d71213a..666344f8d 100644 --- a/manifest.json +++ b/manifest.json @@ -275,11 +275,6 @@ "fileID": 4493884, "required": true }, - { - "projectID": 237065, - "fileID": 3331364, - "required": true - }, { "projectID": 570458, "fileID": 5411078, @@ -290,11 +285,6 @@ "fileID": 5529764, "required": true }, - { - "projectID": 239197, - "fileID": 5013567, - "required": true - }, { "projectID": 254629, "fileID": 3425551, @@ -776,11 +766,6 @@ "fileID": 5403908, "required": true }, - { - "projectID": 246996, - "fileID": 3440963, - "required": true - }, { "projectID": 304493, "fileID": 2666560, diff --git a/scripts/JEICleanup.zs b/scripts/JEICleanup.zs deleted file mode 100644 index 2ecf49126..000000000 --- a/scripts/JEICleanup.zs +++ /dev/null @@ -1,431 +0,0 @@ -#norun -#priority 999 - -//Removes fluids from other mods from showing up in JEI. This is so that all fluids in JEI will be be GregTech fluids, -//So all fluids will have temperature property, liquid/gas property, etc. - -import mods.jei.JEI; -import crafttweaker.liquid.ILiquidStack; -import crafttweaker.item.IItemStack; - -val itemRemovals as IItemStack[] = [ - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - -]; - -for a in itemRemovals { - JEI.hide(a); -} - -val fluidRemovals as ILiquidStack[] = [ - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - -]; - -for a in fluidRemovals { - JEI.hide(a); -} - -//Rename aluminum blocks -.displayName = "Aluminium Coil"; -.displayName = "Aluminium Turbine Dynamo Coil"; -.displayName = "Aluminium Accelerator Cooler"; -.displayName = "Aluminium Fission Cooler Heater Port"; -.displayName = "Aluminium Fission Heat Sink"; -.displayName = "Aluminium Fission Cooler Heater"; - -//"Remove" techguns recipes. Since the machines to carry out techguns recipes do not have recipes themselves, -//all that is left to do is hide the JEI categories for the machines. This is because techguns has no .removeAll() function for crafttweaker -mods.jei.JEI.hideCategory("techguns.ammopress"); -mods.jei.JEI.hideCategory("techguns.metalpress"); -mods.jei.JEI.hideCategory("techguns.chemlab"); -mods.jei.JEI.hideCategory("techguns.fabricator"); -mods.jei.JEI.hideCategory("techguns.reactionchamber"); -mods.jei.JEI.hideCategory("techguns.oredrill"); -mods.jei.JEI.hideCategory("techguns.blastfurnace"); -mods.jei.JEI.hideCategory("techguns.grinder"); - -//Same for brewing -mods.jei.JEI.hideCategory("minecraft.brewing"); \ No newline at end of file diff --git a/scripts/nc_script_addons/DONT_PUT_YOUR_SCRIPTS_IN_HERE b/scripts/nc_script_addons/DONT_PUT_YOUR_SCRIPTS_IN_HERE deleted file mode 100644 index e69de29bb..000000000 diff --git a/scripts/ore_dict.zs b/scripts/ore_dict.zs deleted file mode 100644 index 48ec24932..000000000 --- a/scripts/ore_dict.zs +++ /dev/null @@ -1,142 +0,0 @@ -#norun -#priority 1000 - -//Script based on the ore_dict.zs script from the Gregicality Community Pack - -import crafttweaker.oredict.IOreDictEntry; -import crafttweaker.item.IItemStack; -import crafttweaker.item.IIngredient; -import crafttweaker.item.IItemDefinition; -import mods.jei.JEI; - -static mods as string[] = ["minecraft", "gregtech", "nuclearcraft", "gcys", "advancedrocketry", "libvulpes", "biomesoplenty"]; -static size as int = mods.length - 1; - -.add(); -.add(); - -.add(); -.add(); -.add(); -.add(); -.add(); -.add(); -.add(); -.add(); - -.add(); - -.add(); -.add(); -.add(); -.add(); -.add(); -.add(); - -function unify_oredicts (oredict as [IOreDictEntry]) { - for ore in oredict { - - // Checks if Ore Dict is empty, true = stop - if (ore.empty != true) { - - // If more than 1 item in ore dict - if (ore.itemArray.length > 1) { - unify(ore, 0); - } - } - } -} - -function unify (ore as IOreDictEntry, p as int) { - var pos = p; - var foundMod as bool = false; - - // For every item in the ore dict, check if one is from the - for item in ore.itemArray { - - // check any item is from current mod - if (item.definition.owner == mods[pos] && item.definition.owner != "xtones") { - foundMod = true; - } - } - - // If it is from , remove everything except the item from , else try next mod until all mods are exhausted - if (foundMod) { - for item in ore.itemArray { - if (item.definition.owner != mods[pos]) { - ore.remove(item); - JEI.hide(item); - } - } - } else if (pos < size) { - pos += 1; - unify(ore, pos); - } -} - -// Remove Wrong Aluminium -.remove(.firstItem); -.remove(); -.remove(.firstItem); - -// Certus Compatability -.add(); -.remove(.firstItem); - -// Silicon Compatability -.add(); -.remove(.firstItem); - -// Ender Pearl Powder Compatability -.add(.firstItem); - -// Remove LazyAE2 Coal Dust -.remove(); - -// Nuclearcraft Ores -.remove(); -JEI.hide(); -.remove(); -JEI.hide(); -.remove(); -JEI.hide(); -.remove(); -JEI.hide(); -.remove(); -JEI.hide(); -.remove(); -JEI.hide(); -.remove(); -JEI.hide(); -.remove(); -JEI.hide(); - -.add(); -.add(); -.add(); -.add(); -.add(); -.add(); -.add(); -.add(); -.add(); -.add(); - -//Concrete -//.add(); - -unify_oredicts(); -unify_oredicts(); -unify_oredicts(); -unify_oredicts(); -unify_oredicts(); -unify_oredicts(); -unify_oredicts(); -unify_oredicts(); -unify_oredicts(); -unify_oredicts(); -unify_oredicts(); - -unify(, 0); -unify(, 0); -