Move some stuff around in RC

This commit is contained in:
modmuss50 2018-07-20 22:02:46 +01:00
parent f78abb1a21
commit 95b49e5e23
No known key found for this signature in database
GPG key ID: 773D17BE8BF49C82
110 changed files with 307 additions and 456 deletions

View file

@ -47,9 +47,9 @@ import net.minecraftforge.fluids.capability.IFluidHandlerItem;
import net.minecraftforge.fluids.capability.templates.FluidHandlerItemStack;
import org.apache.commons.lang3.Validate;
import reborncore.common.util.StringUtils;
import techreborn.utils.TechRebornCreativeTab;
import techreborn.events.TRRecipeHandler;
import techreborn.init.ModItems;
import techreborn.utils.TechRebornCreativeTab;
/**
* Created by modmuss50 on 17/05/2016.

View file

@ -29,9 +29,9 @@ import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
import net.minecraft.util.NonNullList;
import techreborn.utils.TechRebornCreativeTab;
import techreborn.events.TRRecipeHandler;
import techreborn.init.ModItems;
import techreborn.utils.TechRebornCreativeTab;
import java.security.InvalidParameterException;

View file

@ -28,9 +28,9 @@ import com.google.common.base.CaseFormat;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.ItemStack;
import net.minecraft.util.NonNullList;
import techreborn.utils.TechRebornCreativeTab;
import techreborn.events.TRRecipeHandler;
import techreborn.init.ModItems;
import techreborn.utils.TechRebornCreativeTab;
import java.security.InvalidParameterException;

View file

@ -41,9 +41,9 @@ import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import reborncore.client.hud.StackInfoElement;
import reborncore.common.util.ChatUtils;
import techreborn.utils.TechRebornCreativeTab;
import techreborn.init.ModItems;
import techreborn.lib.MessageIDs;
import techreborn.utils.TechRebornCreativeTab;
import javax.annotation.Nullable;
import java.util.List;

View file

@ -29,9 +29,9 @@ import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
import net.minecraft.util.NonNullList;
import techreborn.utils.TechRebornCreativeTab;
import techreborn.events.TRRecipeHandler;
import techreborn.init.ModItems;
import techreborn.utils.TechRebornCreativeTab;
import java.security.InvalidParameterException;

View file

@ -24,8 +24,8 @@
package techreborn.items;
import techreborn.utils.TechRebornCreativeTab;
import techreborn.events.TRRecipeHandler;
import techreborn.utils.TechRebornCreativeTab;
public class ItemMissingRecipe extends ItemTR {
public ItemMissingRecipe() {

View file

@ -28,9 +28,9 @@ import com.google.common.base.CaseFormat;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.ItemStack;
import net.minecraft.util.NonNullList;
import techreborn.utils.TechRebornCreativeTab;
import techreborn.events.TRRecipeHandler;
import techreborn.init.ModItems;
import techreborn.utils.TechRebornCreativeTab;
import java.security.InvalidParameterException;

View file

@ -32,8 +32,8 @@ import net.minecraft.util.NonNullList;
import net.minecraft.world.World;
import techreborn.Core;
import techreborn.client.EGui;
import techreborn.utils.TechRebornCreativeTab;
import techreborn.init.ModItems;
import techreborn.utils.TechRebornCreativeTab;
import java.security.InvalidParameterException;

View file

@ -29,9 +29,9 @@ import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.ItemStack;
import net.minecraft.util.NonNullList;
import reborncore.common.util.OreUtil;
import techreborn.utils.TechRebornCreativeTab;
import techreborn.events.TRRecipeHandler;
import techreborn.init.ModItems;
import techreborn.utils.TechRebornCreativeTab;
import java.security.InvalidParameterException;

View file

@ -26,7 +26,6 @@ package techreborn.items;
import net.minecraft.client.util.ITooltipFlag;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.Container;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
@ -43,11 +42,9 @@ import reborncore.common.registration.impl.ConfigRegistry;
import reborncore.common.tile.TileLegacyMachineBase;
import reborncore.common.util.ItemNBTHelper;
import techreborn.Core;
import techreborn.utils.TechRebornCreativeTab;
import techreborn.client.container.builder.BuiltContainer;
import techreborn.client.container.builder.ContainerBuilder;
import techreborn.init.ModItems;
import techreborn.lib.ModInfo;
import techreborn.utils.TechRebornCreativeTab;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;

View file

@ -40,9 +40,9 @@ import reborncore.api.power.IEnergyItemInfo;
import reborncore.common.powerSystem.PowerSystem;
import reborncore.common.powerSystem.PoweredItemCapabilityProvider;
import reborncore.common.util.ItemUtils;
import techreborn.utils.TechRebornCreativeTab;
import techreborn.config.ConfigTechReborn;
import techreborn.init.ModItems;
import techreborn.utils.TechRebornCreativeTab;
import javax.annotation.Nullable;

View file

@ -42,9 +42,9 @@ import reborncore.api.power.IEnergyItemInfo;
import reborncore.common.powerSystem.PowerSystem;
import reborncore.common.powerSystem.PoweredItemCapabilityProvider;
import reborncore.common.util.ItemUtils;
import techreborn.utils.TechRebornCreativeTab;
import techreborn.config.ConfigTechReborn;
import techreborn.init.ModItems;
import techreborn.utils.TechRebornCreativeTab;
import javax.annotation.Nullable;

View file

@ -28,8 +28,8 @@ import net.minecraft.inventory.EntityEquipmentSlot;
import net.minecraft.item.ItemArmor;
import net.minecraft.item.ItemStack;
import reborncore.common.util.ItemUtils;
import techreborn.utils.TechRebornCreativeTab;
import techreborn.events.TRRecipeHandler;
import techreborn.utils.TechRebornCreativeTab;
/**
* Created by modmuss50 on 26/02/2016.

View file

@ -42,11 +42,10 @@ import net.minecraftforge.fml.relauncher.SideOnly;
import techreborn.config.ConfigTechReborn;
import techreborn.init.ModItems;
import javax.annotation.Nullable;
import java.util.HashSet;
import java.util.Set;
import javax.annotation.Nullable;
public class ItemAdvancedDrill extends ItemDrill {
// 4M FE max charge with 1k charge rate

View file

@ -45,11 +45,11 @@ import reborncore.common.registration.RebornRegistry;
import reborncore.common.registration.impl.ConfigRegistry;
import reborncore.common.util.ItemUtils;
import techreborn.api.Reference;
import techreborn.utils.TechRebornCreativeTab;
import techreborn.config.ConfigTechReborn;
import techreborn.init.ModItems;
import techreborn.items.armor.ItemTRArmour;
import techreborn.lib.ModInfo;
import techreborn.utils.TechRebornCreativeTab;
import javax.annotation.Nullable;

View file

@ -36,8 +36,8 @@ import net.minecraft.world.World;
import net.minecraftforge.energy.CapabilityEnergy;
import reborncore.api.power.IEnergyInterfaceTile;
import reborncore.common.powerSystem.PowerSystem;
import techreborn.utils.TechRebornCreativeTab;
import techreborn.items.ItemTR;
import techreborn.utils.TechRebornCreativeTab;
/**
* Created by Mark on 20/03/2016.

View file

@ -35,9 +35,9 @@ import reborncore.api.power.IEnergyItemInfo;
import reborncore.common.powerSystem.PowerSystem;
import reborncore.common.powerSystem.PoweredItemCapabilityProvider;
import reborncore.common.util.ItemUtils;
import techreborn.utils.TechRebornCreativeTab;
import techreborn.init.ModItems;
import techreborn.items.ItemTR;
import techreborn.utils.TechRebornCreativeTab;
import javax.annotation.Nullable;

View file

@ -41,8 +41,8 @@ import reborncore.api.power.IEnergyItemInfo;
import reborncore.common.powerSystem.PowerSystem;
import reborncore.common.powerSystem.PoweredItemCapabilityProvider;
import reborncore.common.util.ItemUtils;
import techreborn.utils.TechRebornCreativeTab;
import techreborn.utils.OreDictUtils;
import techreborn.utils.TechRebornCreativeTab;
import javax.annotation.Nullable;
import java.util.Random;

View file

@ -53,10 +53,10 @@ import reborncore.common.powerSystem.PowerSystem;
import reborncore.common.powerSystem.PoweredItemCapabilityProvider;
import reborncore.common.util.ChatUtils;
import reborncore.common.util.ItemUtils;
import techreborn.utils.TechRebornCreativeTab;
import techreborn.config.ConfigTechReborn;
import techreborn.init.ModItems;
import techreborn.lib.MessageIDs;
import techreborn.utils.TechRebornCreativeTab;
import javax.annotation.Nullable;
import java.util.List;

View file

@ -47,9 +47,9 @@ import reborncore.common.powerSystem.PowerSystem;
import reborncore.common.powerSystem.PoweredItemCapabilityProvider;
import reborncore.common.util.ItemUtils;
import reborncore.common.util.TorchHelper;
import techreborn.utils.TechRebornCreativeTab;
import techreborn.config.ConfigTechReborn;
import techreborn.init.ModItems;
import techreborn.utils.TechRebornCreativeTab;
import javax.annotation.Nullable;
import java.util.List;

View file

@ -27,8 +27,8 @@ package techreborn.items.tools;
import net.minecraft.item.ItemAxe;
import net.minecraft.item.ItemStack;
import reborncore.common.util.ItemUtils;
import techreborn.utils.TechRebornCreativeTab;
import techreborn.events.TRRecipeHandler;
import techreborn.utils.TechRebornCreativeTab;
public class ItemTRAxe extends ItemAxe {

View file

@ -29,8 +29,8 @@ import net.minecraft.item.ItemStack;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import reborncore.common.util.ItemUtils;
import techreborn.utils.TechRebornCreativeTab;
import techreborn.events.TRRecipeHandler;
import techreborn.utils.TechRebornCreativeTab;
public class ItemTRHoe extends ItemHoe {

View file

@ -27,8 +27,8 @@ package techreborn.items.tools;
import net.minecraft.item.ItemPickaxe;
import net.minecraft.item.ItemStack;
import reborncore.common.util.ItemUtils;
import techreborn.utils.TechRebornCreativeTab;
import techreborn.events.TRRecipeHandler;
import techreborn.utils.TechRebornCreativeTab;
public class ItemTRPickaxe extends ItemPickaxe {

View file

@ -27,8 +27,8 @@ package techreborn.items.tools;
import net.minecraft.item.ItemSpade;
import net.minecraft.item.ItemStack;
import reborncore.common.util.ItemUtils;
import techreborn.utils.TechRebornCreativeTab;
import techreborn.events.TRRecipeHandler;
import techreborn.utils.TechRebornCreativeTab;
public class ItemTRSpade extends ItemSpade {

View file

@ -27,8 +27,8 @@ package techreborn.items.tools;
import net.minecraft.item.ItemStack;
import net.minecraft.item.ItemSword;
import reborncore.common.util.ItemUtils;
import techreborn.utils.TechRebornCreativeTab;
import techreborn.events.TRRecipeHandler;
import techreborn.utils.TechRebornCreativeTab;
public class ItemTRSword extends ItemSword {

View file

@ -32,8 +32,8 @@ import net.minecraft.util.EnumHand;
import net.minecraft.world.World;
import techreborn.Core;
import techreborn.client.EGui;
import techreborn.utils.TechRebornCreativeTab;
import techreborn.items.ItemTR;
import techreborn.utils.TechRebornCreativeTab;
public class ItemTechManual extends ItemTR {

View file

@ -25,8 +25,8 @@
package techreborn.items.tools;
import net.minecraft.item.ItemStack;
import techreborn.utils.TechRebornCreativeTab;
import techreborn.items.ItemTR;
import techreborn.utils.TechRebornCreativeTab;
public class ItemTreeTap extends ItemTR {

View file

@ -37,8 +37,8 @@ import net.minecraftforge.server.permission.PermissionAPI;
import net.minecraftforge.server.permission.context.BlockPosContext;
import reborncore.api.IToolHandler;
import reborncore.common.util.RebornPermissions;
import techreborn.utils.TechRebornCreativeTab;
import techreborn.items.ItemTR;
import techreborn.utils.TechRebornCreativeTab;
/**
* Created by modmuss50 on 26/02/2016.