diff --git a/.idea/workspace.xml b/.idea/workspace.xml index e0d1adb2..90d0abbb 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,7 +1,28 @@ - + + + + + + + + + + + + + + + + + + + + + + @@ -179,35 +358,35 @@ - + - + - - - - - - + + + + + + - - - - - - + + + + + + - - + + - + - - + + @@ -217,4 +396,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/1.11/gradle.properties b/1.11/gradle.properties index 67310667..8592b980 100644 --- a/1.11/gradle.properties +++ b/1.11/gradle.properties @@ -5,7 +5,7 @@ org.gradle.jvmargs=-Xmx3G mod_group=nmd.primal.forgecraft mod_name=ForgeCraft -mod_version=1.0.4 +mod_version=1.0.5 forge_version=13.19.1.2189 mcp_mappings=snapshot_20161130 mc_version=1.11 diff --git a/1.11/src/.DS_Store b/1.11/src/.DS_Store index 7b0d3672..19b8e128 100644 Binary files a/1.11/src/.DS_Store and b/1.11/src/.DS_Store differ diff --git a/1.11/src/main/java/nmd/primal/forgecraft/CommonUtils.java b/1.11/src/main/java/nmd/primal/forgecraft/CommonUtils.java index a53dc93f..bc360d0b 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/CommonUtils.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/CommonUtils.java @@ -6,7 +6,9 @@ import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.init.Items; -import net.minecraft.item.*; +import net.minecraft.item.Item; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemStack; import net.minecraft.world.World; import net.minecraftforge.common.util.FakePlayer; import net.minecraftforge.fml.common.registry.GameRegistry; diff --git a/1.11/src/main/java/nmd/primal/forgecraft/ForgeCraft.java b/1.11/src/main/java/nmd/primal/forgecraft/ForgeCraft.java index 161111f0..32061059 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/ForgeCraft.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/ForgeCraft.java @@ -7,15 +7,13 @@ import net.minecraftforge.fml.common.SidedProxy; import net.minecraftforge.fml.common.event.FMLInitializationEvent; import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; - import nmd.primal.forgecraft.init.ModBlocks; import nmd.primal.forgecraft.init.ModCrafting; import nmd.primal.forgecraft.init.ModItems; import nmd.primal.forgecraft.init.ModTiles; import nmd.primal.forgecraft.proxy.CommonProxy; -//import nmd.primal.forgecraft.common.init.*; -import java.util.Locale; +//import nmd.primal.forgecraft.common.init.*; @Mod( modid = ModInfo.MOD_ID, name = ModInfo.MOD_NAME, diff --git a/1.11/src/main/java/nmd/primal/forgecraft/ModInfo.java b/1.11/src/main/java/nmd/primal/forgecraft/ModInfo.java index 52a70e4c..03ecf43a 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/ModInfo.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/ModInfo.java @@ -1,15 +1,10 @@ package nmd.primal.forgecraft; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.client.config.GuiConfigEntries; -import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import nmd.primal.forgecraft.blocks.PistonBellows; import nmd.primal.forgecraft.init.ModBlocks; -import nmd.primal.forgecraft.init.ModItems; //import nmd.primal.forgecraft.Item.ModItems; /** diff --git a/1.11/src/main/java/nmd/primal/forgecraft/blocks/Firebox.java b/1.11/src/main/java/nmd/primal/forgecraft/blocks/Firebox.java index 787fcbc1..8be49a14 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/blocks/Firebox.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/blocks/Firebox.java @@ -1,14 +1,11 @@ package nmd.primal.forgecraft.blocks; -import akka.actor.SystemGuardian; -import akka.actor.dsl.Creators; -import net.minecraft.block.*; +import net.minecraft.block.ITileEntityProvider; import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; import net.minecraft.block.properties.PropertyBool; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; -import net.minecraft.client.Minecraft; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; @@ -16,12 +13,9 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.init.SoundEvents; -import net.minecraft.inventory.InventoryHelper; -import net.minecraft.inventory.ItemStackHelper; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.tileentity.TileEntityFurnace; import net.minecraft.util.*; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; @@ -31,16 +25,15 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +//import nmd.primal.core.api.PrimalBlocks; import nmd.primal.forgecraft.CommonUtils; import nmd.primal.forgecraft.ModInfo; import nmd.primal.forgecraft.tiles.TileFirebox; import javax.annotation.Nullable; - -import java.util.List; import java.util.Random; -import static net.minecraft.block.BlockHorizontal.FACING; + /** * Created by kitsu on 11/26/2016. diff --git a/1.11/src/main/java/nmd/primal/forgecraft/blocks/PistonBellows.java b/1.11/src/main/java/nmd/primal/forgecraft/blocks/PistonBellows.java index a3e926a0..cfef0d9e 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/blocks/PistonBellows.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/blocks/PistonBellows.java @@ -1,27 +1,22 @@ package nmd.primal.forgecraft.blocks; -import net.minecraft.block.BlockHorizontal; import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; import net.minecraft.block.properties.PropertyBool; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.SoundEvents; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.*; +import net.minecraft.util.EnumBlockRenderType; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumHand; +import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TextComponentString; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import net.minecraftforge.common.property.ExtendedBlockState; -import net.minecraftforge.common.property.IUnlistedProperty; -import net.minecraftforge.common.property.Properties; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import nmd.primal.forgecraft.ModInfo; @@ -29,7 +24,6 @@ import nmd.primal.forgecraft.init.ModBlocks; import nmd.primal.forgecraft.tiles.TileFirebox; import nmd.primal.forgecraft.tiles.TilePistonBellows; -import javax.annotation.Nullable; import java.util.Random; /** diff --git a/1.11/src/main/java/nmd/primal/forgecraft/compat/FuelHandler.java b/1.11/src/main/java/nmd/primal/forgecraft/compat/FuelHandler.java index 5c6ffb09..f8ba2806 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/compat/FuelHandler.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/compat/FuelHandler.java @@ -1,10 +1,5 @@ package nmd.primal.forgecraft.compat; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.common.IFuelHandler; - -import java.util.Map; - /** * Created by kitsu on 12/3/2016. */ diff --git a/1.11/src/main/java/nmd/primal/forgecraft/init/ModCrafting.java b/1.11/src/main/java/nmd/primal/forgecraft/init/ModCrafting.java index 46c1814b..0ec6b662 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/init/ModCrafting.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/init/ModCrafting.java @@ -2,7 +2,6 @@ package nmd.primal.forgecraft.init; import net.minecraft.init.Blocks; import net.minecraft.init.Items; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.common.registry.GameRegistry; diff --git a/1.11/src/main/java/nmd/primal/forgecraft/init/ModItems.java b/1.11/src/main/java/nmd/primal/forgecraft/init/ModItems.java index aacb5982..682a36df 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/init/ModItems.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/init/ModItems.java @@ -5,7 +5,6 @@ import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.item.Item; import net.minecraftforge.fml.common.registry.GameRegistry; import nmd.primal.forgecraft.items.ItemBellowsHandle; -import nmd.primal.forgecraft.items.ItemTest; /** * Created by kitsu on 11/26/2016. diff --git a/1.11/src/main/java/nmd/primal/forgecraft/init/ModRegistries.java b/1.11/src/main/java/nmd/primal/forgecraft/init/ModRegistries.java index 23239ecb..34c3f219 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/init/ModRegistries.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/init/ModRegistries.java @@ -1,10 +1,5 @@ package nmd.primal.forgecraft.init; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.common.registry.GameRegistry; - /** * Created by kitsu on 12/3/2016. */ diff --git a/1.11/src/main/java/nmd/primal/forgecraft/init/ModTiles.java b/1.11/src/main/java/nmd/primal/forgecraft/init/ModTiles.java index 6827c133..83f894fc 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/init/ModTiles.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/init/ModTiles.java @@ -1,7 +1,6 @@ package nmd.primal.forgecraft.init; import net.minecraft.tileentity.TileEntity; -import net.minecraft.tileentity.TileEntityNote; import net.minecraftforge.fml.common.registry.GameRegistry; import nmd.primal.forgecraft.tiles.TileFirebox; import nmd.primal.forgecraft.tiles.TilePistonBellows; diff --git a/1.11/src/main/java/nmd/primal/forgecraft/items/BaseItem.java b/1.11/src/main/java/nmd/primal/forgecraft/items/BaseItem.java index 99e9ff66..f392966a 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/items/BaseItem.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/items/BaseItem.java @@ -1,6 +1,5 @@ package nmd.primal.forgecraft.items; -import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import nmd.primal.forgecraft.ModInfo; diff --git a/1.11/src/main/java/nmd/primal/forgecraft/items/ItemTest.java b/1.11/src/main/java/nmd/primal/forgecraft/items/ItemTest.java index 0d793ed6..5bdfcd78 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/items/ItemTest.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/items/ItemTest.java @@ -1,8 +1,5 @@ package nmd.primal.forgecraft.items; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; -import net.minecraftforge.fml.common.Mod; import nmd.primal.forgecraft.ModInfo; /** diff --git a/1.11/src/main/java/nmd/primal/forgecraft/proxy/ClientProxy.java b/1.11/src/main/java/nmd/primal/forgecraft/proxy/ClientProxy.java index d327ecb4..4668f562 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/proxy/ClientProxy.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/proxy/ClientProxy.java @@ -8,8 +8,6 @@ import nmd.primal.forgecraft.renders.TilePistonBellowsRender; import nmd.primal.forgecraft.tiles.TileFirebox; import nmd.primal.forgecraft.tiles.TilePistonBellows; -import static nmd.primal.forgecraft.init.ModItems.*; - /** * Created by kitsu on 11/26/2016. */ diff --git a/1.11/src/main/java/nmd/primal/forgecraft/renders/TileFireboxRender.java b/1.11/src/main/java/nmd/primal/forgecraft/renders/TileFireboxRender.java index 6d6527aa..b452df5a 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/renders/TileFireboxRender.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/renders/TileFireboxRender.java @@ -1,32 +1,15 @@ package nmd.primal.forgecraft.renders; -import net.minecraft.block.Block; -import net.minecraft.block.BlockHorizontal; -import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.OpenGlHelper; -import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.RenderItem; -import net.minecraft.client.renderer.block.model.ItemCameraTransforms; -import net.minecraft.client.renderer.entity.Render; -import net.minecraft.client.renderer.entity.RenderEntityItem; -import net.minecraft.client.renderer.entity.RenderManager; -import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.client.renderer.texture.TextureMap; -import net.minecraft.client.renderer.tileentity.RenderItemFrame; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.entity.item.EntityItem; -import net.minecraft.init.Items; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import nmd.primal.forgecraft.blocks.Firebox; import nmd.primal.forgecraft.tiles.TileFirebox; import org.lwjgl.opengl.GL11; -import scala.collection.parallel.ParIterableLike; /** * Created by kitsu on 12/4/2016. diff --git a/1.11/src/main/java/nmd/primal/forgecraft/renders/TilePistonBellowsRender.java b/1.11/src/main/java/nmd/primal/forgecraft/renders/TilePistonBellowsRender.java index f532c9e7..6e6350a9 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/renders/TilePistonBellowsRender.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/renders/TilePistonBellowsRender.java @@ -6,15 +6,12 @@ import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.RenderItem; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import nmd.primal.forgecraft.blocks.PistonBellows; import nmd.primal.forgecraft.init.ModItems; -import nmd.primal.forgecraft.tiles.TileFirebox; import nmd.primal.forgecraft.tiles.TilePistonBellows; -import org.lwjgl.Sys; import org.lwjgl.opengl.GL11; /** diff --git a/1.11/src/main/java/nmd/primal/forgecraft/tiles/BaseTile.java b/1.11/src/main/java/nmd/primal/forgecraft/tiles/BaseTile.java index f306c30a..667c17fe 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/tiles/BaseTile.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/tiles/BaseTile.java @@ -5,7 +5,6 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.NetworkManager; import net.minecraft.network.play.server.SPacketUpdateTileEntity; import net.minecraft.tileentity.TileEntity; -import net.minecraft.tileentity.TileEntityLockable; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; diff --git a/1.11/src/main/java/nmd/primal/forgecraft/tiles/TileBaseSlot.java b/1.11/src/main/java/nmd/primal/forgecraft/tiles/TileBaseSlot.java index e06b1a99..cb3532b4 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/tiles/TileBaseSlot.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/tiles/TileBaseSlot.java @@ -1,7 +1,6 @@ package nmd.primal.forgecraft.tiles; import net.minecraft.inventory.ItemStackHelper; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.NonNullList; diff --git a/1.11/src/main/java/nmd/primal/forgecraft/tiles/TileFirebox.java b/1.11/src/main/java/nmd/primal/forgecraft/tiles/TileFirebox.java index c4c902f6..ab208d2d 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/tiles/TileFirebox.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/tiles/TileFirebox.java @@ -1,39 +1,18 @@ package nmd.primal.forgecraft.tiles; -import com.sun.org.apache.xpath.internal.operations.Bool; -import net.minecraft.block.Block; -import net.minecraft.block.properties.PropertyBool; +import net.minecraft.block.BlockFurnace; import net.minecraft.block.state.IBlockState; -import net.minecraft.client.gui.GuiChat; -import net.minecraft.entity.item.EntityItem; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.init.Items; -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.ItemStackHelper; -import net.minecraft.inventory.SlotFurnaceFuel; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; -import net.minecraft.network.NetworkManager; -import net.minecraft.network.play.server.SPacketUpdateTileEntity; -import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityFurnace; -import net.minecraft.util.EnumFacing; import net.minecraft.util.ITickable; import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; -import net.minecraft.world.ILockableContainer; import net.minecraft.world.World; -import net.minecraftforge.common.util.Constants; -import nmd.primal.forgecraft.CommonUtils; import nmd.primal.forgecraft.blocks.Firebox; -import nmd.primal.forgecraft.init.ModBlocks; -import org.omg.PortableInterceptor.ACTIVE; -import net.minecraft.block.BlockFurnace; -import static net.minecraft.block.BlockHorizontal.FACING; import static nmd.primal.forgecraft.CommonUtils.getVanillaItemBurnTime; /** diff --git a/1.11/src/main/java/nmd/primal/forgecraft/tiles/TilePistonBellows.java b/1.11/src/main/java/nmd/primal/forgecraft/tiles/TilePistonBellows.java index 3089a2a9..1922f45e 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/tiles/TilePistonBellows.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/tiles/TilePistonBellows.java @@ -1,26 +1,11 @@ package nmd.primal.forgecraft.tiles; -import com.google.common.collect.ImmutableMap; import net.minecraft.block.state.IBlockState; -import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.EnumFacing; import net.minecraft.util.ITickable; -import net.minecraft.util.NonNullList; -import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; -import net.minecraftforge.client.model.ModelLoaderRegistry; -import net.minecraftforge.common.animation.TimeValues; -import net.minecraftforge.common.capabilities.Capability; -import net.minecraftforge.common.model.animation.CapabilityAnimation; -import net.minecraftforge.common.model.animation.IAnimationStateMachine; -import net.minecraftforge.fml.common.FMLCommonHandler; -import net.minecraftforge.fml.relauncher.Side; -import nmd.primal.forgecraft.blocks.Firebox; import nmd.primal.forgecraft.blocks.PistonBellows; -import javax.annotation.Nonnull; - /** * Created by mminaie on 1/5/17. */