maciek/TechReborn
maciek/TechReborn
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch '1.9' of https://github.com/TechReborn/TechReborn into 1.9

Browse source
This commit is contained in:
gigabit101 2016-03-28 21:33:41 +01:00
commit c1860d6326
21 changed files with 1227 additions and 831 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
build.gradle
View file

@ -43,7 +43,7 @@ configurations {
compile.extendsFrom shade
}
version = "1.0.2"
version = "1.0.3"
def ENV = System.getenv()
if (ENV.BUILD_NUMBER) {
@ -75,7 +75,7 @@ dependencies {
if(!f.exists()){
f.mkdir()
}
compile 'RebornCore:RebornCore-1.9:2.0.3.+:dev'
compile 'RebornCore:RebornCore-1.9:2.0.4.+:dev'
deobfCompile "mezz.jei:jei_1.9:3.1.+"
deobfCompile 'MCMultiPart:MCMultiPart-experimental:1.1.0_55:universal'
}

2
src/main/java/techreborn/Core.java
View file

@ -144,7 +144,7 @@ public class Core
MinecraftForge.EVENT_BUS.register(new OreUnifier());
MinecraftForge.EVENT_BUS.register(worldGen.retroGen);
// Scrapbox
if (config.scrapboxDispenser)
if (config.ScrapboxDispenser)
{
BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.scrapBox, new BehaviorDispenseScrapbox());
}

18
src/main/java/techreborn/api/ScrapboxList.java
View file

@ -4,14 +4,28 @@ import java.util.ArrayList;
import java.util.List;
import net.minecraft.item.ItemStack;
import techreborn.Core;
public class ScrapboxList
{
public static List<ItemStack> stacks = new ArrayList<ItemStack>();
public static List<ItemStack> stacks = new ArrayList<>();
public static void addItemStackToList(ItemStack stack)
{
stacks.add(stack);
if (!hasItems(stack))
{
stacks.add(stack);
}
}
private static boolean hasItems(ItemStack stack)
{
for (ItemStack s : stacks)
{
if (stack.getDisplayName().equals(s.getDisplayName()))
return true;
}
return false;
}
}

2
src/main/java/techreborn/client/container/ContainerLesu.java
View file

@ -106,7 +106,7 @@ public class ContainerLesu extends RebornContainer
{
this.euStorage = value;
}
this.euStorage = ((connectedBlocks + 1) * ConfigTechReborn.lesuStoragePerBlock);
this.euStorage = ((connectedBlocks + 1) * ConfigTechReborn.LesuStoragePerBlock);
}
}

49
src/main/java/techreborn/compat/jei/TechRebornJeiPlugin.java
View file

@ -1,10 +1,5 @@
package techreborn.compat.jei;
import java.util.ArrayList;
import java.util.List;
import javax.annotation.Nonnull;
import mezz.jei.api.BlankModPlugin;
import mezz.jei.api.IGuiHelper;
import mezz.jei.api.IJeiHelpers;
@ -19,42 +14,8 @@ import techreborn.api.reactor.FusionReactorRecipeHelper;
import techreborn.api.recipe.RecipeHandler;
import techreborn.api.recipe.machines.AssemblingMachineRecipe;
import techreborn.api.recipe.machines.ImplosionCompressorRecipe;
import techreborn.blocks.fluid.BlockFluidTechReborn;
import techreborn.client.container.ContainerAlloyFurnace;
import techreborn.client.container.ContainerAlloySmelter;
import techreborn.client.container.ContainerAssemblingMachine;
import techreborn.client.container.ContainerBlastFurnace;
import techreborn.client.container.ContainerCentrifuge;
import techreborn.client.container.ContainerChemicalReactor;
import techreborn.client.container.ContainerCompressor;
import techreborn.client.container.ContainerExtractor;
import techreborn.client.container.ContainerFusionReactor;
import techreborn.client.container.ContainerGrinder;
import techreborn.client.container.ContainerImplosionCompressor;
import techreborn.client.container.ContainerIndustrialElectrolyzer;
import techreborn.client.container.ContainerIndustrialGrinder;
import techreborn.client.container.ContainerIndustrialSawmill;
import techreborn.client.container.ContainerRollingMachine;
import techreborn.client.container.ContainerVacuumFreezer;
import techreborn.client.gui.GuiAlloyFurnace;
import techreborn.client.gui.GuiAlloySmelter;
import techreborn.client.gui.GuiAssemblingMachine;
import techreborn.client.gui.GuiBlastFurnace;
import techreborn.client.gui.GuiCentrifuge;
import techreborn.client.gui.GuiChemicalReactor;
import techreborn.client.gui.GuiCompressor;
import techreborn.client.gui.GuiElectricFurnace;
import techreborn.client.gui.GuiExtractor;
import techreborn.client.gui.GuiFusionReactor;
import techreborn.client.gui.GuiGrinder;
import techreborn.client.gui.GuiImplosionCompressor;
import techreborn.client.gui.GuiIndustrialElectrolyzer;
import techreborn.client.gui.GuiIndustrialGrinder;
import techreborn.client.gui.GuiIndustrialSawmill;
import techreborn.client.gui.GuiIronFurnace;
import techreborn.client.gui.GuiRecycler;
import techreborn.client.gui.GuiRollingMachine;
import techreborn.client.gui.GuiVacuumFreezer;
import techreborn.client.container.*;
import techreborn.client.gui.*;
import techreborn.compat.jei.alloySmelter.AlloySmelterRecipeCategory;
import techreborn.compat.jei.alloySmelter.AlloySmelterRecipeHandler;
import techreborn.compat.jei.assemblingMachine.AssemblingMachineRecipeCategory;
@ -95,6 +56,10 @@ import techreborn.init.ModFluids;
import techreborn.init.ModItems;
import techreborn.items.ItemParts;
import javax.annotation.Nonnull;
import java.util.ArrayList;
import java.util.List;
@mezz.jei.api.JEIPlugin
public class TechRebornJeiPlugin extends BlankModPlugin
{
@ -190,7 +155,7 @@ public class TechRebornJeiPlugin extends BlankModPlugin
registry.addDescription(ItemParts.getPartByName("rubberSap"),
I18n.translateToLocal("techreborn.desc.rubberSap"));
if (!ConfigTechReborn.scrapboxDispenser)
if (!ConfigTechReborn.ScrapboxDispenser)
{
registry.addDescription(new ItemStack(ModItems.scrapBox),
I18n.translateToLocal("techreborn.desc.scrapBoxNoDispenser"));

122
src/main/java/techreborn/config/ConfigTechReborn.java
View file

@ -1,9 +1,9 @@
package techreborn.config;
import java.io.File;
import net.minecraftforge.common.config.Configuration;
import java.io.File;
public class ConfigTechReborn
{
public static String CATEGORY_WORLD = "world";
@ -20,19 +20,19 @@ public class ConfigTechReborn
public static boolean UninsulatedElectocutionSound;
public static boolean UninsulatedElectocutionParticle;
public static boolean UninsulatedElectocutionDamage;
public static boolean scrapboxDispenser;
public static boolean ScrapboxDispenser;
// Power
public static int ThermalGenertaorOutput;
public static int ThermalGeneratorOutput;
public static int CentrifugeInputTick;
public static int DragoneggsiphonerOutput;
public static int heatGeneratorOutput;
public static int aveargeEuOutTickTime;
public static int extraOutputPerLesuBlock;
public static int baseLesuOutput;
public static int lesuStoragePerBlock;
public static int farmEu;
public static int aesuMaxOutput;
public static int aesuMaxStorage;
public static int DragonEggSiphonerOutput;
public static int HeatGeneratorOutput;
public static int AverageEuOutTickTime;
public static int ExtraOutputPerLesuBlock;
public static int BaseLesuOutput;
public static int LesuStoragePerBlock;
public static int FarmEu;
public static int AesuMaxOutput;
public static int AesuMaxStorage;
// Charge
public static int IronDrillCharge;
public static int DiamondDrillCharge;
@ -126,8 +126,8 @@ public class ConfigTechReborn
// Client
public static boolean ShowChargeHud;
// EMC
public static boolean useConnectedTextures;
public static boolean oreUnifer;
public static boolean UseConnectedTextures;
public static boolean OreUnifer;
public static Configuration config;
private static ConfigTechReborn instance = null;
@ -185,25 +185,25 @@ public class ConfigTechReborn
"FortuneSecondaryOreMultiplierPerLevel").getDouble();
// Power
ThermalGenertaorOutput = config
.get(CATEGORY_POWER, "ThermalGenerator Max Output", 30, "Set the max output for the ThermalGeneratot")
ThermalGeneratorOutput = config
.get(CATEGORY_POWER, "ThermalGenerator Max Output", 30, "Set the max output for the ThermalGenerator")
.getInt();
DragoneggsiphonerOutput = config
.get(CATEGORY_POWER, "DragoneggSiphoner Max Output", 30, "Set the max output for the DragoneggSiphoner")
DragonEggSiphonerOutput = config
.get(CATEGORY_POWER, "DragoneggSiphoner Max Output", 30, "Set the max output for the DragonEggSiphoner")
.getInt();
CentrifugeInputTick = config
.get(CATEGORY_POWER, "Centrifuge Max Tick", 30, "Set the max power the Centrifuge uses per tick")
.getInt();
heatGeneratorOutput = config
HeatGeneratorOutput = config
.get(CATEGORY_POWER, "HeatGenerator Max Output", 30, "Set the max output for the HeatGenerator")
.getInt();
aesuMaxOutput = config.get(CATEGORY_POWER, "AESU Max Output", 30, "Set the max output for the AESU").getInt();
AesuMaxOutput = config.get(CATEGORY_POWER, "AESU Max Output", 30, "Set the max output for the AESU").getInt();
aesuMaxStorage = config.get(CATEGORY_POWER, "AESU Max Storage", 30, "Set the max Storage for the AESU")
AesuMaxStorage = config.get(CATEGORY_POWER, "AESU Max Storage", 30, "Set the max Storage for the AESU")
.getInt();
// Charge
@ -267,18 +267,18 @@ public class ConfigTechReborn
ThermalGeneratorCharge = config.get(CATEGORY_POWER, "ThermalGenerator MaxCharge", 1000000,
"Set the max charge for the ThermalGenerator").getInt();
aveargeEuOutTickTime = config.get(CATEGORY_POWER, "config.techreborn.aveargeEuOutTickTime", 100,
"config.techreborn.aveargeEuOutTickTime.tooltip").getInt();
AverageEuOutTickTime = config.get(CATEGORY_POWER, "config.techreborn.AverageEuOutTickTime", 100,
"config.techreborn.AverageEuOutTickTime.tooltip").getInt();
lesuStoragePerBlock = config.get(CATEGORY_POWER, "LESU Storage Block Amount", 1000000,
LesuStoragePerBlock = config.get(CATEGORY_POWER, "LESU Storage Block Amount", 1000000,
"The Amount of energy storage added per Storage block").getInt();
baseLesuOutput = config.get(CATEGORY_POWER, "LESU base output", 16, "The output of the LESU befor upgrades")
BaseLesuOutput = config.get(CATEGORY_POWER, "LESU base output", 16, "The output of the LESU befor upgrades")
.getInt();
extraOutputPerLesuBlock = config.get(CATEGORY_POWER, "Extra output on Storage Blocks", 8, "").getInt();
ExtraOutputPerLesuBlock = config.get(CATEGORY_POWER, "Extra output on Storage Blocks", 8, "").getInt();
farmEu = config.get(CATEGORY_POWER, "farmeu", 32, "").getInt();
FarmEu = config.get(CATEGORY_POWER, "farmeu", 32, "").getInt();
// Tier
IronDrillTier = config.get(CATEGORY_POWER, "IronDrill Tier", 2, "Set the Tier of the iron drill").getInt();
@ -358,7 +358,7 @@ public class ConfigTechReborn
.getBoolean(true);
UUrecipesIridiamOre = config
.get(CATEGORY_UU, "UUrecipe IridiamOre", true, "Allow IridiamOre to be crafted with UU")
.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")
@ -368,7 +368,7 @@ public class ConfigTechReborn
.getBoolean(true);
UUrecipesSnowBlock = config
.get(CATEGORY_UU, "UUrecipe SnowBlock", true, "Allow SnowBlock to be crafted with UU").getBoolean(true);
.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);
@ -389,7 +389,7 @@ public class ConfigTechReborn
.getBoolean(true);
UUrecipesGlowstoneBlock = config
.get(CATEGORY_UU, "UUrecipe GlowstoneBlock", true, "Allow GlowstoneBlock to be crafted with UU")
.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")
@ -398,106 +398,106 @@ public class ConfigTechReborn
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 Vine to be crafted with UU")
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 lilypad to be crafted with UU")
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 Bone to be crafted with UU")
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 Feather to be crafted with UU")
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 EnderPearl to be crafted with UU")
.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 IronOre to be crafted with UU")
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 IronDust to be crafted with UU")
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 GoldOre to be crafted with UU")
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 GoldDust to be crafted with UU")
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")
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")
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")
.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")
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")
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")
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")
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")
.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")
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")
.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")
.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")
.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")
.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)")
.getBoolean(true);
useConnectedTextures = config.get(CATEGORY_INTEGRATION, "Render Conected Textures", true,
UseConnectedTextures = config.get(CATEGORY_INTEGRATION, "Render Conected Textures", true,
"Render Conected Textures (Clinet Side Only)").getBoolean(true);
oreUnifer = config.get(CATEGORY_INTEGRATION, "OreUnifer", false, "change all ores int TechReborn Ores")
OreUnifer = config.get(CATEGORY_INTEGRATION, "OreUnifer", false, "Change all ores into TechReborn Ores")
.getBoolean(false);
UninsulatedElectocutionDamage = config.get(CATEGORY_WORLD, "Uninsulated Electocution Damage", true,
UninsulatedElectocutionDamage = config.get(CATEGORY_WORLD, "Uninsulated Electrocution Damage", true,
"Damage entities on contact with uninsulated cables").getBoolean(true);
UninsulatedElectocutionSound = config.get(CATEGORY_WORLD, "Uninsulated Electocution Sound", true,
UninsulatedElectocutionSound = config.get(CATEGORY_WORLD, "Uninsulated Electrocution Sound", true,
"Play sound on contact with uninsulated cables").getBoolean(true);
UninsulatedElectocutionParticle = config.get(CATEGORY_WORLD, "Uninsulated Electocution Particle", true,
UninsulatedElectocutionParticle = config.get(CATEGORY_WORLD, "Uninsulated Electrocution Particle", true,
"Spawn particles on contact with uninsulated cables").getBoolean(true);
scrapboxDispenser = config
.get(CATEGORY_WORLD, "Scrapboxes in Dispenser", true, "Allow scrapbox to be opened via dispenser")
ScrapboxDispenser = config
.get(CATEGORY_WORLD, "Scrapboxes in Dispenser", true, "Allow scrapboxes to be opened via dispenser")
.getBoolean(true);
ExpensiveWatermill = config
@ -519,4 +519,4 @@ public class ConfigTechReborn
config.save();
}
}
}
}

6
src/main/java/techreborn/events/OreUnifier.java
View file

@ -1,7 +1,5 @@
package techreborn.events;
import java.util.HashMap;
import net.minecraft.block.Block;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
@ -12,6 +10,8 @@ import net.minecraftforge.oredict.OreDictionary;
import reborncore.common.util.ItemUtils;
import techreborn.config.ConfigTechReborn;
import java.util.HashMap;
public class OreUnifier
{
@ -36,7 +36,7 @@ public class OreUnifier
@SubscribeEvent
public void itemTick(TickEvent.PlayerTickEvent event)
{
if (ConfigTechReborn.oreUnifer && !event.player.worldObj.isRemote
if (ConfigTechReborn.OreUnifer && !event.player.worldObj.isRemote
&& event.player.worldObj.getTotalWorldTime() % 10 == 0)
{
if (event.player.getHeldItem(EnumHand.MAIN_HAND) != null)

46
src/main/java/techreborn/init/ModItems.java
View file

@ -14,11 +14,50 @@ import reborncore.common.util.BucketHandler;
import techreborn.Core;
import techreborn.blocks.BlockMachineFrame;
import techreborn.events.OreUnifier;
import techreborn.items.*;
import techreborn.items.ItemCells;
import techreborn.items.ItemCrushedOre;
import techreborn.items.ItemDusts;
import techreborn.items.ItemDustsSmall;
import techreborn.items.ItemEnergyCrystal;
import techreborn.items.ItemGems;
import techreborn.items.ItemIngots;
import techreborn.items.ItemLapotronCrystal;
import techreborn.items.ItemLapotronicOrb;
import techreborn.items.ItemLithiumBattery;
import techreborn.items.ItemMissingRecipe;
import techreborn.items.ItemNuggets;
import techreborn.items.ItemParts;
import techreborn.items.ItemPlates;
import techreborn.items.ItemReBattery;
import techreborn.items.ItemScrapBox;
import techreborn.items.ItemUUmatter;
import techreborn.items.armor.ItemLapotronPack;
import techreborn.items.armor.ItemLithiumBatpack;
import techreborn.items.armor.ItemTRArmour;
import techreborn.items.tools.*;
import techreborn.items.tools.ItemAdvancedChainsaw;
import techreborn.items.tools.ItemAdvancedDrill;
import techreborn.items.tools.ItemCloakingDevice;
import techreborn.items.tools.ItemDebugTool;
import techreborn.items.tools.ItemDiamondChainsaw;
import techreborn.items.tools.ItemDiamondDrill;
import techreborn.items.tools.ItemDiamondJackhammer;
import techreborn.items.tools.ItemFluidbucket;
import techreborn.items.tools.ItemHammer;
import techreborn.items.tools.ItemIronChainsaw;
import techreborn.items.tools.ItemIronDrill;
import techreborn.items.tools.ItemIronJackhammer;
import techreborn.items.tools.ItemNanosaber;
import techreborn.items.tools.ItemOmniTool;
import techreborn.items.tools.ItemRockCutter;
import techreborn.items.tools.ItemSteelJackhammer;
import techreborn.items.tools.ItemTRAxe;
import techreborn.items.tools.ItemTRHoe;
import techreborn.items.tools.ItemTRPickaxe;
import techreborn.items.tools.ItemTRSpade;
import techreborn.items.tools.ItemTRSword;
import techreborn.items.tools.ItemTechManual;
import techreborn.items.tools.ItemTreeTap;
import techreborn.items.tools.ItemWrench;
import techreborn.lib.Reference;
public class ModItems
@ -842,6 +881,9 @@ public class ModItems
OreUnifier.registerOre("crushedTetrahedrite", ItemCrushedOre.getCrushedOreByName("Tetrahedrite"));
OreUnifier.registerOre("crushedTungsten", ItemCrushedOre.getCrushedOreByName("Tungsten"));
OreUnifier.registerOre("diamondTR", ItemDusts.getDustByName("Diamond"));
OreUnifier.registerOre("diamondTR", Items.diamond);
// Purified Crushed Ore
// OreUnifier.registerOre("crushedPurifiedAluminum",
// ItemPurifiedCrushedOre.getPurifiedCrushedOreByName("Aluminum"));

1775
src/main/java/techreborn/init/ModRecipes.java
View file

File diff suppressed because it is too large Load diff

2
src/main/java/techreborn/power/TRPowerNet.java
View file

@ -318,7 +318,7 @@ public class TRPowerNet
int total = 0;
if (tile.canAcceptEnergy(side) && max > 0)
{
if (type.tier.ordinal() > tile.getTier().ordinal())
if (type.tier.ordinal() > tile.getTier().ordinal() && max > tile.getMaxInput())
{
if (tile instanceof TileEntity)
{

6
src/main/java/techreborn/tiles/TileAesu.java
View file

@ -14,8 +14,8 @@ import ic2.api.tile.IWrenchable;
public class TileAesu extends TilePowerAcceptor implements IWrenchable
{
public static final int MAX_OUTPUT = ConfigTechReborn.aesuMaxOutput;
public static final int MAX_STORAGE = ConfigTechReborn.aesuMaxStorage;
public static final int MAX_OUTPUT = ConfigTechReborn.AesuMaxOutput;
public static final int MAX_STORAGE = ConfigTechReborn.AesuMaxStorage;
public Inventory inventory = new Inventory(4, "TileAesu", 64, this);
private int OUTPUT = 64; // The current output
private double euLastTick = 0;
@ -31,7 +31,7 @@ public class TileAesu extends TilePowerAcceptor implements IWrenchable
public void updateEntity()
{
super.updateEntity();
if (ticks == ConfigTechReborn.aveargeEuOutTickTime)
if (ticks == ConfigTechReborn.AverageEuOutTickTime)
{
euChange = -1;
ticks = 0;

2
src/main/java/techreborn/tiles/generator/TileDieselGenerator.java
View file

@ -27,7 +27,7 @@ import ic2.api.tile.IWrenchable;
public class TileDieselGenerator extends TilePowerAcceptor implements IWrenchable, IFluidHandler, IInventory
{
public static final int euTick = ConfigTechReborn.ThermalGenertaorOutput;
public static final int euTick = ConfigTechReborn.ThermalGeneratorOutput;
public Tank tank = new Tank("TileDieselGenerator", FluidContainerRegistry.BUCKET_VOLUME * 10, this);
public Inventory inventory = new Inventory(3, "TileDieselGenerator", 64, this);

2
src/main/java/techreborn/tiles/generator/TileDragonEggSiphoner.java
View file

@ -18,7 +18,7 @@ import ic2.api.tile.IWrenchable;
public class TileDragonEggSiphoner extends TilePowerAcceptor implements IWrenchable, IInventory
{
public static final int euTick = ConfigTechReborn.DragoneggsiphonerOutput;
public static final int euTick = ConfigTechReborn.DragonEggSiphonerOutput;
public Inventory inventory = new Inventory(3, "TileAlloySmelter", 64, this);
public TileDragonEggSiphoner()

2
src/main/java/techreborn/tiles/generator/TileHeatGenerator.java
View file

@ -14,7 +14,7 @@ import ic2.api.tile.IWrenchable;
public class TileHeatGenerator extends TilePowerAcceptor implements IWrenchable
{
public static final int euTick = ConfigTechReborn.heatGeneratorOutput;
public static final int euTick = ConfigTechReborn.HeatGeneratorOutput;
public TileHeatGenerator()
{

2
src/main/java/techreborn/tiles/generator/TileThermalGenerator.java
View file

@ -30,7 +30,7 @@ import ic2.api.tile.IWrenchable;
public class TileThermalGenerator extends TilePowerAcceptor implements IWrenchable, IFluidHandler, IInventory
{
public static final int euTick = ConfigTechReborn.ThermalGenertaorOutput;
public static final int euTick = ConfigTechReborn.ThermalGeneratorOutput;
public Tank tank = new Tank("TileThermalGenerator", FluidContainerRegistry.BUCKET_VOLUME * 10, this);
public Inventory inventory = new Inventory(3, "TileThermalGenerator", 64, this);

2
src/main/java/techreborn/tiles/idsu/TileIDSU.java
View file

@ -135,7 +135,7 @@ public class TileIDSU extends TilePowerAcceptor
{
super.updateEntity();
if (ticks == ConfigTechReborn.aveargeEuOutTickTime)
if (ticks == ConfigTechReborn.AverageEuOutTickTime)
{
euChange = -1;
ticks = 0;

10
src/main/java/techreborn/tiles/lesu/TileLesu.java
View file

@ -1,7 +1,5 @@
package techreborn.tiles.lesu;
import java.util.ArrayList;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos;
import reborncore.api.power.EnumPowerTier;
@ -9,6 +7,8 @@ import reborncore.common.powerSystem.TilePowerAcceptor;
import reborncore.common.util.Inventory;
import techreborn.config.ConfigTechReborn;
import java.util.ArrayList;
public class TileLesu extends TilePowerAcceptor
{// TODO wrench
@ -62,10 +62,10 @@ public class TileLesu extends TilePowerAcceptor
}
}
}
maxStorage = ((connectedBlocks + 1) * ConfigTechReborn.lesuStoragePerBlock);
output = (connectedBlocks * ConfigTechReborn.extraOutputPerLesuBlock) + ConfigTechReborn.baseLesuOutput;
maxStorage = ((connectedBlocks + 1) * ConfigTechReborn.LesuStoragePerBlock);
output = (connectedBlocks * ConfigTechReborn.ExtraOutputPerLesuBlock) + ConfigTechReborn.BaseLesuOutput;
if (ticks == ConfigTechReborn.aveargeEuOutTickTime)
if (ticks == ConfigTechReborn.AverageEuOutTickTime)
{
euChange = -1;
ticks = 0;

6
src/main/resources/assets/techreborn/lang/en_US.lang
View file

@ -713,7 +713,7 @@ item.bucketwolframium.name=Wolframium Bucket
#Items
item.techreborn.uuMatter.name=UU-Matter
item.techreborn.manual.name=Tech Manual
item.techreborn.debug.name=Debug Tool
#Configs
config.techreborn.allow.galenaOre=Allow Galena Ore
config.techreborn.allow.galenaOre.tooltip=Decide whether Galena Ore spawns or not
@ -1043,3 +1043,7 @@ techreborn.jei.category.alloy.furnace=Alloy Furnace
#Death Messages
death.attack.shock=%s was electrocuted
#Entitys
entity.techreborn.nuke.name=Nuke

BIN
src/main/resources/assets/techreborn/textures/blocks/machine/machine_blocks/advancedMachine_machine_block.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 753 B

After

Width:  |  Height:  |  Size: 869 B

BIN
src/main/resources/assets/techreborn/textures/blocks/machine/machine_blocks/highlyadvancedmachine.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 327 B

After

Width:  |  Height:  |  Size: 897 B

BIN
src/main/resources/assets/techreborn/textures/blocks/machine/machine_blocks/machine_machine_block.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 547 B

After

Width:  |  Height:  |  Size: 534 B