Remove stupid/unused configs
This commit is contained in:
parent
b25742dde0
commit
cf5ed6afa0
8 changed files with 38 additions and 439 deletions
|
@ -64,7 +64,6 @@ import techreborn.proxies.CommonProxy;
|
||||||
import techreborn.tiles.idsu.IDSUManager;
|
import techreborn.tiles.idsu.IDSUManager;
|
||||||
import techreborn.utils.StackWIPHandler;
|
import techreborn.utils.StackWIPHandler;
|
||||||
import techreborn.world.TechRebornWorldGen;
|
import techreborn.world.TechRebornWorldGen;
|
||||||
import techreborn.world.VeinWorldGenerator;
|
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
|
|
||||||
|
@ -133,11 +132,6 @@ public class Core {
|
||||||
|
|
||||||
@Mod.EventHandler
|
@Mod.EventHandler
|
||||||
public void init(FMLInitializationEvent event) throws IllegalAccessException, InstantiationException {
|
public void init(FMLInitializationEvent event) throws IllegalAccessException, InstantiationException {
|
||||||
//World gen
|
|
||||||
VeinWorldGenerator.registerTRVeins();
|
|
||||||
if (ConfigTechReborn.veinOres) {
|
|
||||||
GameRegistry.registerWorldGenerator(VeinWorldGenerator.INSTANCE, 0);
|
|
||||||
}
|
|
||||||
// Registers Chest Loot
|
// Registers Chest Loot
|
||||||
ModLoot.init();
|
ModLoot.init();
|
||||||
// Multiparts
|
// Multiparts
|
||||||
|
@ -161,9 +155,7 @@ public class Core {
|
||||||
proxy.init(event);
|
proxy.init(event);
|
||||||
// WorldGen
|
// WorldGen
|
||||||
worldGen.load();
|
worldGen.load();
|
||||||
if (!ConfigTechReborn.veinOres) {
|
GameRegistry.registerWorldGenerator(worldGen, 0);
|
||||||
GameRegistry.registerWorldGenerator(worldGen, 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
// DungeonLoot.init();
|
// DungeonLoot.init();
|
||||||
// Register Gui Handler
|
// Register Gui Handler
|
||||||
|
|
|
@ -48,7 +48,7 @@ public class ConfigTechReborn {
|
||||||
public static boolean ScrapboxDispenser;
|
public static boolean ScrapboxDispenser;
|
||||||
public static boolean disableRailcraftSteelNuggetRecipe;
|
public static boolean disableRailcraftSteelNuggetRecipe;
|
||||||
// Power
|
// Power
|
||||||
public static int $$$$$$$$$$$$DONT_DELETE_$$$$$$$$$$$AverageEuOutTickTime;
|
|
||||||
public static int pumpExtractEU;
|
public static int pumpExtractEU;
|
||||||
|
|
||||||
public static int LVTransformerMaxInput;
|
public static int LVTransformerMaxInput;
|
||||||
|
@ -109,61 +109,11 @@ public class ConfigTechReborn {
|
||||||
public static boolean ExpensiveWindmill;
|
public static boolean ExpensiveWindmill;
|
||||||
public static boolean REMOVE_DUPLICATES;
|
public static boolean REMOVE_DUPLICATES;
|
||||||
public static boolean ExpensiveQuarry;
|
public static boolean ExpensiveQuarry;
|
||||||
// UU
|
|
||||||
public static boolean HideUuRecipes;
|
|
||||||
public static boolean UUrecipesIridiamOre;
|
|
||||||
public static boolean UUrecipesWood;
|
|
||||||
public static boolean UUrecipesStone;
|
|
||||||
public static boolean UUrecipesSnowBlock;
|
|
||||||
public static boolean UUrecipesGrass;
|
|
||||||
public static boolean UUrecipesObsidian;
|
|
||||||
public static boolean UUrecipesGlass;
|
|
||||||
public static boolean UUrecipesWater;
|
|
||||||
public static boolean UUrecipesLava;
|
|
||||||
public static boolean UUrecipesCocoa;
|
|
||||||
public static boolean UUrecipesGunpowder;
|
|
||||||
public static boolean UUrecipesGlowstoneBlock;
|
|
||||||
public static boolean UUrecipesCactus;
|
|
||||||
public static boolean UUrecipesSugarCane;
|
|
||||||
public static boolean UUrecipesVine;
|
|
||||||
public static boolean UUrecipesSnowBall;
|
|
||||||
public static boolean UUrecipeslilypad;
|
|
||||||
public static boolean UUrecipesBone;
|
|
||||||
public static boolean UUrecipesFeather;
|
|
||||||
public static boolean UUrecipesInk;
|
|
||||||
public static boolean UUrecipesEnderPearl;
|
|
||||||
public static boolean UUrecipesCoal;
|
|
||||||
public static boolean UUrecipesIronOre;
|
|
||||||
public static boolean UUrecipesIronDust;
|
|
||||||
public static boolean UUrecipesGoldOre;
|
|
||||||
public static boolean UUrecipesGoldDust;
|
|
||||||
public static boolean UUrecipesRedStone;
|
|
||||||
public static boolean UUrecipesLapis;
|
|
||||||
public static boolean UUrecipesEmeraldOre;
|
|
||||||
public static boolean UUrecipesEmerald;
|
|
||||||
public static boolean UUrecipesDiamond;
|
|
||||||
public static boolean UUrecipesResin;
|
|
||||||
public static boolean UUrecipesTinDust;
|
|
||||||
public static boolean UUrecipesCopperDust;
|
|
||||||
public static boolean UUrecipesLeadDust;
|
|
||||||
public static boolean UUrecipesPlatinumDust;
|
|
||||||
public static boolean UUrecipesTungstenDust;
|
|
||||||
public static boolean UUrecipesTitaniumDust;
|
|
||||||
public static boolean UUrecipesAluminumDust;
|
|
||||||
// Integration
|
|
||||||
public static boolean AllowForestryRecipes;
|
|
||||||
public static boolean AllowBOPRecipes;
|
|
||||||
public static boolean AllowNaturaRecipes;
|
|
||||||
// Client
|
// Client
|
||||||
public static boolean ShowChargeHud;
|
public static boolean ShowChargeHud;
|
||||||
// EMC
|
|
||||||
public static boolean UseConnectedTextures;
|
|
||||||
public static boolean OreUnifer;
|
|
||||||
|
|
||||||
public static boolean enableGemArmorAndTools;
|
public static boolean enableGemArmorAndTools;
|
||||||
|
|
||||||
public static boolean veinOres;
|
|
||||||
|
|
||||||
public static Configuration config;
|
public static Configuration config;
|
||||||
private static ConfigTechReborn instance = null;
|
private static ConfigTechReborn instance = null;
|
||||||
|
|
||||||
|
@ -212,10 +162,6 @@ public class ConfigTechReborn {
|
||||||
.get(CATEGORY_WORLD, "Steel Ingots Loot", true, "Allow Steel Ingots to generate in loot chests")
|
.get(CATEGORY_WORLD, "Steel Ingots Loot", true, "Allow Steel Ingots to generate in loot chests")
|
||||||
.getBoolean(true);
|
.getBoolean(true);
|
||||||
|
|
||||||
veinOres = config
|
|
||||||
.get(CATEGORY_WORLD, "Custom Ore veins", false, "Use the new style GT vein ore generation - game restart required")
|
|
||||||
.getBoolean(false);
|
|
||||||
|
|
||||||
FortuneSecondaryOreMultiplierPerLevel = config.get(CATEGORY_WORLD, "FortuneSecondaryOreMultiplierPerLevel", 0.5,
|
FortuneSecondaryOreMultiplierPerLevel = config.get(CATEGORY_WORLD, "FortuneSecondaryOreMultiplierPerLevel", 0.5,
|
||||||
"FortuneSecondaryOreMultiplierPerLevel").getDouble();
|
"FortuneSecondaryOreMultiplierPerLevel").getDouble();
|
||||||
|
|
||||||
|
@ -298,9 +244,6 @@ public class ConfigTechReborn {
|
||||||
ThermalGeneratorCharge = config.get(CATEGORY_POWER, "ThermalGenerator MaxCharge", 1000000,
|
ThermalGeneratorCharge = config.get(CATEGORY_POWER, "ThermalGenerator MaxCharge", 1000000,
|
||||||
"Set the max charge for the ThermalGenerator").getInt();
|
"Set the max charge for the ThermalGenerator").getInt();
|
||||||
|
|
||||||
$$$$$$$$$$$$DONT_DELETE_$$$$$$$$$$$AverageEuOutTickTime = config.get(CATEGORY_POWER, "Average EU-out Tick Time", 100,
|
|
||||||
"Set the average EU-out tick time").getInt();
|
|
||||||
|
|
||||||
// Tier
|
// Tier
|
||||||
IronDrillTier = config.get(CATEGORY_POWER, "IronDrill Tier", 2, "Set the Tier of the iron drill").getInt();
|
IronDrillTier = config.get(CATEGORY_POWER, "IronDrill Tier", 2, "Set the Tier of the iron drill").getInt();
|
||||||
|
|
||||||
|
@ -400,142 +343,9 @@ public class ConfigTechReborn {
|
||||||
|
|
||||||
disableRailcraftSteelNuggetRecipe = config.get(CATEGORY_CRAFTING, "Disable Railcraft's Steel nugget recipe", false, "When true TechReborn will remove Railcrafts Iron Nugget to steel nuggert recipe.").getBoolean(false);
|
disableRailcraftSteelNuggetRecipe = config.get(CATEGORY_CRAFTING, "Disable Railcraft's Steel nugget recipe", false, "When true TechReborn will remove Railcrafts Iron Nugget to steel nuggert recipe.").getBoolean(false);
|
||||||
|
|
||||||
// Uu
|
|
||||||
HideUuRecipes = config.get(CATEGORY_UU, "Hide UU Recipes", true, "Hide UU Recipes from JEI/NEI")
|
|
||||||
.getBoolean(true);
|
|
||||||
|
|
||||||
UUrecipesIridiamOre = config
|
|
||||||
.get(CATEGORY_UU, "UUrecipe IridiamOre", true, "Allow Iridium Ore to be crafted with UU")
|
|
||||||
.getBoolean(true);
|
|
||||||
|
|
||||||
UUrecipesWood = config.get(CATEGORY_UU, "UUrecipe Wood", true, "Allow Wood to be crafted with UU")
|
|
||||||
.getBoolean(true);
|
|
||||||
|
|
||||||
UUrecipesStone = config.get(CATEGORY_UU, "UUrecipe Stone", true, "Allow Stone to be crafted with UU")
|
|
||||||
.getBoolean(true);
|
|
||||||
|
|
||||||
UUrecipesSnowBlock = config
|
|
||||||
.get(CATEGORY_UU, "UUrecipe SnowBlock", true, "Allow Snow Blocks to be crafted with UU").getBoolean(true);
|
|
||||||
|
|
||||||
UUrecipesGrass = config.get(CATEGORY_UU, "UUrecipe Grass", true, "Allow Grass to be crafted with UU")
|
|
||||||
.getBoolean(true);
|
|
||||||
|
|
||||||
UUrecipesObsidian = config.get(CATEGORY_UU, "UUrecipe Obsidian", true, "Allow Obsidian to be crafted with UU")
|
|
||||||
.getBoolean(true);
|
|
||||||
|
|
||||||
UUrecipesGlass = config.get(CATEGORY_UU, "UUrecipe Glass", true, "Allow Glass to be crafted with UU")
|
|
||||||
.getBoolean(true);
|
|
||||||
|
|
||||||
UUrecipesWater = config.get(CATEGORY_UU, "UUrecipe Water", true, "Allow Water to be crafted with UU")
|
|
||||||
.getBoolean(true);
|
|
||||||
|
|
||||||
UUrecipesLava = config.get(CATEGORY_UU, "UUrecipe Lava", true, "Allow Lava to be crafted with UU")
|
|
||||||
.getBoolean(true);
|
|
||||||
|
|
||||||
UUrecipesCocoa = config.get(CATEGORY_UU, "UUrecipe Cocoa", true, "Allow Cocoa to be crafted with UU")
|
|
||||||
.getBoolean(true);
|
|
||||||
|
|
||||||
UUrecipesGlowstoneBlock = config
|
|
||||||
.get(CATEGORY_UU, "UUrecipe GlowstoneBlock", true, "Allow Glowstone Blocks to be crafted with UU")
|
|
||||||
.getBoolean(true);
|
|
||||||
|
|
||||||
UUrecipesCactus = config.get(CATEGORY_UU, "UUrecipe Cactus", true, "Allow Cactus to be crafted with UU")
|
|
||||||
.getBoolean(true);
|
|
||||||
|
|
||||||
UUrecipesSugarCane = config
|
|
||||||
.get(CATEGORY_UU, "UUrecipe SugarCane", true, "Allow SugarCane to be crafted with UU").getBoolean(true);
|
|
||||||
|
|
||||||
UUrecipesVine = config.get(CATEGORY_UU, "UUrecipe Vine", true, "Allow Vines to be crafted with UU")
|
|
||||||
.getBoolean(true);
|
|
||||||
|
|
||||||
UUrecipesSnowBall = config.get(CATEGORY_UU, "UUrecipe SnowBall", true, "Allow SnowBall to be crafted with UU")
|
|
||||||
.getBoolean(true);
|
|
||||||
|
|
||||||
UUrecipeslilypad = config.get(CATEGORY_UU, "UUrecipe lilypad", true, "Allow lilypads to be crafted with UU")
|
|
||||||
.getBoolean(true);
|
|
||||||
|
|
||||||
UUrecipesBone = config.get(CATEGORY_UU, "UUrecipe Bone", true, "Allow Bones to be crafted with UU")
|
|
||||||
.getBoolean(true);
|
|
||||||
|
|
||||||
UUrecipesFeather = config.get(CATEGORY_UU, "UUrecipe Feather", true, "Allow Feathers to be crafted with UU")
|
|
||||||
.getBoolean(true);
|
|
||||||
|
|
||||||
UUrecipesInk = config.get(CATEGORY_UU, "UUrecipe Ink", true, "Allow Ink to be crafted with UU")
|
|
||||||
.getBoolean(true);
|
|
||||||
|
|
||||||
UUrecipesEnderPearl = config
|
|
||||||
.get(CATEGORY_UU, "UUrecipe EnderPearl", true, "Allow EnderPearls to be crafted with UU")
|
|
||||||
.getBoolean(true);
|
|
||||||
|
|
||||||
UUrecipesCoal = config.get(CATEGORY_UU, "UUrecipe Coal", true, "Allow Coal to be crafted with UU")
|
|
||||||
.getBoolean(true);
|
|
||||||
|
|
||||||
UUrecipesIronOre = config.get(CATEGORY_UU, "UUrecipe IronOre", true, "Allow Iron Ore to be crafted with UU")
|
|
||||||
.getBoolean(true);
|
|
||||||
|
|
||||||
UUrecipesIronDust = config.get(CATEGORY_UU, "UUrecipe IronDust", true, "Allow Iron Dust to be crafted with UU")
|
|
||||||
.getBoolean(true);
|
|
||||||
|
|
||||||
UUrecipesGoldOre = config.get(CATEGORY_UU, "UUrecipe GoldOre", true, "Allow Gold Ore to be crafted with UU")
|
|
||||||
.getBoolean(true);
|
|
||||||
|
|
||||||
UUrecipesGoldDust = config.get(CATEGORY_UU, "UUrecipe GoldDust", true, "Allow Gold Dust to be crafted with UU")
|
|
||||||
.getBoolean(true);
|
|
||||||
|
|
||||||
UUrecipesRedStone = config.get(CATEGORY_UU, "UUrecipe RedStone", true, "Allow Redstone to be crafted with UU")
|
|
||||||
.getBoolean(true);
|
|
||||||
|
|
||||||
UUrecipesLapis = config.get(CATEGORY_UU, "UUrecipe Lapis", true, "Allow Lapis to be crafted with UU")
|
|
||||||
.getBoolean(true);
|
|
||||||
|
|
||||||
UUrecipesEmeraldOre = config
|
|
||||||
.get(CATEGORY_UU, "UUrecipe EmeraldOre", true, "Allow EmeraldOre to be crafted with UU")
|
|
||||||
.getBoolean(true);
|
|
||||||
|
|
||||||
UUrecipesEmerald = config.get(CATEGORY_UU, "UUrecipe Emerald", true, "Allow Emerald to be crafted with UU")
|
|
||||||
.getBoolean(true);
|
|
||||||
|
|
||||||
UUrecipesDiamond = config.get(CATEGORY_UU, "UUrecipe Diamond", true, "Allow Diamond to be crafted with UU")
|
|
||||||
.getBoolean(true);
|
|
||||||
|
|
||||||
UUrecipesResin = config.get(CATEGORY_UU, "UUrecipe Resin", true, "Allow Resin to be crafted with UU")
|
|
||||||
.getBoolean(true);
|
|
||||||
|
|
||||||
UUrecipesTinDust = config.get(CATEGORY_UU, "UUrecipe TinDust", true, "Allow TinDust to be crafted with UU")
|
|
||||||
.getBoolean(true);
|
|
||||||
|
|
||||||
UUrecipesCopperDust = config
|
|
||||||
.get(CATEGORY_UU, "UUrecipe CopperDust", true, "Allow CopperDust to be crafted with UU")
|
|
||||||
.getBoolean(true);
|
|
||||||
|
|
||||||
UUrecipesLeadDust = config.get(CATEGORY_UU, "UUrecipe LeadDust", true, "Allow LeadDust to be crafted with UU")
|
|
||||||
.getBoolean(true);
|
|
||||||
|
|
||||||
UUrecipesPlatinumDust = config
|
|
||||||
.get(CATEGORY_UU, "UUrecipe PlatinumDust", true, "Allow PlatinumDust to be crafted with UU")
|
|
||||||
.getBoolean(true);
|
|
||||||
|
|
||||||
UUrecipesTungstenDust = config
|
|
||||||
.get(CATEGORY_UU, "UUrecipe TungstenDust", true, "Allow TungstenDust to be crafted with UU")
|
|
||||||
.getBoolean(true);
|
|
||||||
|
|
||||||
UUrecipesTitaniumDust = config
|
|
||||||
.get(CATEGORY_UU, "UUrecipe TitaniumDust", true, "Allow TitaniumDust to be crafted with UU")
|
|
||||||
.getBoolean(true);
|
|
||||||
|
|
||||||
UUrecipesAluminumDust = config
|
|
||||||
.get(CATEGORY_UU, "UUrecipe AluminumDust", true, "Allow AluminumDust to be crafted with UU")
|
|
||||||
.getBoolean(true);
|
|
||||||
|
|
||||||
ShowChargeHud = config.get(CATEGORY_POWER, "Show Charge hud", true, "Show Charge hud (ClientSideOnly)")
|
ShowChargeHud = config.get(CATEGORY_POWER, "Show Charge hud", true, "Show Charge hud (ClientSideOnly)")
|
||||||
.getBoolean(true);
|
.getBoolean(true);
|
||||||
|
|
||||||
UseConnectedTextures = config.get(CATEGORY_INTEGRATION, "Render Conected Textures", true,
|
|
||||||
"Render Conected Textures (Client Side Only)").getBoolean(true);
|
|
||||||
|
|
||||||
OreUnifer = config.get(CATEGORY_INTEGRATION, "OreUnifer", false, "Change all ores into TechReborn Ores")
|
|
||||||
.getBoolean(false);
|
|
||||||
|
|
||||||
UninsulatedElectocutionDamage = config.get(CATEGORY_WORLD, "Uninsulated Electrocution Damage", true,
|
UninsulatedElectocutionDamage = config.get(CATEGORY_WORLD, "Uninsulated Electrocution Damage", true,
|
||||||
"Damage entities on contact with uninsulated cables").getBoolean(true);
|
"Damage entities on contact with uninsulated cables").getBoolean(true);
|
||||||
UninsulatedElectocutionSound = config.get(CATEGORY_WORLD, "Uninsulated Electrocution Sound", true,
|
UninsulatedElectocutionSound = config.get(CATEGORY_WORLD, "Uninsulated Electrocution Sound", true,
|
||||||
|
@ -551,16 +361,6 @@ public class ConfigTechReborn {
|
||||||
.get(CATEGORY_CRAFTING, "Expensive Watermill", true, "Allow TechReborn to change the Watermill recipe")
|
.get(CATEGORY_CRAFTING, "Expensive Watermill", true, "Allow TechReborn to change the Watermill recipe")
|
||||||
.getBoolean(true);
|
.getBoolean(true);
|
||||||
|
|
||||||
// Integration
|
|
||||||
AllowBOPRecipes = config.get(CATEGORY_INTEGRATION, "Allow Bop Recipes", true, "Add BOP support")
|
|
||||||
.getBoolean(true);
|
|
||||||
|
|
||||||
AllowForestryRecipes = config.get(CATEGORY_INTEGRATION, "Allow Forestry Recipes", true, "Add Forestry support")
|
|
||||||
.getBoolean(true);
|
|
||||||
|
|
||||||
AllowNaturaRecipes = config.get(CATEGORY_INTEGRATION, "Allow Natura Recipes", true, "Add Natura support")
|
|
||||||
.getBoolean(true);
|
|
||||||
|
|
||||||
if (config.hasChanged()) {
|
if (config.hasChanged()) {
|
||||||
config.save();
|
config.save();
|
||||||
}
|
}
|
||||||
|
|
|
@ -900,8 +900,6 @@ public class ModRecipes {
|
||||||
.addSmelting(ItemDusts.getDustByName("silver", 1), ItemIngots.getIngotByName("silver"),
|
.addSmelting(ItemDusts.getDustByName("silver", 1), ItemIngots.getIngotByName("silver"),
|
||||||
1F);
|
1F);
|
||||||
|
|
||||||
// UU
|
|
||||||
if (ConfigTechReborn.UUrecipesIridiamOre)
|
|
||||||
CraftingHelper
|
CraftingHelper
|
||||||
.addShapedOreRecipe((OreDictionary.getOres("oreIridium").get(0)), "UUU", " U ", "UUU", 'U',
|
.addShapedOreRecipe((OreDictionary.getOres("oreIridium").get(0)), "UUU", " U ", "UUU", 'U',
|
||||||
ModItems.UU_MATTER);
|
ModItems.UU_MATTER);
|
||||||
|
|
|
@ -173,106 +173,40 @@ public class CraftingTableRecipes extends RecipeMethods {
|
||||||
registerShaped(getMaterial("diamond_grinding_head", 2, Type.PART), "DSD", "SGS", "DSD", 'S', "ingotSteel", 'D', "dustDiamond", 'G', "gemDiamond");
|
registerShaped(getMaterial("diamond_grinding_head", 2, Type.PART), "DSD", "SGS", "DSD", 'S', "ingotSteel", 'D', "dustDiamond", 'G', "gemDiamond");
|
||||||
registerShaped(getMaterial("tungsten_grinding_head", 2, Type.PART), "TST", "SBS", "TST", 'S', "ingotSteel", 'T', "ingotTungsten", 'B', "blockSteel");
|
registerShaped(getMaterial("tungsten_grinding_head", 2, Type.PART), "TST", "SBS", "TST", 'S', "ingotSteel", 'T', "ingotTungsten", 'B', "blockSteel");
|
||||||
|
|
||||||
if (ConfigTechReborn.UUrecipesWood)
|
registerShaped(getStack(Blocks.LOG, 8), " U ", " ", " ", 'U', ModItems.UU_MATTER);
|
||||||
registerShaped(getStack(Blocks.LOG, 8), " U ", " ", " ", 'U', ModItems.UU_MATTER);
|
registerShaped(getStack(Blocks.STONE, 16), " ", " U ", " ", 'U', ModItems.UU_MATTER);
|
||||||
|
registerShaped(getStack(Blocks.SNOW, 16), "U U", " ", " ", 'U', ModItems.UU_MATTER);
|
||||||
if (ConfigTechReborn.UUrecipesStone)
|
registerShaped(getStack(Blocks.GRASS, 16), " ", "U ", "U ", 'U', ModItems.UU_MATTER);
|
||||||
registerShaped(getStack(Blocks.STONE, 16), " ", " U ", " ", 'U', ModItems.UU_MATTER);
|
registerShaped(getStack(Blocks.OBSIDIAN, 12), "U U", "U U", " ", 'U', ModItems.UU_MATTER);
|
||||||
|
registerShaped(getStack(Blocks.GLASS, 32), " U ", "U U", " U ", 'U', ModItems.UU_MATTER);
|
||||||
if (ConfigTechReborn.UUrecipesSnowBlock)
|
registerShaped(getStack(Items.DYE, 32, 3), "UU ", " U", "UU ", 'U', ModItems.UU_MATTER);
|
||||||
registerShaped(getStack(Blocks.SNOW, 16), "U U", " ", " ", 'U', ModItems.UU_MATTER);
|
registerShaped(getStack(Blocks.GLOWSTONE, 8), " U ", "U U", "UUU", 'U', ModItems.UU_MATTER);
|
||||||
|
registerShaped(getStack(Blocks.CACTUS, 48), " U ", "UUU", "U U", 'U', ModItems.UU_MATTER);
|
||||||
if (ConfigTechReborn.UUrecipesGrass)
|
registerShaped(getStack(Items.REEDS, 48), "U U", "U U", "U U", 'U', ModItems.UU_MATTER);
|
||||||
registerShaped(getStack(Blocks.GRASS, 16), " ", "U ", "U ", 'U', ModItems.UU_MATTER);
|
registerShaped(getStack(Blocks.VINE, 24), "U ", "U ", "U ", 'U', ModItems.UU_MATTER);
|
||||||
|
registerShaped(getStack(Items.SNOWBALL, 16), " ", " ", "UUU", 'U', ModItems.UU_MATTER);
|
||||||
if (ConfigTechReborn.UUrecipesObsidian)
|
|
||||||
registerShaped(getStack(Blocks.OBSIDIAN, 12), "U U", "U U", " ", 'U', ModItems.UU_MATTER);
|
|
||||||
|
|
||||||
if (ConfigTechReborn.UUrecipesGlass)
|
|
||||||
registerShaped(getStack(Blocks.GLASS, 32), " U ", "U U", " U ", 'U', ModItems.UU_MATTER);
|
|
||||||
|
|
||||||
if (ConfigTechReborn.UUrecipesCocoa)
|
|
||||||
registerShaped(getStack(Items.DYE, 32, 3), "UU ", " U", "UU ", 'U', ModItems.UU_MATTER);
|
|
||||||
|
|
||||||
if (ConfigTechReborn.UUrecipesGlowstoneBlock)
|
|
||||||
registerShaped(getStack(Blocks.GLOWSTONE, 8), " U ", "U U", "UUU", 'U', ModItems.UU_MATTER);
|
|
||||||
|
|
||||||
if (ConfigTechReborn.UUrecipesCactus)
|
|
||||||
registerShaped(getStack(Blocks.CACTUS, 48), " U ", "UUU", "U U", 'U', ModItems.UU_MATTER);
|
|
||||||
|
|
||||||
if (ConfigTechReborn.UUrecipesSugarCane)
|
|
||||||
registerShaped(getStack(Items.REEDS, 48), "U U", "U U", "U U", 'U', ModItems.UU_MATTER);
|
|
||||||
|
|
||||||
if (ConfigTechReborn.UUrecipesVine)
|
|
||||||
registerShaped(getStack(Blocks.VINE, 24), "U ", "U ", "U ", 'U', ModItems.UU_MATTER);
|
|
||||||
|
|
||||||
if (ConfigTechReborn.UUrecipesSnowBall)
|
|
||||||
registerShaped(getStack(Items.SNOWBALL, 16), " ", " ", "UUU", 'U', ModItems.UU_MATTER);
|
|
||||||
|
|
||||||
registerShaped(getStack(Items.CLAY_BALL, 48), "UU ", "U ", "UU ", 'U', ModItems.UU_MATTER);
|
registerShaped(getStack(Items.CLAY_BALL, 48), "UU ", "U ", "UU ", 'U', ModItems.UU_MATTER);
|
||||||
|
registerShaped(getStack(Blocks.WATERLILY, 64), "U U", " U ", " U ", 'U', ModItems.UU_MATTER);
|
||||||
if (ConfigTechReborn.UUrecipeslilypad)
|
registerShaped(getStack(Items.GUNPOWDER, 15), "UUU", "U ", "UUU", 'U', ModItems.UU_MATTER);
|
||||||
registerShaped(getStack(Blocks.WATERLILY, 64), "U U", " U ", " U ", 'U', ModItems.UU_MATTER);
|
registerShaped(getStack(Items.BONE, 32), "U ", "UU ", "U ", 'U', ModItems.UU_MATTER);
|
||||||
|
registerShaped(getStack(Items.FEATHER, 32), " U ", " U ", "U U", 'U', ModItems.UU_MATTER);
|
||||||
if (ConfigTechReborn.UUrecipesGunpowder)
|
registerShaped(getStack(Items.DYE, 48), " UU", " UU", " U ", 'U', ModItems.UU_MATTER);
|
||||||
registerShaped(getStack(Items.GUNPOWDER, 15), "UUU", "U ", "UUU", 'U', ModItems.UU_MATTER);
|
registerShaped(getStack(Items.ENDER_PEARL, 1), "UUU", "U U", " U ", 'U', ModItems.UU_MATTER);
|
||||||
|
registerShaped(getStack(Items.COAL, 5), " U", "U ", " U", 'U', ModItems.UU_MATTER);
|
||||||
if (ConfigTechReborn.UUrecipesBone)
|
registerShaped(getStack(Blocks.IRON_ORE, 2), "U U", " U ", "U U", 'U', ModItems.UU_MATTER);
|
||||||
registerShaped(getStack(Items.BONE, 32), "U ", "UU ", "U ", 'U', ModItems.UU_MATTER);
|
registerShaped(getStack(Blocks.GOLD_ORE, 2), " U ", "UUU", " U ", 'U', ModItems.UU_MATTER);
|
||||||
|
registerShaped(getStack(Items.REDSTONE, 24), " ", " U ", "UUU", 'U', ModItems.UU_MATTER);
|
||||||
if (ConfigTechReborn.UUrecipesFeather)
|
registerShaped(getStack(Items.DYE, 9, 4), " U ", " U ", " UU", 'U', ModItems.UU_MATTER);
|
||||||
registerShaped(getStack(Items.FEATHER, 32), " U ", " U ", "U U", 'U', ModItems.UU_MATTER);
|
registerShaped(getStack(Blocks.EMERALD_ORE, 1), "UU ", "U U", " UU", 'U', ModItems.UU_MATTER);
|
||||||
|
registerShaped(getStack(Items.EMERALD, 2), "UUU", "UUU", " U ", 'U', ModItems.UU_MATTER);
|
||||||
if (ConfigTechReborn.UUrecipesInk)
|
registerShaped(getStack(Items.DIAMOND, 1), "UUU", "UUU", "UUU", 'U', ModItems.UU_MATTER);
|
||||||
registerShaped(getStack(Items.DYE, 48), " UU", " UU", " U ", 'U', ModItems.UU_MATTER);
|
registerShaped(getMaterial("tin", 10, Type.DUST), " ", "U U", " U", 'U', ModItems.UU_MATTER);
|
||||||
|
registerShaped(getMaterial("copper", 10, Type.DUST), " U", "U U", " ", 'U', ModItems.UU_MATTER);
|
||||||
if (ConfigTechReborn.UUrecipesEnderPearl)
|
registerShaped(getMaterial("lead", 14, Type.DUST), "UUU", "UUU", "U ", 'U', ModItems.UU_MATTER);
|
||||||
registerShaped(getStack(Items.ENDER_PEARL, 1), "UUU", "U U", " U ", 'U', ModItems.UU_MATTER);
|
registerShaped(getMaterial("platinum", Type.DUST), " U", "UUU", "UUU", 'U', ModItems.UU_MATTER);
|
||||||
|
registerShaped(getMaterial("tungsten", Type.DUST), "U ", "UUU", "UUU", 'U', ModItems.UU_MATTER);
|
||||||
if (ConfigTechReborn.UUrecipesCoal)
|
registerShaped(getMaterial("titanium", 2, Type.DUST), "UUU", " U ", " U ", 'U', ModItems.UU_MATTER);
|
||||||
registerShaped(getStack(Items.COAL, 5), " U", "U ", " U", 'U', ModItems.UU_MATTER);
|
registerShaped(getMaterial("aluminum", 16, Type.DUST), " U ", " U ", "UUU", 'U', ModItems.UU_MATTER);
|
||||||
|
|
||||||
if (ConfigTechReborn.UUrecipesIronOre)
|
|
||||||
registerShaped(getStack(Blocks.IRON_ORE, 2), "U U", " U ", "U U", 'U', ModItems.UU_MATTER);
|
|
||||||
|
|
||||||
if (ConfigTechReborn.UUrecipesGoldOre)
|
|
||||||
registerShaped(getStack(Blocks.GOLD_ORE, 2), " U ", "UUU", " U ", 'U', ModItems.UU_MATTER);
|
|
||||||
|
|
||||||
if (ConfigTechReborn.UUrecipesRedStone)
|
|
||||||
registerShaped(getStack(Items.REDSTONE, 24), " ", " U ", "UUU", 'U', ModItems.UU_MATTER);
|
|
||||||
|
|
||||||
if (ConfigTechReborn.UUrecipesLapis)
|
|
||||||
registerShaped(getStack(Items.DYE, 9, 4), " U ", " U ", " UU", 'U', ModItems.UU_MATTER);
|
|
||||||
|
|
||||||
if (ConfigTechReborn.UUrecipesEmeraldOre)
|
|
||||||
registerShaped(getStack(Blocks.EMERALD_ORE, 1), "UU ", "U U", " UU", 'U', ModItems.UU_MATTER);
|
|
||||||
|
|
||||||
if (ConfigTechReborn.UUrecipesEmerald)
|
|
||||||
registerShaped(getStack(Items.EMERALD, 2), "UUU", "UUU", " U ", 'U', ModItems.UU_MATTER);
|
|
||||||
|
|
||||||
if (ConfigTechReborn.UUrecipesDiamond)
|
|
||||||
registerShaped(getStack(Items.DIAMOND, 1), "UUU", "UUU", "UUU", 'U', ModItems.UU_MATTER);
|
|
||||||
|
|
||||||
if (ConfigTechReborn.UUrecipesTinDust)
|
|
||||||
registerShaped(getMaterial("tin", 10, Type.DUST), " ", "U U", " U", 'U', ModItems.UU_MATTER);
|
|
||||||
|
|
||||||
if (ConfigTechReborn.UUrecipesCopperDust)
|
|
||||||
registerShaped(getMaterial("copper", 10, Type.DUST), " U", "U U", " ", 'U', ModItems.UU_MATTER);
|
|
||||||
|
|
||||||
if (ConfigTechReborn.UUrecipesLeadDust)
|
|
||||||
registerShaped(getMaterial("lead", 14, Type.DUST), "UUU", "UUU", "U ", 'U', ModItems.UU_MATTER);
|
|
||||||
|
|
||||||
if (ConfigTechReborn.UUrecipesPlatinumDust)
|
|
||||||
registerShaped(getMaterial("platinum", Type.DUST), " U", "UUU", "UUU", 'U', ModItems.UU_MATTER);
|
|
||||||
|
|
||||||
if (ConfigTechReborn.UUrecipesTungstenDust)
|
|
||||||
registerShaped(getMaterial("tungsten", Type.DUST), "U ", "UUU", "UUU", 'U', ModItems.UU_MATTER);
|
|
||||||
|
|
||||||
if (ConfigTechReborn.UUrecipesTitaniumDust)
|
|
||||||
registerShaped(getMaterial("titanium", 2, Type.DUST), "UUU", " U ", " U ", 'U', ModItems.UU_MATTER);
|
|
||||||
|
|
||||||
if (ConfigTechReborn.UUrecipesAluminumDust)
|
|
||||||
registerShaped(getMaterial("aluminum", 16, Type.DUST), " U ", " U ", "UUU", 'U', ModItems.UU_MATTER);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void registerCompressionRecipes() {
|
static void registerCompressionRecipes() {
|
||||||
|
|
|
@ -33,7 +33,6 @@ import reborncore.common.powerSystem.TilePowerAcceptor;
|
||||||
import reborncore.common.registration.RebornRegistry;
|
import reborncore.common.registration.RebornRegistry;
|
||||||
import reborncore.common.registration.impl.ConfigRegistry;
|
import reborncore.common.registration.impl.ConfigRegistry;
|
||||||
import reborncore.common.util.Inventory;
|
import reborncore.common.util.Inventory;
|
||||||
import techreborn.config.ConfigTechReborn;
|
|
||||||
import techreborn.init.ModBlocks;
|
import techreborn.init.ModBlocks;
|
||||||
import techreborn.lib.ModInfo;
|
import techreborn.lib.ModInfo;
|
||||||
|
|
||||||
|
@ -60,7 +59,7 @@ public class TileAesu extends TilePowerAcceptor implements IWrenchable {
|
||||||
@Override
|
@Override
|
||||||
public void updateEntity() {
|
public void updateEntity() {
|
||||||
super.updateEntity();
|
super.updateEntity();
|
||||||
if (ticks == ConfigTechReborn.$$$$$$$$$$$$DONT_DELETE_$$$$$$$$$$$AverageEuOutTickTime) {
|
if (ticks == 100) {
|
||||||
euChange = -1;
|
euChange = -1;
|
||||||
ticks = 0;
|
ticks = 0;
|
||||||
|
|
||||||
|
|
|
@ -33,7 +33,6 @@ import reborncore.common.IWrenchable;
|
||||||
import reborncore.common.powerSystem.TilePowerAcceptor;
|
import reborncore.common.powerSystem.TilePowerAcceptor;
|
||||||
import reborncore.common.registration.RebornRegistry;
|
import reborncore.common.registration.RebornRegistry;
|
||||||
import reborncore.common.registration.impl.ConfigRegistry;
|
import reborncore.common.registration.impl.ConfigRegistry;
|
||||||
import techreborn.config.ConfigTechReborn;
|
|
||||||
import techreborn.init.ModBlocks;
|
import techreborn.init.ModBlocks;
|
||||||
import techreborn.lib.ModInfo;
|
import techreborn.lib.ModInfo;
|
||||||
|
|
||||||
|
@ -128,7 +127,7 @@ public class TileIDSU extends TilePowerAcceptor implements IWrenchable {
|
||||||
public void updateEntity() {
|
public void updateEntity() {
|
||||||
super.updateEntity();
|
super.updateEntity();
|
||||||
|
|
||||||
if (ticks == ConfigTechReborn.$$$$$$$$$$$$DONT_DELETE_$$$$$$$$$$$AverageEuOutTickTime) {
|
if (ticks == 100) {
|
||||||
euChange = -1;
|
euChange = -1;
|
||||||
ticks = 0;
|
ticks = 0;
|
||||||
|
|
||||||
|
|
|
@ -32,7 +32,6 @@ import reborncore.common.registration.RebornRegistry;
|
||||||
import reborncore.common.registration.impl.ConfigRegistry;
|
import reborncore.common.registration.impl.ConfigRegistry;
|
||||||
import reborncore.common.util.Inventory;
|
import reborncore.common.util.Inventory;
|
||||||
import techreborn.blocks.storage.BlockLESU;
|
import techreborn.blocks.storage.BlockLESU;
|
||||||
import techreborn.config.ConfigTechReborn;
|
|
||||||
import techreborn.lib.ModInfo;
|
import techreborn.lib.ModInfo;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
@ -94,7 +93,7 @@ public class TileLesu extends TilePowerAcceptor {// TODO wrench
|
||||||
maxStorage = ((connectedBlocks + 1) * storagePerBlock);
|
maxStorage = ((connectedBlocks + 1) * storagePerBlock);
|
||||||
output = (connectedBlocks * extraIOPerBlock) + baseOutput;
|
output = (connectedBlocks * extraIOPerBlock) + baseOutput;
|
||||||
|
|
||||||
if (ticks == ConfigTechReborn.$$$$$$$$$$$$DONT_DELETE_$$$$$$$$$$$AverageEuOutTickTime) {
|
if (ticks == 100) {
|
||||||
euChange = -1;
|
euChange = -1;
|
||||||
ticks = 0;
|
ticks = 0;
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -1,122 +0,0 @@
|
||||||
/*
|
|
||||||
* This file is part of TechReborn, licensed under the MIT License (MIT).
|
|
||||||
*
|
|
||||||
* Copyright (c) 2017 TechReborn
|
|
||||||
*
|
|
||||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
* of this software and associated documentation files (the "Software"), to deal
|
|
||||||
* in the Software without restriction, including without limitation the rights
|
|
||||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
* copies of the Software, and to permit persons to whom the Software is
|
|
||||||
* furnished to do so, subject to the following conditions:
|
|
||||||
*
|
|
||||||
* The above copyright notice and this permission notice shall be included in all
|
|
||||||
* copies or substantial portions of the Software.
|
|
||||||
*
|
|
||||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
||||||
* SOFTWARE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package techreborn.world;
|
|
||||||
|
|
||||||
import net.minecraft.block.Block;
|
|
||||||
import net.minecraft.block.state.IBlockState;
|
|
||||||
import net.minecraft.init.Blocks;
|
|
||||||
import net.minecraft.world.World;
|
|
||||||
import net.minecraft.world.chunk.IChunkProvider;
|
|
||||||
import net.minecraft.world.gen.IChunkGenerator;
|
|
||||||
import net.minecraftforge.fml.common.IWorldGenerator;
|
|
||||||
import org.apache.commons.lang3.tuple.ImmutablePair;
|
|
||||||
import org.apache.commons.lang3.tuple.Pair;
|
|
||||||
import techreborn.init.ModBlocks;
|
|
||||||
import techreborn.world.veins.VeinGenerator;
|
|
||||||
|
|
||||||
import java.util.Random;
|
|
||||||
|
|
||||||
public enum VeinWorldGenerator implements IWorldGenerator {
|
|
||||||
|
|
||||||
INSTANCE;
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void generate(Random random, int chunkX, int chunkZ, World world, IChunkGenerator chunkGenerator, IChunkProvider chunkProvider) {
|
|
||||||
if (random.nextInt(2) == 0) {
|
|
||||||
VeinGenerator.generateRandomVein(random, chunkX, chunkZ, world);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private static Pair<Float, IBlockState> additional(float chance, String name) {
|
|
||||||
return ImmutablePair.of(chance, ModBlocks.ORE.getBlockStateFromName(name));
|
|
||||||
}
|
|
||||||
|
|
||||||
private static Pair<Float, IBlockState> primary(String name) {
|
|
||||||
return ImmutablePair.of(1.00f, ModBlocks.ORE.getBlockStateFromName(name));
|
|
||||||
}
|
|
||||||
|
|
||||||
private static Pair<Float, IBlockState> primary(Block block) {
|
|
||||||
return ImmutablePair.of(1.00f, block.getDefaultState());
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void registerOverworldVein(float chance, float avrSize, int minHeight, int maxHeight, Pair<Float, IBlockState>... varargs) {
|
|
||||||
VeinGenerator.registerVein(0, chance, avrSize, minHeight, maxHeight, varargs);
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void registerNetherVein(float chance, float avrSize, Pair<Float, IBlockState>... varargs) {
|
|
||||||
VeinGenerator.registerVein(-1, chance, avrSize, 1, 128, varargs);
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void registerEndVein(float chance, float avrSize, Pair<Float, IBlockState>... varargs) {
|
|
||||||
VeinGenerator.registerVein(1, chance, avrSize, 1, 64, varargs);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void registerTRVeins() {
|
|
||||||
//Overworld veins
|
|
||||||
registerOverworldVein(0.05f, 0.4f, 1, 60,
|
|
||||||
primary("iridium"));
|
|
||||||
|
|
||||||
registerOverworldVein(0.34f, 0.7f, 1, 80,
|
|
||||||
primary("bauxite"));
|
|
||||||
|
|
||||||
registerOverworldVein(0.67f, 1.4f, 30, 120,
|
|
||||||
primary("copper"));
|
|
||||||
|
|
||||||
registerOverworldVein(0.64f, 1.3f, 30, 120,
|
|
||||||
primary("tin"));
|
|
||||||
|
|
||||||
registerOverworldVein(0.32f, 0.7f, 1, 40,
|
|
||||||
primary("galena"),
|
|
||||||
additional(0.3f, "lead"),
|
|
||||||
additional(0.2f, "silver"));
|
|
||||||
|
|
||||||
registerOverworldVein(0.37f, 1.2f, 1, 30,
|
|
||||||
primary(Blocks.REDSTONE_ORE),
|
|
||||||
additional(0.3f, "ruby"));
|
|
||||||
|
|
||||||
registerOverworldVein(0.20f, 0.74f, 1, 40,
|
|
||||||
primary(Blocks.LAPIS_ORE),
|
|
||||||
additional(0.37f, "sapphire"));
|
|
||||||
|
|
||||||
//Nether veins
|
|
||||||
registerNetherVein(0.73f, 0.92f,
|
|
||||||
primary("pyrite"));
|
|
||||||
|
|
||||||
registerNetherVein(0.47f, 0.84f,
|
|
||||||
primary("sphalerite"),
|
|
||||||
additional(0.2f, "cinnabar"));
|
|
||||||
|
|
||||||
//End veins
|
|
||||||
registerEndVein(0.26f, 0.6f,
|
|
||||||
primary("sheldonite"),
|
|
||||||
additional(0.3f, "tungsten"));
|
|
||||||
|
|
||||||
registerEndVein(0.67f, 0.84f,
|
|
||||||
primary("sodalite"),
|
|
||||||
additional(0.4f, "peridot"));
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
Loading…
Add table
Add a link
Reference in a new issue