Continue to make sense of things... this mod's a mess lol

This commit is contained in:
ProfessorProspector 2018-09-16 20:31:01 -07:00
parent d98802ee1b
commit 0b963dcda9
171 changed files with 269 additions and 234 deletions

View file

@ -29,7 +29,7 @@ import net.minecraft.util.math.BlockPos;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidRegistry;
import techreborn.init.TRContent;
import techreborn.tiles.multiblock.TileFluidReplicator;
import techreborn.tiles.machine.multiblock.TileFluidReplicator;
import javax.annotation.Nonnull;
import java.util.ArrayList;

View file

@ -33,7 +33,7 @@ import reborncore.common.util.Inventory;
import reborncore.common.util.Tank;
import techreborn.api.Reference;
import techreborn.init.TRContent;
import techreborn.tiles.multiblock.TileFluidReplicator;
import techreborn.tiles.machine.multiblock.TileFluidReplicator;
/**
* @author drcrazy

View file

@ -50,8 +50,8 @@ import techreborn.TechReborn;
import techreborn.events.TRRecipeHandler;
import techreborn.init.ModSounds;
import techreborn.init.TRContent;
import techreborn.items.tools.ItemElectricTreetap;
import techreborn.items.tools.ItemTreeTap;
import techreborn.items.tool.basic.ItemElectricTreetap;
import techreborn.items.tool.ItemTreeTap;
import techreborn.utils.TechRebornCreativeTab;
import java.util.ArrayList;

View file

@ -32,7 +32,7 @@ import reborncore.client.models.RebornModelRegistry;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.TechReborn;
import techreborn.client.EGui;
import techreborn.tiles.generator.TileDieselGenerator;
import techreborn.tiles.generator.advanced.TileDieselGenerator;
import techreborn.utils.TechRebornCreativeTab;
/**

View file

@ -31,7 +31,7 @@ import reborncore.client.models.ModelCompound;
import reborncore.client.models.RebornModelRegistry;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.TechReborn;
import techreborn.tiles.generator.TileDragonEggSyphon;
import techreborn.tiles.generator.advanced.TileDragonEggSyphon;
import techreborn.utils.TechRebornCreativeTab;
public class BlockDragonEggSyphon extends BlockMachineBase {

View file

@ -32,7 +32,7 @@ import reborncore.client.models.RebornModelRegistry;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.TechReborn;
import techreborn.client.EGui;
import techreborn.tiles.generator.TileGasTurbine;
import techreborn.tiles.generator.advanced.TileGasTurbine;
import techreborn.utils.TechRebornCreativeTab;
public class BlockGasTurbine extends BlockMachineBase {

View file

@ -32,7 +32,7 @@ import reborncore.client.models.RebornModelRegistry;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.TechReborn;
import techreborn.client.EGui;
import techreborn.tiles.generator.TileSemiFluidGenerator;
import techreborn.tiles.generator.advanced.TileSemiFluidGenerator;
import techreborn.utils.TechRebornCreativeTab;
public class BlockSemiFluidGenerator extends BlockMachineBase {

View file

@ -32,7 +32,7 @@ import reborncore.client.models.RebornModelRegistry;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.TechReborn;
import techreborn.client.EGui;
import techreborn.tiles.generator.TileSolidFuelGenerator;
import techreborn.tiles.generator.basic.TileSolidFuelGenerator;
import techreborn.utils.TechRebornCreativeTab;
public class BlockSolidFuelGenerator extends BlockMachineBase {

View file

@ -32,7 +32,7 @@ import reborncore.client.models.RebornModelRegistry;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.TechReborn;
import techreborn.client.EGui;
import techreborn.tiles.generator.TileThermalGenerator;
import techreborn.tiles.generator.advanced.TileThermalGenerator;
import techreborn.utils.TechRebornCreativeTab;
public class BlockThermalGenerator extends BlockMachineBase {

View file

@ -31,7 +31,7 @@ import reborncore.client.models.ModelCompound;
import reborncore.client.models.RebornModelRegistry;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.TechReborn;
import techreborn.tiles.generator.TileWaterMill;
import techreborn.tiles.generator.basic.TileWaterMill;
import techreborn.utils.TechRebornCreativeTab;
/**

View file

@ -31,7 +31,7 @@ import reborncore.client.models.ModelCompound;
import reborncore.client.models.RebornModelRegistry;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.TechReborn;
import techreborn.tiles.generator.TileWindMill;
import techreborn.tiles.generator.basic.TileWindMill;
import techreborn.utils.TechRebornCreativeTab;
/**

View file

@ -36,7 +36,7 @@ import net.minecraft.world.World;
import reborncore.common.RebornCoreConfig;
import techreborn.client.EGui;
import techreborn.init.ModBlocks;
import techreborn.tiles.idsu.TileInterdimensionalSU;
import techreborn.tiles.storage.idsu.TileInterdimensionalSU;
public class BlockInterdimensionalSU extends BlockEnergyStorage {

View file

@ -46,7 +46,7 @@ import reborncore.common.blocks.BlockWrenchEventHandler;
import reborncore.common.items.WrenchHelper;
import techreborn.TechReborn;
import techreborn.init.ModBlocks;
import techreborn.tiles.lesu.TileLSUStorage;
import techreborn.tiles.storage.lesu.TileLSUStorage;
import techreborn.utils.TechRebornCreativeTab;
/**

View file

@ -34,7 +34,7 @@ import net.minecraft.world.World;
import reborncore.common.RebornCoreConfig;
import techreborn.client.EGui;
import techreborn.init.ModBlocks;
import techreborn.tiles.lesu.TileLapotronicSU;
import techreborn.tiles.storage.lesu.TileLapotronicSU;
public class BlockLapotronicSU extends BlockEnergyStorage {

View file

@ -36,7 +36,7 @@ import reborncore.client.models.RebornModelRegistry;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.TechReborn;
import techreborn.client.EGui;
import techreborn.tiles.tier0.TileIronAlloyFurnace;
import techreborn.tiles.machine.iron.TileIronAlloyFurnace;
import techreborn.utils.TechRebornCreativeTab;
import java.util.ArrayList;

View file

@ -40,7 +40,7 @@ import reborncore.client.models.RebornModelRegistry;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.TechReborn;
import techreborn.client.EGui;
import techreborn.tiles.tier0.TileIronFurnace;
import techreborn.tiles.machine.iron.TileIronFurnace;
import techreborn.utils.TechRebornCreativeTab;
import java.util.ArrayList;

View file

@ -32,7 +32,7 @@ import reborncore.client.models.RebornModelRegistry;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.TechReborn;
import techreborn.client.EGui;
import techreborn.tiles.tier1.TileAlloySmelter;
import techreborn.tiles.machine.tier1.TileAlloySmelter;
import techreborn.utils.TechRebornCreativeTab;
public class BlockAlloySmelter extends BlockMachineBase {

View file

@ -32,7 +32,7 @@ import reborncore.client.models.RebornModelRegistry;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.TechReborn;
import techreborn.client.EGui;
import techreborn.tiles.tier1.TileAssemblingMachine;
import techreborn.tiles.machine.tier1.TileAssemblingMachine;
import techreborn.utils.TechRebornCreativeTab;
public class BlockAssemblingMachine extends BlockMachineBase {

View file

@ -34,7 +34,7 @@ import reborncore.client.models.RebornModelRegistry;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.TechReborn;
import techreborn.client.EGui;
import techreborn.tiles.tier1.TileAutoCraftingTable;
import techreborn.tiles.machine.tier1.TileAutoCraftingTable;
import techreborn.utils.TechRebornCreativeTab;
public class BlockAutoCraftingTable extends BlockMachineBase {

View file

@ -32,7 +32,7 @@ import reborncore.client.models.RebornModelRegistry;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.TechReborn;
import techreborn.client.EGui;
import techreborn.tiles.tier1.TileCompressor;
import techreborn.tiles.machine.tier1.TileCompressor;
import techreborn.utils.TechRebornCreativeTab;
public class BlockCompressor extends BlockMachineBase {

View file

@ -32,7 +32,7 @@ import reborncore.client.models.RebornModelRegistry;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.TechReborn;
import techreborn.client.EGui;
import techreborn.tiles.tier1.TileElectricFurnace;
import techreborn.tiles.machine.tier1.TileElectricFurnace;
import techreborn.utils.TechRebornCreativeTab;
public class BlockElectricFurnace extends BlockMachineBase {

View file

@ -32,7 +32,7 @@ import reborncore.client.models.RebornModelRegistry;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.TechReborn;
import techreborn.client.EGui;
import techreborn.tiles.tier1.TileExtractor;
import techreborn.tiles.machine.tier1.TileExtractor;
import techreborn.utils.TechRebornCreativeTab;
public class BlockExtractor extends BlockMachineBase {

View file

@ -32,7 +32,7 @@ import reborncore.client.models.RebornModelRegistry;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.TechReborn;
import techreborn.client.EGui;
import techreborn.tiles.tier1.TileGrinder;
import techreborn.tiles.machine.tier1.TileGrinder;
import techreborn.utils.TechRebornCreativeTab;
public class BlockGrinder extends BlockMachineBase {

View file

@ -59,7 +59,7 @@ import reborncore.common.util.StringUtils;
import techreborn.TechReborn;
import techreborn.init.ModBlocks;
import techreborn.lib.MessageIDs;
import techreborn.tiles.tier1.TilePlayerDectector;
import techreborn.tiles.machine.tier1.TilePlayerDectector;
import techreborn.utils.TechRebornCreativeTab;
import java.util.List;

View file

@ -32,7 +32,7 @@ import reborncore.client.models.RebornModelRegistry;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.TechReborn;
import techreborn.client.EGui;
import techreborn.tiles.tier1.TileRecycler;
import techreborn.tiles.machine.tier1.TileRecycler;
import techreborn.utils.TechRebornCreativeTab;
public class BlockRecycler extends BlockMachineBase {

View file

@ -32,7 +32,7 @@ import reborncore.client.models.RebornModelRegistry;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.TechReborn;
import techreborn.client.EGui;
import techreborn.tiles.tier1.TileRollingMachine;
import techreborn.tiles.machine.tier1.TileRollingMachine;
import techreborn.utils.TechRebornCreativeTab;
public class BlockRollingMachine extends BlockMachineBase {

View file

@ -32,7 +32,7 @@ import reborncore.client.models.RebornModelRegistry;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.TechReborn;
import techreborn.client.EGui;
import techreborn.tiles.tier1.TileScrapboxinator;
import techreborn.tiles.machine.tier1.TileScrapboxinator;
import techreborn.utils.TechRebornCreativeTab;
public class BlockScrapboxinator extends BlockMachineBase {

View file

@ -32,7 +32,7 @@ import reborncore.client.models.RebornModelRegistry;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.TechReborn;
import techreborn.client.EGui;
import techreborn.tiles.tier1.TileChemicalReactor;
import techreborn.tiles.machine.tier1.TileChemicalReactor;
import techreborn.utils.TechRebornCreativeTab;
public class BlockChemicalReactor extends BlockMachineBase {

View file

@ -32,7 +32,7 @@ import reborncore.client.models.RebornModelRegistry;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.TechReborn;
import techreborn.client.EGui;
import techreborn.tiles.multiblock.TileDistillationTower;
import techreborn.tiles.machine.multiblock.TileDistillationTower;
import techreborn.utils.TechRebornCreativeTab;
public class BlockDistillationTower extends BlockMachineBase {

View file

@ -32,7 +32,7 @@ import reborncore.client.models.RebornModelRegistry;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.TechReborn;
import techreborn.client.EGui;
import techreborn.tiles.multiblock.TileImplosionCompressor;
import techreborn.tiles.machine.multiblock.TileImplosionCompressor;
import techreborn.utils.TechRebornCreativeTab;
public class BlockImplosionCompressor extends BlockMachineBase {

View file

@ -32,7 +32,7 @@ import reborncore.client.models.RebornModelRegistry;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.TechReborn;
import techreborn.client.EGui;
import techreborn.tiles.multiblock.TileIndustrialBlastFurnace;
import techreborn.tiles.machine.multiblock.TileIndustrialBlastFurnace;
import techreborn.utils.TechRebornCreativeTab;
public class BlockIndustrialBlastFurnace extends BlockMachineBase {

View file

@ -32,7 +32,7 @@ import reborncore.client.models.RebornModelRegistry;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.TechReborn;
import techreborn.client.EGui;
import techreborn.tiles.tier1.TileIndustrialElectrolyzer;
import techreborn.tiles.machine.tier1.TileIndustrialElectrolyzer;
import techreborn.utils.TechRebornCreativeTab;
public class BlockIndustrialElectrolyzer extends BlockMachineBase {

View file

@ -32,7 +32,7 @@ import reborncore.client.models.RebornModelRegistry;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.TechReborn;
import techreborn.client.EGui;
import techreborn.tiles.multiblock.TileIndustrialGrinder;
import techreborn.tiles.machine.multiblock.TileIndustrialGrinder;
import techreborn.utils.TechRebornCreativeTab;
public class BlockIndustrialGrinder extends BlockMachineBase {

View file

@ -32,7 +32,7 @@ import reborncore.client.models.RebornModelRegistry;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.TechReborn;
import techreborn.client.EGui;
import techreborn.tiles.multiblock.TileIndustrialSawmill;
import techreborn.tiles.machine.multiblock.TileIndustrialSawmill;
import techreborn.utils.TechRebornCreativeTab;
public class BlockIndustrialSawmill extends BlockMachineBase {

View file

@ -32,7 +32,7 @@ import reborncore.client.models.RebornModelRegistry;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.TechReborn;
import techreborn.client.EGui;
import techreborn.tiles.multiblock.TileVacuumFreezer;
import techreborn.tiles.machine.multiblock.TileVacuumFreezer;
import techreborn.utils.TechRebornCreativeTab;
public class BlockVacuumFreezer extends BlockMachineBase {

View file

@ -32,7 +32,7 @@ import reborncore.client.models.RebornModelRegistry;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.TechReborn;
import techreborn.client.EGui;
import techreborn.tiles.multiblock.TileFluidReplicator;
import techreborn.tiles.machine.multiblock.TileFluidReplicator;
import techreborn.utils.TechRebornCreativeTab;
public class BlockFluidReplicator extends BlockMachineBase {

View file

@ -36,16 +36,21 @@ import techreborn.client.gui.GuiAutoCrafting;
import techreborn.tiles.*;
import techreborn.tiles.fusionReactor.TileFusionControlComputer;
import techreborn.tiles.generator.*;
import techreborn.tiles.idsu.TileInterdimensionalSU;
import techreborn.tiles.lesu.TileLapotronicSU;
import techreborn.tiles.multiblock.*;
import techreborn.tiles.generator.advanced.TileDieselGenerator;
import techreborn.tiles.generator.advanced.TileGasTurbine;
import techreborn.tiles.generator.advanced.TileSemiFluidGenerator;
import techreborn.tiles.generator.advanced.TileThermalGenerator;
import techreborn.tiles.generator.basic.TileSolidFuelGenerator;
import techreborn.tiles.storage.idsu.TileInterdimensionalSU;
import techreborn.tiles.storage.lesu.TileLapotronicSU;
import techreborn.tiles.machine.multiblock.*;
import techreborn.tiles.storage.TileAdjustableSU;
import techreborn.tiles.storage.TileHighVoltageSU;
import techreborn.tiles.storage.TileLowVoltageSU;
import techreborn.tiles.storage.TileMediumVoltageSU;
import techreborn.tiles.tier0.TileIronAlloyFurnace;
import techreborn.tiles.tier0.TileIronFurnace;
import techreborn.tiles.tier1.*;
import techreborn.tiles.machine.iron.TileIronAlloyFurnace;
import techreborn.tiles.machine.iron.TileIronFurnace;
import techreborn.tiles.machine.tier1.*;
public class GuiHandler implements IGuiHandler {

View file

@ -57,27 +57,27 @@ public class RegisterItemJsons {
register(TRItems.LITHIUM_ION_BATPACK, "tool/lithium_batpack");
// Battery
register(TRItems.RECHARGEABLE_BATTERY, "battery/re_battery");
register(TRItems.RED_CELL_BATTERY, "battery/re_battery");
register(TRItems.LITHIUM_ION_BATTERY, "battery/lithium_battery");
register(TRItems.ENERGY_CRYSTAL, "battery/energy_crystal");
register(TRItems.LAPOTRON_CRYSTAL, "battery/lapotron_crystal");
register(TRItems.LAPOTRONIC_ORB, "battery/lapotronic_orb");
// Tools
register(TRItems.INDUSTRIAL_CHAINSAW, "tool/industrial_chainsaw");
register(TRItems.INDUSTRIAL_DRILL, "tool/industrial_drill");
register(TRItems.INDUSTRIAL_JACKHAMMER, "tool/industrial_jackhammer");
register(TRItems.DEBUG_TOOL, "misc/debug");
register(TRItems.ADVANCED_CHAINSAW, "tool/advanced_chainsaw");
register(TRItems.ADVANCED_DRILL, "tool/advanced_drill");
register(TRItems.ADVANCED_JACKHAMMER, "tool/advanced_jackhammer");
register(TRItems.DEBUG_TOOL, "misc/debug");
register(TRItems.DIAMOND_CHAINSAW, "tool/diamond_chainsaw");
register(TRItems.DIAMOND_DRILL, "tool/diamond_drill");
register(TRItems.DIAMOND_JACKHAMMER, "tool/diamond_jackhammer");
register(TRItems.ELECTRIC_TREE_TAP, "tool/electric_treetap");
register(TRItems.NANOSABER, "tool/nanosaber");
register(TRItems.OMNI_TOOL, "tool/omni_tool");
register(TRItems.ROCK_CUTTER, "tool/rock_cutter");
register(TRItems.STEEL_CHAINSAW, "tool/steel_chainsaw");
register(TRItems.STEEL_DRILL, "tool/steel_drill");
register(TRItems.STEEL_JACKHAMMER, "tool/steel_jackhammer");
register(TRItems.BASIC_CHAINSAW, "tool/basic_chainsaw");
register(TRItems.BASIC_DRILL, "tool/basic_drill");
register(TRItems.BASIC_JACKHAMMER, "tool/basic_jackhammer");
register(TRItems.TREE_TAP, "tool/treetap");
register(TRItems.WRENCH, "tool/wrench");

View file

@ -29,7 +29,7 @@ import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.client.resources.I18n;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.util.ResourceLocation;
import techreborn.tiles.tier0.TileIronAlloyFurnace;
import techreborn.tiles.machine.iron.TileIronAlloyFurnace;
public class GuiAlloyFurnace extends GuiContainer {

View file

@ -25,7 +25,7 @@
package techreborn.client.gui;
import net.minecraft.entity.player.EntityPlayer;
import techreborn.tiles.tier1.TileAlloySmelter;
import techreborn.tiles.machine.tier1.TileAlloySmelter;
public class GuiAlloySmelter extends GuiBase {

View file

@ -25,7 +25,7 @@
package techreborn.client.gui;
import net.minecraft.entity.player.EntityPlayer;
import techreborn.tiles.tier1.TileAssemblingMachine;
import techreborn.tiles.machine.tier1.TileAssemblingMachine;
public class GuiAssemblingMachine extends GuiBase {

View file

@ -34,7 +34,7 @@ import net.minecraft.item.crafting.IRecipe;
import net.minecraft.util.ResourceLocation;
import reborncore.common.network.NetworkManager;
import techreborn.packets.PacketAutoCraftingTableLock;
import techreborn.tiles.tier1.TileAutoCraftingTable;
import techreborn.tiles.machine.tier1.TileAutoCraftingTable;
import java.io.IOException;

View file

@ -36,7 +36,7 @@ import reborncore.client.multiblock.MultiblockSet;
import techreborn.client.gui.widget.GuiButtonHologram;
import techreborn.init.ModBlocks;
import techreborn.proxies.ClientProxy;
import techreborn.tiles.multiblock.TileIndustrialBlastFurnace;
import techreborn.tiles.machine.multiblock.TileIndustrialBlastFurnace;
import java.io.IOException;

View file

@ -25,7 +25,7 @@
package techreborn.client.gui;
import net.minecraft.entity.player.EntityPlayer;
import techreborn.tiles.tier1.TileChemicalReactor;
import techreborn.tiles.machine.tier1.TileChemicalReactor;
public class GuiChemicalReactor extends GuiBase {

View file

@ -25,7 +25,7 @@
package techreborn.client.gui;
import net.minecraft.entity.player.EntityPlayer;
import techreborn.tiles.tier1.TileCompressor;
import techreborn.tiles.machine.tier1.TileCompressor;
public class GuiCompressor extends GuiBase {

View file

@ -27,7 +27,7 @@ package techreborn.client.gui;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import techreborn.tiles.generator.TileDieselGenerator;
import techreborn.tiles.generator.advanced.TileDieselGenerator;
@SideOnly(Side.CLIENT)
public class GuiDieselGenerator extends GuiBase {

View file

@ -36,7 +36,7 @@ import reborncore.client.multiblock.MultiblockSet;
import techreborn.client.gui.widget.GuiButtonHologram;
import techreborn.init.ModBlocks;
import techreborn.proxies.ClientProxy;
import techreborn.tiles.multiblock.TileDistillationTower;
import techreborn.tiles.machine.multiblock.TileDistillationTower;
import java.io.IOException;

View file

@ -25,7 +25,7 @@
package techreborn.client.gui;
import net.minecraft.entity.player.EntityPlayer;
import techreborn.tiles.tier1.TileElectricFurnace;
import techreborn.tiles.machine.tier1.TileElectricFurnace;
public class GuiElectricFurnace extends GuiBase {

View file

@ -25,7 +25,7 @@
package techreborn.client.gui;
import net.minecraft.entity.player.EntityPlayer;
import techreborn.tiles.tier1.TileExtractor;
import techreborn.tiles.machine.tier1.TileExtractor;
public class GuiExtractor extends GuiBase {

View file

@ -35,7 +35,7 @@ import reborncore.client.multiblock.MultiblockSet;
import techreborn.client.gui.widget.GuiButtonHologram;
import techreborn.init.ModBlocks;
import techreborn.proxies.ClientProxy;
import techreborn.tiles.multiblock.TileFluidReplicator;
import techreborn.tiles.machine.multiblock.TileFluidReplicator;
import java.io.IOException;

View file

@ -25,7 +25,7 @@
package techreborn.client.gui;
import net.minecraft.entity.player.EntityPlayer;
import techreborn.tiles.generator.TileGasTurbine;
import techreborn.tiles.generator.advanced.TileGasTurbine;
public class GuiGasTurbine extends GuiBase {

View file

@ -25,7 +25,7 @@
package techreborn.client.gui;
import net.minecraft.entity.player.EntityPlayer;
import techreborn.tiles.generator.TileSolidFuelGenerator;
import techreborn.tiles.generator.basic.TileSolidFuelGenerator;
public class GuiGenerator extends GuiBase {

View file

@ -25,7 +25,7 @@
package techreborn.client.gui;
import net.minecraft.entity.player.EntityPlayer;
import techreborn.tiles.tier1.TileGrinder;
import techreborn.tiles.machine.tier1.TileGrinder;
public class GuiGrinder extends GuiBase {

View file

@ -27,7 +27,7 @@ package techreborn.client.gui;
import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.entity.player.EntityPlayer;
import reborncore.common.powerSystem.PowerSystem;
import techreborn.tiles.idsu.TileInterdimensionalSU;
import techreborn.tiles.storage.idsu.TileInterdimensionalSU;
public class GuiIDSU extends GuiBase {

View file

@ -35,7 +35,7 @@ import reborncore.client.multiblock.MultiblockSet;
import techreborn.client.gui.widget.GuiButtonHologram;
import techreborn.init.ModBlocks;
import techreborn.proxies.ClientProxy;
import techreborn.tiles.multiblock.TileImplosionCompressor;
import techreborn.tiles.machine.multiblock.TileImplosionCompressor;
import java.io.IOException;

View file

@ -25,7 +25,7 @@
package techreborn.client.gui;
import net.minecraft.entity.player.EntityPlayer;
import techreborn.tiles.tier1.TileIndustrialElectrolyzer;
import techreborn.tiles.machine.tier1.TileIndustrialElectrolyzer;
public class GuiIndustrialElectrolyzer extends GuiBase {

View file

@ -36,7 +36,7 @@ import reborncore.client.multiblock.MultiblockSet;
import techreborn.client.gui.widget.GuiButtonHologram;
import techreborn.init.ModBlocks;
import techreborn.proxies.ClientProxy;
import techreborn.tiles.multiblock.TileIndustrialGrinder;
import techreborn.tiles.machine.multiblock.TileIndustrialGrinder;
import java.io.IOException;

View file

@ -36,7 +36,7 @@ import reborncore.client.multiblock.MultiblockSet;
import techreborn.client.gui.widget.GuiButtonHologram;
import techreborn.init.ModBlocks;
import techreborn.proxies.ClientProxy;
import techreborn.tiles.multiblock.TileIndustrialSawmill;
import techreborn.tiles.machine.multiblock.TileIndustrialSawmill;
import java.io.IOException;

View file

@ -30,7 +30,7 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ResourceLocation;
import techreborn.init.TRItems;
import techreborn.tiles.tier0.TileIronFurnace;
import techreborn.tiles.machine.iron.TileIronFurnace;
public class GuiIronFurnace extends GuiBase {

View file

@ -27,7 +27,7 @@ package techreborn.client.gui;
import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.entity.player.EntityPlayer;
import reborncore.common.powerSystem.PowerSystem;
import techreborn.tiles.lesu.TileLapotronicSU;
import techreborn.tiles.storage.lesu.TileLapotronicSU;
public class GuiLESU extends GuiBase {

View file

@ -25,7 +25,7 @@
package techreborn.client.gui;
import net.minecraft.entity.player.EntityPlayer;
import techreborn.tiles.tier1.TileRecycler;
import techreborn.tiles.machine.tier1.TileRecycler;
public class GuiRecycler extends GuiBase {

View file

@ -27,7 +27,7 @@ package techreborn.client.gui;
import net.minecraft.entity.player.EntityPlayer;
import reborncore.common.network.NetworkManager;
import techreborn.packets.PacketRollingMachineLock;
import techreborn.tiles.tier1.TileRollingMachine;
import techreborn.tiles.machine.tier1.TileRollingMachine;
import java.io.IOException;

View file

@ -25,7 +25,7 @@
package techreborn.client.gui;
import net.minecraft.entity.player.EntityPlayer;
import techreborn.tiles.tier1.TileScrapboxinator;
import techreborn.tiles.machine.tier1.TileScrapboxinator;
public class GuiScrapboxinator extends GuiBase {

View file

@ -25,7 +25,7 @@
package techreborn.client.gui;
import net.minecraft.entity.player.EntityPlayer;
import techreborn.tiles.generator.TileSemiFluidGenerator;
import techreborn.tiles.generator.advanced.TileSemiFluidGenerator;
public class GuiSemifluidGenerator extends GuiBase {

View file

@ -25,7 +25,7 @@
package techreborn.client.gui;
import net.minecraft.entity.player.EntityPlayer;
import techreborn.tiles.generator.TileThermalGenerator;
import techreborn.tiles.generator.advanced.TileThermalGenerator;
public class GuiThermalGenerator extends GuiBase {

View file

@ -34,7 +34,7 @@ import reborncore.client.multiblock.MultiblockSet;
import techreborn.client.gui.widget.GuiButtonHologram;
import techreborn.init.ModBlocks;
import techreborn.proxies.ClientProxy;
import techreborn.tiles.multiblock.TileVacuumFreezer;
import techreborn.tiles.machine.multiblock.TileVacuumFreezer;
import java.io.IOException;

View file

@ -91,7 +91,7 @@ public class BlockBreakHandler {
@SubscribeEvent
public void getBreakSpeedEvent(PlayerEvent.BreakSpeed event){
if(event.getEntityPlayer().getHeldItem(EnumHand.MAIN_HAND).getItem() == TRItems.ADVANCED_CHAINSAW && event.getOriginalSpeed() > 1.0f){
if(event.getEntityPlayer().getHeldItem(EnumHand.MAIN_HAND).getItem() == TRItems.INDUSTRIAL_CHAINSAW && event.getOriginalSpeed() > 1.0f){
BlockPos pos = event.getPos();
World worldIn = event.getEntityPlayer().world;
float speed = 20F;

View file

@ -33,18 +33,22 @@ import techreborn.tiles.*;
import techreborn.tiles.cable.TileCable;
import techreborn.tiles.fusionReactor.TileFusionControlComputer;
import techreborn.tiles.generator.*;
import techreborn.tiles.idsu.TileInterdimensionalSU;
import techreborn.tiles.lesu.TileLSUStorage;
import techreborn.tiles.lesu.TileLapotronicSU;
import techreborn.tiles.generator.advanced.*;
import techreborn.tiles.generator.basic.TileSolidFuelGenerator;
import techreborn.tiles.generator.basic.TileWaterMill;
import techreborn.tiles.generator.basic.TileWindMill;
import techreborn.tiles.storage.idsu.TileInterdimensionalSU;
import techreborn.tiles.storage.lesu.TileLSUStorage;
import techreborn.tiles.storage.lesu.TileLapotronicSU;
import techreborn.tiles.lighting.TileLamp;
import techreborn.tiles.multiblock.*;
import techreborn.tiles.machine.multiblock.*;
import techreborn.tiles.storage.TileAdjustableSU;
import techreborn.tiles.storage.TileHighVoltageSU;
import techreborn.tiles.storage.TileLowVoltageSU;
import techreborn.tiles.storage.TileMediumVoltageSU;
import techreborn.tiles.tier0.TileIronAlloyFurnace;
import techreborn.tiles.tier0.TileIronFurnace;
import techreborn.tiles.tier1.*;
import techreborn.tiles.machine.iron.TileIronAlloyFurnace;
import techreborn.tiles.machine.iron.TileIronFurnace;
import techreborn.tiles.machine.tier1.*;
import techreborn.tiles.transformers.TileHVTransformer;
import techreborn.tiles.transformers.TileLVTransformer;
import techreborn.tiles.transformers.TileMVTransformer;

View file

@ -79,11 +79,11 @@ public class OreDict {
OreUtil.registerOre("machineBlockElite", new ItemStack(ModBlocks.MACHINE_BLOCK_ELITE));
// Tools&Armor
OreUtil.registerOre("reBattery", TRItems.RECHARGEABLE_BATTERY);
OreUtil.registerOre("reBattery", TRItems.RED_CELL_BATTERY);
OreUtil.registerOre("lapotronCrystal", TRItems.LAPOTRON_CRYSTAL);
OreUtil.registerOre("energyCrystal", TRItems.ENERGY_CRYSTAL);
OreUtil.registerOre("drillBasic", TRItems.STEEL_DRILL);
OreUtil.registerOre("drillDiamond", TRItems.DIAMOND_DRILL);
OreUtil.registerOre("drillBasic", TRItems.BASIC_DRILL);
OreUtil.registerOre("drillDiamond", TRItems.ADVANCED_DRILL);
// Misc
OreUtil.registerOre("industrialTnt", Blocks.TNT);

View file

@ -426,7 +426,7 @@ public class TRContent {
Upgrades(IUpgrade upgrade) {
name = this.toString().toLowerCase();
item = new ItemUpgrade(name, upgrade);
InitUtils.setupIngredient(item, name, "_upgrade");
InitUtils.setupIngredient(item, name, "upgrade");
}
}
}

View file

@ -42,7 +42,22 @@ import techreborn.items.armor.ItemLapotronicOrbpack;
import techreborn.items.armor.ItemLithiumIonBatpack;
import techreborn.items.armor.ItemTRArmour;
import techreborn.items.battery.*;
import techreborn.items.tools.*;
import techreborn.items.tool.ItemDebugTool;
import techreborn.items.tool.ItemTreeTap;
import techreborn.items.tool.ItemWrench;
import techreborn.items.tool.advanced.ItemAdvancedChainsaw;
import techreborn.items.tool.advanced.ItemAdvancedDrill;
import techreborn.items.tool.advanced.ItemAdvancedJackhammer;
import techreborn.items.tool.advanced.ItemRockCutter;
import techreborn.items.tool.basic.ItemBasicChainsaw;
import techreborn.items.tool.basic.ItemBasicDrill;
import techreborn.items.tool.basic.ItemBasicJackhammer;
import techreborn.items.tool.basic.ItemElectricTreetap;
import techreborn.items.tool.industrial.*;
import techreborn.items.tool.vanilla.ItemTRAxe;
import techreborn.items.tool.vanilla.ItemTRHoe;
import techreborn.items.tool.vanilla.ItemTRSpade;
import techreborn.items.tool.vanilla.ItemTRSword;
import techreborn.utils.InitUtils;
import javax.annotation.Nullable;
@ -59,23 +74,23 @@ public class TRItems {
public static Item LAPOTRON_CRYSTAL;
public static Item LAPOTRONIC_ORB;
public static Item LITHIUM_ION_BATTERY;
public static Item RECHARGEABLE_BATTERY;
public static Item RED_CELL_BATTERY;
// Tools
public static Item INDUSTRIAL_CHAINSAW;
public static Item INDUSTRIAL_DRILL;
public static Item INDUSTRIAL_JACKHAMMER;
public static Item DEBUG_TOOL;
public static Item ADVANCED_CHAINSAW;
public static Item ADVANCED_DRILL;
public static Item ADVANCED_JACKHAMMER;
public static Item DEBUG_TOOL;
public static Item DIAMOND_CHAINSAW;
public static Item DIAMOND_DRILL;
public static Item DIAMOND_JACKHAMMER;
public static Item ELECTRIC_TREE_TAP;
public static Item NANOSABER;
public static Item OMNI_TOOL;
public static Item ROCK_CUTTER;
public static Item STEEL_CHAINSAW;
public static Item STEEL_DRILL;
public static Item STEEL_JACKHAMMER;
public static Item BASIC_CHAINSAW;
public static Item BASIC_DRILL;
public static Item BASIC_JACKHAMMER;
public static Item TREE_TAP;
public static Item WRENCH;
@ -164,29 +179,26 @@ public class TRItems {
TRContent.registerItems();
// Battery
registerItem(RECHARGEABLE_BATTERY = InitUtils.setup(new ItemRechargeableBattery(), "rechargeable_battery"));
registerItem(RED_CELL_BATTERY = InitUtils.setup(new ItemRedCellBattery(), "red_cell_battery"));
registerItem(LITHIUM_ION_BATTERY = InitUtils.setup(new ItemLithiumIonBattery(), "lithium_ion_battery"));
registerItem(LITHIUM_ION_BATPACK = InitUtils.setup(new ItemLithiumIonBatpack(), "lithium_ion_batpack"));
registerItem(ENERGY_CRYSTAL = InitUtils.setup(new ItemEnergyCrystal(), "energy_crystal"));
registerItem(LAPOTRON_CRYSTAL = InitUtils.setup(new ItemLapotronCrystal(), "lapotron_crytal"));
registerItem(LAPOTRONIC_ORB = InitUtils.setup(new ItemLapotronicOrb(), "lapotronic_orb"));
//Armor
registerItem(LITHIUM_ION_BATPACK = InitUtils.setup(new ItemLithiumIonBatpack(), "lithium_ion_batpack"));
registerItem(LAPOTRONIC_ORBPACK = InitUtils.setup(new ItemLapotronicOrbpack(), "lapotronic_orbpack"));
registerItem(CLOAKING_DEVICE = InitUtils.setup(new ItemCloakingDevice(), "cloaking_device"));
// Tools
registerItem(DEBUG_TOOL = InitUtils.setup(new ItemDebugTool(), "debug_tool"));
registerItem(STEEL_DRILL = InitUtils.setup(new ItemSteelDrill(), "steel_drill"));
registerItem(STEEL_CHAINSAW = InitUtils.setup(new ItemSteelChainsaw(), "steel_chainsaw"));
registerItem(STEEL_JACKHAMMER = InitUtils.setup(new ItemSteelJackhammer(), "steel_jackhammer"));
registerItem(DIAMOND_DRILL = InitUtils.setup(new ItemDiamondDrill(), "diamond_drill"));
registerItem(DIAMOND_CHAINSAW = InitUtils.setup(new ItemDiamondChainsaw(), "diamond_chainsaw"));
registerItem(DIAMOND_JACKHAMMER = InitUtils.setup(new ItemDiamondJackhammer(), "diamond_jackhammer"));
registerItem(BASIC_DRILL = InitUtils.setup(new ItemBasicDrill(), "basic_drill"));
registerItem(BASIC_CHAINSAW = InitUtils.setup(new ItemBasicChainsaw(), "basic_chainsaw"));
registerItem(BASIC_JACKHAMMER = InitUtils.setup(new ItemBasicJackhammer(), "basic_jackhammer"));
registerItem(ADVANCED_DRILL = InitUtils.setup(new ItemAdvancedDrill(), "advanced_drill"));
registerItem(ADVANCED_CHAINSAW = InitUtils.setup(new ItemAdvancedChainsaw(), "advanced_chainsaw"));
registerItem(ADVANCED_JACKHAMMER = InitUtils.setup(new ItemAdvancedJackhammer(), "advanced_jackhammer"));
registerItem(INDUSTRIAL_DRILL = InitUtils.setup(new ItemIndustrialDrill(), "industrial_drill"));
registerItem(INDUSTRIAL_CHAINSAW = InitUtils.setup(new ItemIndustrialChainsaw(), "industrial_chainsaw"));
registerItem(INDUSTRIAL_JACKHAMMER = InitUtils.setup(new ItemIndustrialJackhammer(), "industrial_jackhammer"));
registerItem(ROCK_CUTTER = InitUtils.setup(new ItemRockCutter(), "rock_cutter"));
registerItem(NANOSABER = InitUtils.setup(new ItemNanosaber(), "nanosaber"));
@ -196,6 +208,9 @@ public class TRItems {
registerItem(TREE_TAP = InitUtils.setup(new ItemTreeTap(), "treetap"));
registerItem(WRENCH = InitUtils.setup(new ItemWrench(), "wrench"));
// Armor
registerItem(CLOAKING_DEVICE = InitUtils.setup(new ItemCloakingDevice(), "cloaking_device"));
// Other
registerItem(CELL = InitUtils.setup(new DynamicCell(), "cell"));
MinecraftForge.EVENT_BUS.register(BucketHandler.INSTANCE);

View file

@ -65,18 +65,18 @@ public class CraftingTableRecipes extends RecipeMethods {
ItemStack rockCutter = getStack(TRItems.ROCK_CUTTER);
rockCutter.addEnchantment(Enchantments.SILK_TOUCH, 1);
registerShaped(rockCutter, "DT ", "DT ", "DCB", 'D', "dustDiamond", 'T', "ingotTitanium", 'C', "circuitBasic", 'B', "reBattery");
registerShaped(getStack(TRItems.STEEL_DRILL), " S ", "SCS", "SBS", 'S', "ingotSteel", 'C', "circuitBasic", 'B', "reBattery");
registerShaped(getStack(TRItems.DIAMOND_DRILL), " D ", "DCD", "TST", 'D', "gemDiamond", 'C', "circuitAdvanced", 'S', getStack(TRItems.STEEL_DRILL, 1, OreDictionary.WILDCARD_VALUE), 'T', "ingotTitanium");
registerShaped(getStack(TRItems.ADVANCED_DRILL), " I ", "NCN", "OAO", 'I', "plateIridiumAlloy", 'N', "nuggetIridium", 'A', getStack(TRItems.DIAMOND_DRILL, 1, OreDictionary.WILDCARD_VALUE), 'C', "circuitMaster", 'O', getMaterial("overclock", Type.UPGRADE));
registerShaped(getStack(TRItems.STEEL_CHAINSAW), " SS", "SCS", "BS ", 'S', "ingotSteel", 'C', "circuitBasic", 'B', "reBattery");
registerShaped(getStack(TRItems.DIAMOND_CHAINSAW), " DD", "TCD", "ST ", 'D', "gemDiamond", 'C', "circuitAdvanced", 'S', getStack(TRItems.STEEL_CHAINSAW, 1, OreDictionary.WILDCARD_VALUE), 'T', "ingotTitanium");
registerShaped(getStack(TRItems.ADVANCED_CHAINSAW), " NI", "OCN", "DO ", 'I', "plateIridiumAlloy", 'N', "nuggetIridium", 'D', getStack(TRItems.DIAMOND_CHAINSAW, 1, OreDictionary.WILDCARD_VALUE), 'C', "circuitMaster", 'O', getMaterial("overclock", Type.UPGRADE));
registerShaped(getStack(TRItems.STEEL_JACKHAMMER), "SBS", "SCS", " S ", 'S', "ingotSteel", 'C', "circuitBasic", 'B', "reBattery");
registerShaped(getStack(TRItems.DIAMOND_JACKHAMMER), "DSD", "TCT", " D ", 'D', "gemDiamond", 'C', "circuitAdvanced", 'S', getStack(TRItems.STEEL_JACKHAMMER, 1, OreDictionary.WILDCARD_VALUE), 'T', "ingotTitanium");
registerShaped(getStack(TRItems.ADVANCED_JACKHAMMER), "NDN", "OCO", " I ", 'I', "plateIridiumAlloy", 'N', "nuggetIridium", 'D', getStack(TRItems.DIAMOND_JACKHAMMER, 1, OreDictionary.WILDCARD_VALUE), 'C', "circuitMaster", 'O', getMaterial("overclock", Type.UPGRADE));
registerShaped(getStack(TRItems.BASIC_DRILL), " S ", "SCS", "SBS", 'S', "ingotSteel", 'C', "circuitBasic", 'B', "reBattery");
registerShaped(getStack(TRItems.ADVANCED_DRILL), " D ", "DCD", "TST", 'D', "gemDiamond", 'C', "circuitAdvanced", 'S', getStack(TRItems.BASIC_DRILL, 1, OreDictionary.WILDCARD_VALUE), 'T', "ingotTitanium");
registerShaped(getStack(TRItems.INDUSTRIAL_DRILL), " I ", "NCN", "OAO", 'I', "plateIridiumAlloy", 'N', "nuggetIridium", 'A', getStack(TRItems.ADVANCED_DRILL, 1, OreDictionary.WILDCARD_VALUE), 'C', "circuitMaster", 'O', getMaterial("overclock", Type.UPGRADE));
registerShaped(getStack(TRItems.BASIC_CHAINSAW), " SS", "SCS", "BS ", 'S', "ingotSteel", 'C', "circuitBasic", 'B', "reBattery");
registerShaped(getStack(TRItems.ADVANCED_CHAINSAW), " DD", "TCD", "ST ", 'D', "gemDiamond", 'C', "circuitAdvanced", 'S', getStack(TRItems.BASIC_CHAINSAW, 1, OreDictionary.WILDCARD_VALUE), 'T', "ingotTitanium");
registerShaped(getStack(TRItems.INDUSTRIAL_CHAINSAW), " NI", "OCN", "DO ", 'I', "plateIridiumAlloy", 'N', "nuggetIridium", 'D', getStack(TRItems.ADVANCED_CHAINSAW, 1, OreDictionary.WILDCARD_VALUE), 'C', "circuitMaster", 'O', getMaterial("overclock", Type.UPGRADE));
registerShaped(getStack(TRItems.BASIC_JACKHAMMER), "SBS", "SCS", " S ", 'S', "ingotSteel", 'C', "circuitBasic", 'B', "reBattery");
registerShaped(getStack(TRItems.ADVANCED_JACKHAMMER), "DSD", "TCT", " D ", 'D', "gemDiamond", 'C', "circuitAdvanced", 'S', getStack(TRItems.BASIC_JACKHAMMER, 1, OreDictionary.WILDCARD_VALUE), 'T', "ingotTitanium");
registerShaped(getStack(TRItems.INDUSTRIAL_JACKHAMMER), "NDN", "OCO", " I ", 'I', "plateIridiumAlloy", 'N', "nuggetIridium", 'D', getStack(TRItems.ADVANCED_JACKHAMMER, 1, OreDictionary.WILDCARD_VALUE), 'C', "circuitMaster", 'O', getMaterial("overclock", Type.UPGRADE));
registerShaped(getStack(TRItems.CLOAKING_DEVICE), "CIC", "IOI", "CIC", 'C', "ingotChrome", 'I', "plateIridiumAlloy", 'O', getStack(TRItems.LAPOTRONIC_ORB));
registerShaped(getStack(TRItems.LAPOTRONIC_ORBPACK), "FOF", "SPS", "FIF", 'F', "circuitMaster", 'O', getStack(TRItems.LAPOTRONIC_ORB), 'S', "craftingSuperconductor", 'I', "ingotIridium", 'P', getStack(TRItems.LITHIUM_ION_BATPACK));
registerShaped(getStack(TRItems.RECHARGEABLE_BATTERY), " W ", "TRT", "TRT", 'T', "ingotTin", 'R', "dustRedstone", 'W', EnumCableType.ICOPPER.getStack());
registerShaped(getStack(TRItems.RED_CELL_BATTERY), " W ", "TRT", "TRT", 'T', "ingotTin", 'R', "dustRedstone", 'W', EnumCableType.ICOPPER.getStack());
registerShaped(getStack(TRItems.LITHIUM_ION_BATTERY), " C ", "PFP", "PFP", 'F', getCell("lithium"), 'P', "plateAluminum", 'C', EnumCableType.IGOLD.getStack());
registerShaped(getStack(TRItems.LITHIUM_ION_BATPACK), "BCB", "BPB", "B B", 'B', getStack(TRItems.LITHIUM_ION_BATTERY), 'P', "plateAluminum", 'C', "circuitAdvanced");
registerShaped(getStack(TRItems.ENERGY_CRYSTAL), "RRR", "RDR", "RRR", 'R', "dustRedstone", 'D', "gemDiamond");

View file

@ -31,10 +31,10 @@ import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import techreborn.init.TRItems;
public class ItemRechargeableBattery extends ItemBattery {
public class ItemRedCellBattery extends ItemBattery {
// 40k FE capacity with 100 FE\t charge rate
public ItemRechargeableBattery() {
public ItemRedCellBattery() {
super(40_000, 100);
}
@ -44,7 +44,7 @@ public class ItemRechargeableBattery extends ItemBattery {
if (!isInCreativeTab(par2CreativeTabs)) {
return;
}
ItemStack stack = new ItemStack(TRItems.RECHARGEABLE_BATTERY);
ItemStack stack = new ItemStack(TRItems.RED_CELL_BATTERY);
// ItemStack charged = stack.copy();
//IEnergyStorage capEnergy = charged.getCapability(CapabilityEnergy.ENERGY, null);
//capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored());

View file

@ -22,7 +22,7 @@
* SOFTWARE.
*/
package techreborn.items.tools;
package techreborn.items.tool;
import net.minecraft.block.material.Material;
import net.minecraft.block.state.IBlockState;

View file

@ -22,7 +22,7 @@
* SOFTWARE.
*/
package techreborn.items.tools;
package techreborn.items.tool;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;

View file

@ -22,7 +22,7 @@
* SOFTWARE.
*/
package techreborn.items.tools;
package techreborn.items.tool;
import net.minecraft.block.state.IBlockState;
import net.minecraft.enchantment.EnchantmentHelper;

View file

@ -22,7 +22,7 @@
* SOFTWARE.
*/
package techreborn.items.tools;
package techreborn.items.tool;
import net.minecraft.block.material.Material;
import net.minecraft.block.state.IBlockState;

View file

@ -22,7 +22,7 @@
* SOFTWARE.
*/
package techreborn.items.tools;
package techreborn.items.tool;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;

View file

@ -22,7 +22,7 @@
* SOFTWARE.
*/
package techreborn.items.tools;
package techreborn.items.tool;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;

View file

@ -22,7 +22,7 @@
* SOFTWARE.
*/
package techreborn.items.tools;
package techreborn.items.tool.advanced;
import net.minecraft.block.state.IBlockState;
import net.minecraft.creativetab.CreativeTabs;
@ -33,11 +33,12 @@ import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import techreborn.config.ConfigTechReborn;
import techreborn.init.TRItems;
import techreborn.items.tool.ItemChainsaw;
public class ItemDiamondChainsaw extends ItemChainsaw {
public class ItemAdvancedChainsaw extends ItemChainsaw {
// 400k max charge with 1k charge rate
public ItemDiamondChainsaw() {
public ItemAdvancedChainsaw() {
super(ToolMaterial.DIAMOND, ConfigTechReborn.DiamondChainsawCharge, 1.0F);
this.cost = 250;
this.transferLimit = 1000;
@ -49,7 +50,7 @@ public class ItemDiamondChainsaw extends ItemChainsaw {
if (!isInCreativeTab(par2CreativeTabs)) {
return;
}
ItemStack stack = new ItemStack(TRItems.DIAMOND_CHAINSAW);
ItemStack stack = new ItemStack(TRItems.ADVANCED_CHAINSAW);
// ItemStack charged = stack.copy();
// ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null);
// capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored());

View file

@ -22,7 +22,7 @@
* SOFTWARE.
*/
package techreborn.items.tools;
package techreborn.items.tool.advanced;
import net.minecraft.block.state.IBlockState;
import net.minecraft.creativetab.CreativeTabs;
@ -33,11 +33,12 @@ import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import techreborn.config.ConfigTechReborn;
import techreborn.init.TRItems;
import techreborn.items.tool.ItemDrill;
public class ItemDiamondDrill extends ItemDrill {
public class ItemAdvancedDrill extends ItemDrill {
// 400k max charge with 1k charge rate
public ItemDiamondDrill() {
public ItemAdvancedDrill() {
super(ToolMaterial.DIAMOND, ConfigTechReborn.DiamondDrillCharge, 0.5F, 15F);
this.cost = 250;
this.transferLimit = 1000;
@ -49,7 +50,7 @@ public class ItemDiamondDrill extends ItemDrill {
if (!isInCreativeTab(par2CreativeTabs)) {
return;
}
ItemStack stack = new ItemStack(TRItems.DIAMOND_DRILL);
ItemStack stack = new ItemStack(TRItems.ADVANCED_DRILL);
// ItemStack charged = stack.copy();
// ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null);
// capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored());

View file

@ -22,7 +22,7 @@
* SOFTWARE.
*/
package techreborn.items.tools;
package techreborn.items.tool.advanced;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.ItemStack;
@ -31,21 +31,21 @@ import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import techreborn.config.ConfigTechReborn;
import techreborn.init.TRItems;
import techreborn.items.tool.ItemJackhammer;
public class ItemAdvancedJackhammer extends ItemJackhammer {
// 4M FE max charge with 1k charge rate
// 400k max charge with 1k charge rate
public ItemAdvancedJackhammer() {
super(ToolMaterial.IRON, ConfigTechReborn.AdvancedJackhammerCharge);
this.cost = 250;
this.efficiency = 60F;
super(ToolMaterial.DIAMOND, ConfigTechReborn.DiamondJackhammerCharge);
this.cost = 100;
this.efficiency = 16F;
this.transferLimit = 1000;
}
@SideOnly(Side.CLIENT)
@Override
public void getSubItems(
CreativeTabs par2CreativeTabs, NonNullList<ItemStack> itemList) {
public void getSubItems(CreativeTabs par2CreativeTabs, NonNullList<ItemStack> itemList) {
if (!isInCreativeTab(par2CreativeTabs)) {
return;
}

View file

@ -22,7 +22,7 @@
* SOFTWARE.
*/
package techreborn.items.tools;
package techreborn.items.tool.advanced;
import net.minecraft.block.state.IBlockState;
import net.minecraft.creativetab.CreativeTabs;
@ -47,7 +47,6 @@ import reborncore.common.powerSystem.PoweredItemCapabilityProvider;
import reborncore.common.util.ItemUtils;
import techreborn.config.ConfigTechReborn;
import techreborn.init.TRItems;
import techreborn.utils.InitUtils;
import javax.annotation.Nullable;
import java.util.Random;

View file

@ -22,7 +22,7 @@
* SOFTWARE.
*/
package techreborn.items.tools;
package techreborn.items.tool.basic;
import net.minecraft.block.state.IBlockState;
import net.minecraft.creativetab.CreativeTabs;
@ -33,10 +33,11 @@ import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import techreborn.config.ConfigTechReborn;
import techreborn.init.TRItems;
import techreborn.items.tool.ItemChainsaw;
public class ItemSteelChainsaw extends ItemChainsaw {
public class ItemBasicChainsaw extends ItemChainsaw {
public ItemSteelChainsaw() {
public ItemBasicChainsaw() {
super(ToolMaterial.IRON, ConfigTechReborn.SteelChainsawCharge, 0.5F);
this.cost = 50;
}
@ -48,7 +49,7 @@ public class ItemSteelChainsaw extends ItemChainsaw {
if (!isInCreativeTab(par2CreativeTabs)) {
return;
}
ItemStack stack = new ItemStack(TRItems.STEEL_CHAINSAW);
ItemStack stack = new ItemStack(TRItems.BASIC_CHAINSAW);
// ItemStack charged = stack.copy();
// ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null);
// capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored());

View file

@ -22,7 +22,7 @@
* SOFTWARE.
*/
package techreborn.items.tools;
package techreborn.items.tool.basic;
import net.minecraft.block.state.IBlockState;
import net.minecraft.creativetab.CreativeTabs;
@ -33,10 +33,11 @@ import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import techreborn.config.ConfigTechReborn;
import techreborn.init.TRItems;
import techreborn.items.tool.ItemDrill;
public class ItemSteelDrill extends ItemDrill {
public class ItemBasicDrill extends ItemDrill {
public ItemSteelDrill() {
public ItemBasicDrill() {
super(ToolMaterial.IRON, ConfigTechReborn.SteelDrillCharge, 0.5F, 10F);
this.cost = 50;
}
@ -48,7 +49,7 @@ public class ItemSteelDrill extends ItemDrill {
if (!isInCreativeTab(par2CreativeTabs)) {
return;
}
ItemStack stack = new ItemStack(TRItems.STEEL_DRILL);
ItemStack stack = new ItemStack(TRItems.BASIC_DRILL);
// ItemStack charged = stack.copy();
// ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null);
// capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored());

View file

@ -22,7 +22,7 @@
* SOFTWARE.
*/
package techreborn.items.tools;
package techreborn.items.tool.basic;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.ItemStack;
@ -31,10 +31,11 @@ import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import techreborn.config.ConfigTechReborn;
import techreborn.init.TRItems;
import techreborn.items.tool.ItemJackhammer;
public class ItemSteelJackhammer extends ItemJackhammer {
public class ItemBasicJackhammer extends ItemJackhammer {
public ItemSteelJackhammer() {
public ItemBasicJackhammer() {
super(ToolMaterial.DIAMOND, ConfigTechReborn.SteelJackhammerCharge);
this.cost = 50;
this.efficiency = 12F;
@ -46,7 +47,7 @@ public class ItemSteelJackhammer extends ItemJackhammer {
if (!isInCreativeTab(par2CreativeTabs)) {
return;
}
ItemStack stack = new ItemStack(TRItems.STEEL_JACKHAMMER);
ItemStack stack = new ItemStack(TRItems.BASIC_JACKHAMMER);
// ItemStack charged = stack.copy();
// ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null);
// capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored());

View file

@ -22,7 +22,7 @@
* SOFTWARE.
*/
package techreborn.items.tools;
package techreborn.items.tool.basic;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;

View file

@ -22,7 +22,7 @@
* SOFTWARE.
*/
package techreborn.items.tools;
package techreborn.items.tool.industrial;
import net.minecraft.block.state.IBlockState;
import net.minecraft.creativetab.CreativeTabs;
@ -39,11 +39,12 @@ import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import techreborn.config.ConfigTechReborn;
import techreborn.init.TRItems;
import techreborn.items.tool.ItemChainsaw;
public class ItemAdvancedChainsaw extends ItemChainsaw {
public class ItemIndustrialChainsaw extends ItemChainsaw {
// 4M FE max charge with 1k charge rate
public ItemAdvancedChainsaw() {
public ItemIndustrialChainsaw() {
super(ToolMaterial.DIAMOND, ConfigTechReborn.AdvancedChainsawCharge, 1.0F);
this.cost = 250;
this.transferLimit = 1000;
@ -55,7 +56,7 @@ public class ItemAdvancedChainsaw extends ItemChainsaw {
if (!isInCreativeTab(par2CreativeTabs)) {
return;
}
ItemStack stack = new ItemStack(TRItems.ADVANCED_CHAINSAW);
ItemStack stack = new ItemStack(TRItems.INDUSTRIAL_CHAINSAW);
// ItemStack charged = stack.copy();
// ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null);
// capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored());

View file

@ -22,7 +22,7 @@
* SOFTWARE.
*/
package techreborn.items.tools;
package techreborn.items.tool.industrial;
import net.minecraft.block.material.Material;
import net.minecraft.block.state.IBlockState;
@ -41,16 +41,17 @@ import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import techreborn.config.ConfigTechReborn;
import techreborn.init.TRItems;
import techreborn.items.tool.ItemDrill;
import javax.annotation.Nullable;
import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
public class ItemAdvancedDrill extends ItemDrill {
public class ItemIndustrialDrill extends ItemDrill {
// 4M FE max charge with 1k charge rate
public ItemAdvancedDrill() {
public ItemIndustrialDrill() {
super(ToolMaterial.DIAMOND, ConfigTechReborn.AdvancedDrillCharge, 2.0F, 10F);
this.cost = 250;
this.transferLimit = 1000;
@ -154,7 +155,7 @@ public class ItemAdvancedDrill extends ItemDrill {
if (!isInCreativeTab(par2CreativeTabs)) {
return;
}
ItemStack stack = new ItemStack(TRItems.ADVANCED_DRILL);
ItemStack stack = new ItemStack(TRItems.INDUSTRIAL_DRILL);
// ItemStack charged = stack.copy();
// ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null);
// capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored());

View file

@ -22,7 +22,7 @@
* SOFTWARE.
*/
package techreborn.items.tools;
package techreborn.items.tool.industrial;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.ItemStack;
@ -31,24 +31,26 @@ import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import techreborn.config.ConfigTechReborn;
import techreborn.init.TRItems;
import techreborn.items.tool.ItemJackhammer;
public class ItemDiamondJackhammer extends ItemJackhammer {
public class ItemIndustrialJackhammer extends ItemJackhammer {
// 400k max charge with 1k charge rate
public ItemDiamondJackhammer() {
super(ToolMaterial.DIAMOND, ConfigTechReborn.DiamondJackhammerCharge);
this.cost = 100;
this.efficiency = 16F;
// 4M FE max charge with 1k charge rate
public ItemIndustrialJackhammer() {
super(ToolMaterial.IRON, ConfigTechReborn.AdvancedJackhammerCharge);
this.cost = 250;
this.efficiency = 60F;
this.transferLimit = 1000;
}
@SideOnly(Side.CLIENT)
@Override
public void getSubItems(CreativeTabs par2CreativeTabs, NonNullList<ItemStack> itemList) {
public void getSubItems(
CreativeTabs par2CreativeTabs, NonNullList<ItemStack> itemList) {
if (!isInCreativeTab(par2CreativeTabs)) {
return;
}
ItemStack stack = new ItemStack(TRItems.DIAMOND_JACKHAMMER);
ItemStack stack = new ItemStack(TRItems.INDUSTRIAL_JACKHAMMER);
// ItemStack charged = stack.copy();
// ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null);
// capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored());

View file

@ -22,7 +22,7 @@
* SOFTWARE.
*/
package techreborn.items.tools;
package techreborn.items.tool.industrial;
import com.google.common.collect.HashMultimap;
import com.google.common.collect.Multimap;

View file

@ -22,7 +22,7 @@
* SOFTWARE.
*/
package techreborn.items.tools;
package techreborn.items.tool.industrial;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.util.ITooltipFlag;
@ -49,7 +49,6 @@ import reborncore.common.util.ItemUtils;
import reborncore.common.util.TorchHelper;
import techreborn.config.ConfigTechReborn;
import techreborn.init.TRItems;
import techreborn.utils.InitUtils;
import javax.annotation.Nullable;
import java.util.List;

View file

@ -22,7 +22,7 @@
* SOFTWARE.
*/
package techreborn.items.tools;
package techreborn.items.tool.vanilla;
import net.minecraft.item.ItemAxe;
import net.minecraft.item.ItemStack;

View file

@ -22,7 +22,7 @@
* SOFTWARE.
*/
package techreborn.items.tools;
package techreborn.items.tool.vanilla;
import net.minecraft.item.ItemHoe;
import net.minecraft.item.ItemStack;

View file

@ -22,7 +22,7 @@
* SOFTWARE.
*/
package techreborn.items.tools;
package techreborn.items.tool.vanilla;
import net.minecraft.item.ItemPickaxe;
import net.minecraft.item.ItemStack;

View file

@ -22,7 +22,7 @@
* SOFTWARE.
*/
package techreborn.items.tools;
package techreborn.items.tool.vanilla;
import net.minecraft.item.ItemSpade;
import net.minecraft.item.ItemStack;

View file

@ -22,7 +22,7 @@
* SOFTWARE.
*/
package techreborn.items.tools;
package techreborn.items.tool.vanilla;
import net.minecraft.item.ItemStack;
import net.minecraft.item.ItemSword;

View file

@ -29,7 +29,7 @@ import net.minecraft.util.math.BlockPos;
import net.minecraftforge.fml.common.network.simpleimpl.MessageContext;
import reborncore.common.network.ExtendedPacketBuffer;
import reborncore.common.network.INetworkPacket;
import techreborn.tiles.tier1.TileAutoCraftingTable;
import techreborn.tiles.machine.tier1.TileAutoCraftingTable;
public class PacketAutoCraftingTableLock implements INetworkPacket {

View file

@ -28,7 +28,7 @@ import net.minecraft.util.math.BlockPos;
import net.minecraftforge.fml.common.network.simpleimpl.MessageContext;
import reborncore.common.network.ExtendedPacketBuffer;
import reborncore.common.network.INetworkPacket;
import techreborn.tiles.idsu.TileInterdimensionalSU;
import techreborn.tiles.storage.idsu.TileInterdimensionalSU;
public class PacketIdsu implements INetworkPacket {

View file

@ -29,7 +29,7 @@ import net.minecraft.util.math.BlockPos;
import net.minecraftforge.fml.common.network.simpleimpl.MessageContext;
import reborncore.common.network.ExtendedPacketBuffer;
import reborncore.common.network.INetworkPacket;
import techreborn.tiles.tier1.TileRollingMachine;
import techreborn.tiles.machine.tier1.TileRollingMachine;
public class PacketRollingMachineLock implements INetworkPacket {

Some files were not shown because too many files have changed in this diff Show more