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

Removed unused import

Browse source
This commit is contained in:
drcrazy 2019-02-21 02:43:27 +03:00
parent 1567920c8e
commit 398cb9617d
43 changed files with 14 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/main/java/techreborn/blocks/BlockRubberLog.java
View file

@ -39,7 +39,6 @@ import net.minecraft.util.EnumFacing;
import net.minecraft.util.EnumHand;
import net.minecraft.util.SoundCategory;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraftforge.energy.CapabilityEnergy;
import net.minecraftforge.energy.IEnergyStorage;

1
src/main/java/techreborn/blocks/cable/BlockCable.java
View file

@ -34,7 +34,6 @@ import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.state.BooleanProperty;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.*;
import net.minecraft.util.math.AxisAlignedBB;

2
src/main/java/techreborn/blocks/generator/BlockDieselGenerator.java
View file

@ -24,10 +24,8 @@
package techreborn.blocks.generator;
import net.minecraft.client.renderer.color.IBlockColor;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.IBlockReader;
import net.minecraft.world.World;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.client.models.ModelCompound;
import reborncore.client.models.RebornModelRegistry;

1
src/main/java/techreborn/blocks/generator/BlockDragonEggSyphon.java
View file

@ -26,7 +26,6 @@ package techreborn.blocks.generator;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.IBlockReader;
import net.minecraft.world.World;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.client.models.ModelCompound;
import reborncore.client.models.RebornModelRegistry;

1
src/main/java/techreborn/blocks/generator/BlockGasTurbine.java
View file

@ -26,7 +26,6 @@ package techreborn.blocks.generator;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.IBlockReader;
import net.minecraft.world.World;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.client.models.ModelCompound;
import reborncore.client.models.RebornModelRegistry;

1
src/main/java/techreborn/blocks/generator/BlockLightningRod.java
View file

@ -26,7 +26,6 @@ package techreborn.blocks.generator;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.IBlockReader;
import net.minecraft.world.World;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.client.models.ModelCompound;
import reborncore.client.models.RebornModelRegistry;

1
src/main/java/techreborn/blocks/generator/BlockMagicEnergyAbsorber.java
View file

@ -30,7 +30,6 @@ import net.minecraft.util.text.ITextComponent;
import net.minecraft.util.text.TextComponentString;
import net.minecraft.util.text.TextFormatting;
import net.minecraft.world.IBlockReader;
import net.minecraft.world.World;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.client.models.ModelCompound;
import reborncore.client.models.RebornModelRegistry;

1
src/main/java/techreborn/blocks/generator/BlockMagicEnergyConverter.java
View file

@ -30,7 +30,6 @@ import net.minecraft.util.text.ITextComponent;
import net.minecraft.util.text.TextComponentString;
import net.minecraft.util.text.TextFormatting;
import net.minecraft.world.IBlockReader;
import net.minecraft.world.World;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.client.models.ModelCompound;
import reborncore.client.models.RebornModelRegistry;

1
src/main/java/techreborn/blocks/generator/BlockPlasmaGenerator.java
View file

@ -26,7 +26,6 @@ package techreborn.blocks.generator;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.IBlockReader;
import net.minecraft.world.World;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.client.models.ModelCompound;
import reborncore.client.models.RebornModelRegistry;

1
src/main/java/techreborn/blocks/generator/BlockSemiFluidGenerator.java
View file

@ -26,7 +26,6 @@ package techreborn.blocks.generator;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.IBlockReader;
import net.minecraft.world.World;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.client.models.ModelCompound;
import reborncore.client.models.RebornModelRegistry;

1
src/main/java/techreborn/blocks/generator/BlockSolarPanel.java
View file

@ -26,7 +26,6 @@ package techreborn.blocks.generator;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.IBlockReader;
import net.minecraft.world.World;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.client.models.ModelCompound;
import reborncore.client.models.RebornModelRegistry;

1
src/main/java/techreborn/blocks/generator/BlockSolidFuelGenerator.java
View file

@ -26,7 +26,6 @@ package techreborn.blocks.generator;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.IBlockReader;
import net.minecraft.world.World;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.client.models.ModelCompound;
import reborncore.client.models.RebornModelRegistry;

1
src/main/java/techreborn/blocks/generator/BlockThermalGenerator.java
View file

@ -26,7 +26,6 @@ package techreborn.blocks.generator;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.IBlockReader;
import net.minecraft.world.World;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.client.models.ModelCompound;
import reborncore.client.models.RebornModelRegistry;

3
src/main/java/techreborn/blocks/generator/BlockWaterMill.java
View file

@ -26,7 +26,6 @@ package techreborn.blocks.generator;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.IBlockReader;
import net.minecraft.world.World;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.client.models.ModelCompound;
import reborncore.client.models.RebornModelRegistry;
@ -40,7 +39,7 @@ import techreborn.tiles.generator.basic.TileWaterMill;
public class BlockWaterMill extends BlockMachineBase {
public BlockWaterMill() {
super(false);
super();
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/generators"));
}

3
src/main/java/techreborn/blocks/generator/BlockWindMill.java
View file

@ -26,7 +26,6 @@ package techreborn.blocks.generator;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.IBlockReader;
import net.minecraft.world.World;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.client.models.ModelCompound;
import reborncore.client.models.RebornModelRegistry;
@ -40,7 +39,7 @@ import techreborn.tiles.generator.basic.TileWindMill;
public class BlockWindMill extends BlockMachineBase {
public BlockWindMill() {
super(false);
super();
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/generators"));
}

1
src/main/java/techreborn/blocks/storage/BlockEnergyStorage.java
View file

@ -28,7 +28,6 @@ import com.google.common.base.Predicate;
import com.google.common.collect.Iterators;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.block.state.BlockStateContainer;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;

1
src/main/java/techreborn/blocks/storage/BlockLSUStorage.java
View file

@ -35,7 +35,6 @@ import net.minecraft.util.EnumFacing;
import net.minecraft.util.EnumHand;
import net.minecraft.util.NonNullList;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.IBlockReader;
import net.minecraft.world.World;
import reborncore.api.ToolManager;

1
src/main/java/techreborn/blocks/tier0/BlockIronAlloyFurnace.java
View file

@ -28,7 +28,6 @@ import net.minecraft.block.state.IBlockState;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.IBlockReader;
import net.minecraft.world.World;
import reborncore.api.tile.IMachineGuiHandler;

1
src/main/java/techreborn/blocks/tier1/BlockAlloySmelter.java
View file

@ -26,7 +26,6 @@ package techreborn.blocks.tier1;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.IBlockReader;
import net.minecraft.world.World;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.client.models.ModelCompound;
import reborncore.client.models.RebornModelRegistry;

1
src/main/java/techreborn/blocks/tier1/BlockAssemblingMachine.java
View file

@ -26,7 +26,6 @@ package techreborn.blocks.tier1;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.IBlockReader;
import net.minecraft.world.World;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.client.models.ModelCompound;
import reborncore.client.models.RebornModelRegistry;

1
src/main/java/techreborn/blocks/tier1/BlockCompressor.java
View file

@ -26,7 +26,6 @@ package techreborn.blocks.tier1;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.IBlockReader;
import net.minecraft.world.World;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.client.models.ModelCompound;
import reborncore.client.models.RebornModelRegistry;

1
src/main/java/techreborn/blocks/tier1/BlockElectricFurnace.java
View file

@ -26,7 +26,6 @@ package techreborn.blocks.tier1;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.IBlockReader;
import net.minecraft.world.World;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.client.models.ModelCompound;
import reborncore.client.models.RebornModelRegistry;

1
src/main/java/techreborn/blocks/tier1/BlockExtractor.java
View file

@ -26,7 +26,6 @@ package techreborn.blocks.tier1;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.IBlockReader;
import net.minecraft.world.World;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.client.models.ModelCompound;
import reborncore.client.models.RebornModelRegistry;

1
src/main/java/techreborn/blocks/tier1/BlockGrinder.java
View file

@ -26,7 +26,6 @@ package techreborn.blocks.tier1;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.IBlockReader;
import net.minecraft.world.World;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.client.models.ModelCompound;
import reborncore.client.models.RebornModelRegistry;

1
src/main/java/techreborn/blocks/tier1/BlockRecycler.java
View file

@ -26,7 +26,6 @@ package techreborn.blocks.tier1;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.IBlockReader;
import net.minecraft.world.World;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.client.models.ModelCompound;
import reborncore.client.models.RebornModelRegistry;

1
src/main/java/techreborn/blocks/tier1/BlockRollingMachine.java
View file

@ -26,7 +26,6 @@ package techreborn.blocks.tier1;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.IBlockReader;
import net.minecraft.world.World;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.client.models.ModelCompound;
import reborncore.client.models.RebornModelRegistry;

1
src/main/java/techreborn/blocks/tier1/BlockScrapboxinator.java
View file

@ -26,7 +26,6 @@ package techreborn.blocks.tier1;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.IBlockReader;
import net.minecraft.world.World;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.client.models.ModelCompound;
import reborncore.client.models.RebornModelRegistry;

1
src/main/java/techreborn/blocks/tier2/BlockChargeOMat.java
View file

@ -26,7 +26,6 @@ package techreborn.blocks.tier2;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.IBlockReader;
import net.minecraft.world.World;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.client.models.ModelCompound;
import reborncore.client.models.RebornModelRegistry;

1
src/main/java/techreborn/blocks/tier2/BlockChemicalReactor.java
View file

@ -26,7 +26,6 @@ package techreborn.blocks.tier2;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.IBlockReader;
import net.minecraft.world.World;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.client.models.ModelCompound;
import reborncore.client.models.RebornModelRegistry;

1
src/main/java/techreborn/blocks/tier2/BlockDistillationTower.java
View file

@ -26,7 +26,6 @@ package techreborn.blocks.tier2;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.IBlockReader;
import net.minecraft.world.World;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.client.models.ModelCompound;
import reborncore.client.models.RebornModelRegistry;

1
src/main/java/techreborn/blocks/tier2/BlockImplosionCompressor.java
View file

@ -26,7 +26,6 @@ package techreborn.blocks.tier2;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.IBlockReader;
import net.minecraft.world.World;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.client.models.ModelCompound;
import reborncore.client.models.RebornModelRegistry;

1
src/main/java/techreborn/blocks/tier2/BlockIndustrialBlastFurnace.java
View file

@ -26,7 +26,6 @@ package techreborn.blocks.tier2;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.IBlockReader;
import net.minecraft.world.World;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.client.models.ModelCompound;
import reborncore.client.models.RebornModelRegistry;

1
src/main/java/techreborn/blocks/tier2/BlockIndustrialCentrifuge.java
View file

@ -26,7 +26,6 @@ package techreborn.blocks.tier2;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.IBlockReader;
import net.minecraft.world.World;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.client.models.ModelCompound;
import reborncore.client.models.RebornModelRegistry;

1
src/main/java/techreborn/blocks/tier2/BlockIndustrialElectrolyzer.java
View file

@ -26,7 +26,6 @@ package techreborn.blocks.tier2;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.IBlockReader;
import net.minecraft.world.World;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.client.models.ModelCompound;
import reborncore.client.models.RebornModelRegistry;

1
src/main/java/techreborn/blocks/tier2/BlockIndustrialGrinder.java
View file

@ -26,7 +26,6 @@ package techreborn.blocks.tier2;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.IBlockReader;
import net.minecraft.world.World;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.client.models.ModelCompound;
import reborncore.client.models.RebornModelRegistry;

1
src/main/java/techreborn/blocks/tier2/BlockIndustrialSawmill.java
View file

@ -26,7 +26,6 @@ package techreborn.blocks.tier2;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.IBlockReader;
import net.minecraft.world.World;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.client.models.ModelCompound;
import reborncore.client.models.RebornModelRegistry;

1
src/main/java/techreborn/blocks/tier2/BlockVacuumFreezer.java
View file

@ -26,7 +26,6 @@ package techreborn.blocks.tier2;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.IBlockReader;
import net.minecraft.world.World;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.client.models.ModelCompound;
import reborncore.client.models.RebornModelRegistry;

1
src/main/java/techreborn/blocks/tier3/BlockChunkLoader.java
View file

@ -26,7 +26,6 @@ package techreborn.blocks.tier3;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.IBlockReader;
import net.minecraft.world.World;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.client.models.ModelCompound;
import reborncore.client.models.RebornModelRegistry;

1
src/main/java/techreborn/blocks/tier3/BlockCreativeQuantumTank.java
View file

@ -26,7 +26,6 @@ package techreborn.blocks.tier3;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.IBlockReader;
import net.minecraft.world.World;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.client.models.ModelCompound;
import reborncore.client.models.RebornModelRegistry;

1
src/main/java/techreborn/blocks/tier3/BlockFluidReplicator.java
View file

@ -26,7 +26,6 @@ package techreborn.blocks.tier3;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.IBlockReader;
import net.minecraft.world.World;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.client.models.ModelCompound;
import reborncore.client.models.RebornModelRegistry;

1
src/main/java/techreborn/blocks/tier3/BlockMatterFabricator.java
View file

@ -26,7 +26,6 @@ package techreborn.blocks.tier3;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.IBlockReader;
import net.minecraft.world.World;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.client.models.ModelCompound;
import reborncore.client.models.RebornModelRegistry;

1
src/main/java/techreborn/blocks/tier3/BlockQuantumTank.java
View file

@ -26,7 +26,6 @@ package techreborn.blocks.tier3;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.IBlockReader;
import net.minecraft.world.World;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.client.models.ModelCompound;
import reborncore.client.models.RebornModelRegistry;

17
src/main/java/techreborn/init/recipes/ExtractorRecipes.java
View file

@ -32,6 +32,7 @@ import net.minecraftforge.fluids.FluidRegistry;
import reborncore.api.recipe.RecipeHandler;
import techreborn.api.Reference;
import techreborn.api.recipe.machines.ExtractorRecipe;
import techreborn.init.TRContent;
import techreborn.items.DynamicCell;
/**
@ -39,11 +40,15 @@ import techreborn.items.DynamicCell;
*/
public class ExtractorRecipes extends RecipeMethods {
public static void init() {
// TODO: Fix Recipe
// register(getStack(ModBlocks.RUBBER_SAPLING), getMaterial("rubber", Type.PART), false);
// register(getStack(ModBlocks.RUBBER_LOG), getMaterial("rubber", Type.PART), false);
// register(getStack(Items.SLIME_BALL), getMaterial("rubber", 2, Type.PART));
// register(getMaterial("sap", Type.PART), getMaterial("rubber", 3, Type.PART));
register(getStack(TRContent.RUBBER_SAPLING), TRContent.Parts.RUBBER.getStack(), false);
register(getStack(TRContent.RUBBER_LOG), TRContent.Parts.RUBBER.getStack(), false);
register(getStack(Items.SLIME_BALL), TRContent.Parts.RUBBER.getStack(2), false);
register(TRContent.Parts.SAP.getStack(), TRContent.Parts.RUBBER.getStack(3), false);
register(getStack(Blocks.RED_TULIP), getStack(Items.ROSE_RED, 2), false);
register(getStack(Blocks.POPPY), getStack(Items.ROSE_RED, 2), false);
register(getStack(Blocks.ROSE_BUSH), getStack(Items.ROSE_RED, 4), false);
register(getStack(Blocks.RED_FLOWER), getStack(Items.DYE, 2, 1), false);
register(getStack(Blocks.YELLOW_FLOWER), getStack(Items.DYE, 2, 11), false);
register(getStack(Blocks.RED_FLOWER, 1, 1), getStack(Items.DYE, 2, 12), false);
@ -58,6 +63,8 @@ public class ExtractorRecipes extends RecipeMethods {
register(getStack(Blocks.DOUBLE_PLANT, 1, 1), getStack(Items.DYE, 4, 13), false);
register(getStack(Blocks.DOUBLE_PLANT, 1, 4), getStack(Items.DYE, 4, 1), false);
register(getStack(Blocks.DOUBLE_PLANT, 1, 5), getStack(Items.DYE, 4, 9), false);
register(getStack(Blocks.TALLGRASS, 1, 1), getStack(Items.WHEAT_SEEDS), false);
register(getStack(Blocks.TALLGRASS, 1, 2), getStack(Items.WHEAT_SEEDS), false);
register(getStack(Blocks.DOUBLE_PLANT, 1, 2), getStack(Items.WHEAT_SEEDS, 2), false);