diff --git a/build.gradle b/build.gradle index 8f71591..ef750a7 100644 --- a/build.gradle +++ b/build.gradle @@ -16,7 +16,7 @@ buildscript { } configurations { - runtime.exclude group: "[1.7.10]TerraFirmaCraft-0.79.21.741" + runtime.exclude group: "[1.7.10]terrafirmacraftplus-deobf-0.80.15" } // define the properties file @@ -34,56 +34,79 @@ allprojects { apply plugin: 'forge' group = config.group_name version = config.mod_version - archivesBaseName = config.archive_name + archivesBaseName = config.archive_name + repositories { + maven { // The repo from which to get waila + name "Mobius Repo" + url "http://mobiusstrip.eu/maven" + } + maven { // the repo from which to get NEI and stuff + name 'CB Repo' + url "https://modmaven.k-4u.nl/" + } + maven { // the repo from which to get NEI and stuff + name 'test2' + url "https://maven.cil.li/" + } + } + + dependencies { + // Forcing version numbers for everything and using NO-NEI WAILA since the "transitive dependency resolution (gradle magic)" is currently borked. + compile "codechicken:CodeChickenCore:1.7.10-1.0.4.35:dev" + compile "codechicken:CodeChickenLib:1.7.10-1.1.3.127:dev" + compile "codechicken:NotEnoughItems:1.7.10-1.0.4.95:dev" + compile "mcp.mobius.waila:Waila:1.5.11-RC2-NONEI_1.7.10" + } minecraft - { - version = config.minecraft_version + "-" + config.forge_version - runDir = "eclipse" - } + { + version = config.minecraft_version + "-" + config.forge_version + runDir = "eclipse" + } } sourceSets { - main { - java { - srcDir 'src' - } - resources { - srcDir 'resources' - } - } - } - -task copyJar(type: Copy) { - from('build/libs') { - include '**/*.jar' - } - into 'C:/Users/Aleksey/AppData/Roaming/.minecraft_tfc/mods' - } - -tasks.build.dependsOn('copyJar') + main { + java { + srcDir 'src' + } + resources { + srcDir 'resources' + } + } +} + + +//task copyJar(type: Copy) { +// from('build/libs') { +// include '**/*.jar' +// } +// into 'C:/Users/Aleksey/AppData/Roaming/.minecraft_tfc/mods' +// } + +//tasks.build.dependsOn('copyJar') dependencies { // Copy "[1.7.10]TerraFirmaCraft-0.79.21.741.jar" file - // into the ./libs directory + // into the ./libs directory } processResources -{ - // this will ensure that this task is redone when the versions change. - inputs.property "version", project.version - inputs.property "mcversion", project.minecraft.version + { + // this will ensure that this task is redone when the versions change. + inputs.property "version", project.version + inputs.property "mcversion", project.minecraft.version - // replace stuff in mcmod.info, nothing else - from(sourceSets.main.resources.srcDirs) { - include 'mcmod.info' - - // replace version and mcversion - expand 'version':project.version, 'mcversion':project.minecraft.version - } - - // copy everything else, thats not the mcmod.info - from(sourceSets.main.resources.srcDirs) { - exclude 'mcmod.info' - } -} \ No newline at end of file + // replace stuff in mcmod.info, nothing else + from(sourceSets.main.resources.srcDirs) { + include 'mcmod.info' + + // replace version and mcversion + expand 'version':project.version, 'mcversion':project.minecraft.version + } + + // copy everything else, thats not the mcmod.info + from(sourceSets.main.resources.srcDirs) { + exclude 'mcmod.info' + } + } \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 667288a..c97a8bd 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 8075e45..a7405b8 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Tue Oct 29 18:00:54 CDT 2013 +#Tue Dec 09 22:00:00 GMT 2014 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=http\://services.gradle.org/distributions/gradle-1.11-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-bin.zip diff --git a/src/com/aleksey/decorations/Blocks/BlockAlabaster.java b/src/com/aleksey/decorations/Blocks/BlockAlabaster.java index 51f27bc..c476a90 100644 --- a/src/com/aleksey/decorations/Blocks/BlockAlabaster.java +++ b/src/com/aleksey/decorations/Blocks/BlockAlabaster.java @@ -5,9 +5,9 @@ import net.minecraft.util.IIcon; import com.aleksey.decorations.Core.FluidList; -import com.bioxx.tfc.Blocks.Terrain.BlockSmooth; -import com.bioxx.tfc.Core.TFCTabs; -import com.bioxx.tfc.Items.ItemDyeCustom; +import com.dunk.tfc.Blocks.Terrain.BlockSmooth; +import com.dunk.tfc.Core.TFCTabs; +import com.dunk.tfc.Items.ItemDyeCustom; public class BlockAlabaster extends BlockSmooth { diff --git a/src/com/aleksey/decorations/Blocks/BlockCustomGem.java b/src/com/aleksey/decorations/Blocks/BlockCustomGem.java index 7e80a54..6deaeeb 100644 --- a/src/com/aleksey/decorations/Blocks/BlockCustomGem.java +++ b/src/com/aleksey/decorations/Blocks/BlockCustomGem.java @@ -21,8 +21,8 @@ import com.aleksey.decorations.Core.Data.Bound; import com.aleksey.decorations.Core.Data.GemInfo; import com.aleksey.decorations.TileEntities.TileEntityGem; -import com.bioxx.tfc.Blocks.BlockTerraContainer; -import com.bioxx.tfc.Core.TFCTabs; +import com.dunk.tfc.Blocks.BlockTerraContainer; +import com.dunk.tfc.Core.TFCTabs; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/com/aleksey/decorations/Blocks/BlockCustomLantern.java b/src/com/aleksey/decorations/Blocks/BlockCustomLantern.java index b442ef5..144fe78 100644 --- a/src/com/aleksey/decorations/Blocks/BlockCustomLantern.java +++ b/src/com/aleksey/decorations/Blocks/BlockCustomLantern.java @@ -12,7 +12,7 @@ import com.aleksey.decorations.Core.BlockList; import com.aleksey.decorations.Core.Data.LanternInfo; -import com.bioxx.tfc.Core.TFCTabs; +import com.dunk.tfc.Core.TFCTabs; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/com/aleksey/decorations/Blocks/BlockMudBrickRaw.java b/src/com/aleksey/decorations/Blocks/BlockMudBrickRaw.java index 565ac6a..153daf5 100644 --- a/src/com/aleksey/decorations/Blocks/BlockMudBrickRaw.java +++ b/src/com/aleksey/decorations/Blocks/BlockMudBrickRaw.java @@ -18,9 +18,9 @@ import com.aleksey.decorations.Core.Constants; import com.aleksey.decorations.Render.Blocks.RenderMudBrickRaw; import com.aleksey.decorations.TileEntities.TileEntityMudBrickRaw; -import com.bioxx.tfc.Blocks.BlockTerraContainer; -import com.bioxx.tfc.Core.TFCTabs; -import com.bioxx.tfc.api.Constant.Global; +import com.dunk.tfc.Blocks.BlockTerraContainer; +import com.dunk.tfc.Core.TFCTabs; +import com.dunk.tfc.api.Constant.Global; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/com/aleksey/decorations/Blocks/BlockMudBricks.java b/src/com/aleksey/decorations/Blocks/BlockMudBricks.java index 908c1ed..ae2aa71 100644 --- a/src/com/aleksey/decorations/Blocks/BlockMudBricks.java +++ b/src/com/aleksey/decorations/Blocks/BlockMudBricks.java @@ -5,9 +5,9 @@ import net.minecraft.util.IIcon; import net.minecraftforge.common.MinecraftForge; -import com.bioxx.tfc.Blocks.Terrain.BlockSmooth; -import com.bioxx.tfc.Core.TFCTabs; -import com.bioxx.tfc.api.Constant.Global; +import com.dunk.tfc.Blocks.Terrain.BlockSmooth; +import com.dunk.tfc.Core.TFCTabs; +import com.dunk.tfc.api.Constant.Global; public class BlockMudBricks extends BlockSmooth { diff --git a/src/com/aleksey/decorations/Core/BlockList.java b/src/com/aleksey/decorations/Core/BlockList.java index 8899ffb..41966cd 100644 --- a/src/com/aleksey/decorations/Core/BlockList.java +++ b/src/com/aleksey/decorations/Core/BlockList.java @@ -14,7 +14,7 @@ import com.aleksey.decorations.Items.ItemBlocks.ItemLantern; import com.aleksey.decorations.Items.ItemBlocks.ItemMudBrickRaw; import com.aleksey.decorations.Items.ItemBlocks.ItemMudBricks; -import com.bioxx.tfc.api.Constant.Global; +import com.dunk.tfc.api.Constant.Global; import cpw.mods.fml.common.registry.GameRegistry; diff --git a/src/com/aleksey/decorations/Core/Constants.java b/src/com/aleksey/decorations/Core/Constants.java index 47a731a..a83164f 100644 --- a/src/com/aleksey/decorations/Core/Constants.java +++ b/src/com/aleksey/decorations/Core/Constants.java @@ -2,7 +2,7 @@ import com.aleksey.decorations.Core.Data.GemInfo; import com.aleksey.decorations.Core.Data.LanternInfo; -import com.bioxx.tfc.api.Crafting.AnvilReq; +import com.dunk.tfc.api.Crafting.AnvilReq; public class Constants { diff --git a/src/com/aleksey/decorations/Core/Data/LanternInfo.java b/src/com/aleksey/decorations/Core/Data/LanternInfo.java index e70d4d6..cf1bb8e 100644 --- a/src/com/aleksey/decorations/Core/Data/LanternInfo.java +++ b/src/com/aleksey/decorations/Core/Data/LanternInfo.java @@ -1,6 +1,6 @@ package com.aleksey.decorations.Core.Data; -import com.bioxx.tfc.api.Crafting.AnvilReq; +import com.dunk.tfc.api.Crafting.AnvilReq; public class LanternInfo { diff --git a/src/com/aleksey/decorations/Core/DyeFluid.java b/src/com/aleksey/decorations/Core/DyeFluid.java index 3831bbf..32999c4 100644 --- a/src/com/aleksey/decorations/Core/DyeFluid.java +++ b/src/com/aleksey/decorations/Core/DyeFluid.java @@ -1,6 +1,6 @@ package com.aleksey.decorations.Core; -import com.bioxx.tfc.Core.FluidBaseTFC; +import com.dunk.tfc.Core.FluidBaseTFC; public class DyeFluid extends FluidBaseTFC { diff --git a/src/com/aleksey/decorations/Core/FluidList.java b/src/com/aleksey/decorations/Core/FluidList.java index 0a9e273..0a22a08 100644 --- a/src/com/aleksey/decorations/Core/FluidList.java +++ b/src/com/aleksey/decorations/Core/FluidList.java @@ -8,10 +8,10 @@ import net.minecraftforge.fluids.FluidStack; import com.aleksey.decorations.DecorationsMod; -import com.bioxx.tfc.Core.FluidBaseTFC; -import com.bioxx.tfc.Items.ItemDyeCustom; -import com.bioxx.tfc.api.TFCFluids; -import com.bioxx.tfc.api.TFCItems; +import com.dunk.tfc.Core.FluidBaseTFC; +import com.dunk.tfc.Items.ItemDyeCustom; +import com.dunk.tfc.api.TFCFluids; +import com.dunk.tfc.api.TFCItems; public class FluidList { diff --git a/src/com/aleksey/decorations/Core/ItemList.java b/src/com/aleksey/decorations/Core/ItemList.java index d95d047..6675019 100644 --- a/src/com/aleksey/decorations/Core/ItemList.java +++ b/src/com/aleksey/decorations/Core/ItemList.java @@ -12,7 +12,7 @@ import com.aleksey.decorations.Items.ItemLanternCore; import com.aleksey.decorations.Items.ItemLiquidDye; import com.aleksey.decorations.Items.ItemPlaster; -import com.bioxx.tfc.api.TFCItems; +import com.dunk.tfc.api.TFCItems; import cpw.mods.fml.common.registry.ExistingSubstitutionException; import cpw.mods.fml.common.registry.GameRegistry; @@ -68,19 +68,19 @@ private static void registerItems() throws ExistingSubstitutionException { if(DecorationsMod.isGemsEnabled) { - GameRegistry.addSubstitutionAlias("terrafirmacraft:" + TFCItems.gemRuby.getUnlocalizedName(), GameRegistry.Type.ITEM, TFCItems.gemRuby); - GameRegistry.addSubstitutionAlias("terrafirmacraft:" + TFCItems.gemSapphire.getUnlocalizedName(), GameRegistry.Type.ITEM, TFCItems.gemSapphire); - GameRegistry.addSubstitutionAlias("terrafirmacraft:" + TFCItems.gemEmerald.getUnlocalizedName(), GameRegistry.Type.ITEM, TFCItems.gemEmerald); - GameRegistry.addSubstitutionAlias("terrafirmacraft:" + TFCItems.gemTopaz.getUnlocalizedName(), GameRegistry.Type.ITEM, TFCItems.gemTopaz); - GameRegistry.addSubstitutionAlias("terrafirmacraft:" + TFCItems.gemTourmaline.getUnlocalizedName(), GameRegistry.Type.ITEM, TFCItems.gemTourmaline); - GameRegistry.addSubstitutionAlias("terrafirmacraft:" + TFCItems.gemJade.getUnlocalizedName(), GameRegistry.Type.ITEM, TFCItems.gemJade); - GameRegistry.addSubstitutionAlias("terrafirmacraft:" + TFCItems.gemBeryl.getUnlocalizedName(), GameRegistry.Type.ITEM, TFCItems.gemBeryl); - GameRegistry.addSubstitutionAlias("terrafirmacraft:" + TFCItems.gemAgate.getUnlocalizedName(), GameRegistry.Type.ITEM, TFCItems.gemAgate); - GameRegistry.addSubstitutionAlias("terrafirmacraft:" + TFCItems.gemOpal.getUnlocalizedName(), GameRegistry.Type.ITEM, TFCItems.gemOpal); - GameRegistry.addSubstitutionAlias("terrafirmacraft:" + TFCItems.gemGarnet.getUnlocalizedName(), GameRegistry.Type.ITEM, TFCItems.gemGarnet); - GameRegistry.addSubstitutionAlias("terrafirmacraft:" + TFCItems.gemJasper.getUnlocalizedName(), GameRegistry.Type.ITEM, TFCItems.gemJasper); - GameRegistry.addSubstitutionAlias("terrafirmacraft:" + TFCItems.gemAmethyst.getUnlocalizedName(), GameRegistry.Type.ITEM, TFCItems.gemAmethyst); - GameRegistry.addSubstitutionAlias("terrafirmacraft:" + TFCItems.gemDiamond.getUnlocalizedName(), GameRegistry.Type.ITEM, TFCItems.gemDiamond); + GameRegistry.addSubstitutionAlias("terrafirmacraftplus:" + TFCItems.gemRuby.getUnlocalizedName(), GameRegistry.Type.ITEM, TFCItems.gemRuby); + GameRegistry.addSubstitutionAlias("terrafirmacraftplus:" + TFCItems.gemSapphire.getUnlocalizedName(), GameRegistry.Type.ITEM, TFCItems.gemSapphire); + GameRegistry.addSubstitutionAlias("terrafirmacraftplus:" + TFCItems.gemEmerald.getUnlocalizedName(), GameRegistry.Type.ITEM, TFCItems.gemEmerald); + GameRegistry.addSubstitutionAlias("terrafirmacraftplus:" + TFCItems.gemTopaz.getUnlocalizedName(), GameRegistry.Type.ITEM, TFCItems.gemTopaz); + GameRegistry.addSubstitutionAlias("terrafirmacraftplus:" + TFCItems.gemTourmaline.getUnlocalizedName(), GameRegistry.Type.ITEM, TFCItems.gemTourmaline); + GameRegistry.addSubstitutionAlias("terrafirmacraftplus:" + TFCItems.gemJade.getUnlocalizedName(), GameRegistry.Type.ITEM, TFCItems.gemJade); + GameRegistry.addSubstitutionAlias("terrafirmacraftplus:" + TFCItems.gemBeryl.getUnlocalizedName(), GameRegistry.Type.ITEM, TFCItems.gemBeryl); + GameRegistry.addSubstitutionAlias("terrafirmacraftplus:" + TFCItems.gemAgate.getUnlocalizedName(), GameRegistry.Type.ITEM, TFCItems.gemAgate); + GameRegistry.addSubstitutionAlias("terrafirmacraftplus:" + TFCItems.gemOpal.getUnlocalizedName(), GameRegistry.Type.ITEM, TFCItems.gemOpal); + GameRegistry.addSubstitutionAlias("terrafirmacraftplus:" + TFCItems.gemGarnet.getUnlocalizedName(), GameRegistry.Type.ITEM, TFCItems.gemGarnet); + GameRegistry.addSubstitutionAlias("terrafirmacraftplus:" + TFCItems.gemJasper.getUnlocalizedName(), GameRegistry.Type.ITEM, TFCItems.gemJasper); + GameRegistry.addSubstitutionAlias("terrafirmacraftplus:" + TFCItems.gemAmethyst.getUnlocalizedName(), GameRegistry.Type.ITEM, TFCItems.gemAmethyst); + GameRegistry.addSubstitutionAlias("terrafirmacraftplus:" + TFCItems.gemDiamond.getUnlocalizedName(), GameRegistry.Type.ITEM, TFCItems.gemDiamond); } if(DecorationsMod.isLanternsEnabled) diff --git a/src/com/aleksey/decorations/Core/Player/PlayerTracker.java b/src/com/aleksey/decorations/Core/Player/PlayerTracker.java index ef910ef..bd8723d 100644 --- a/src/com/aleksey/decorations/Core/Player/PlayerTracker.java +++ b/src/com/aleksey/decorations/Core/Player/PlayerTracker.java @@ -4,8 +4,8 @@ import net.minecraftforge.event.entity.item.ItemTossEvent; import com.aleksey.decorations.Handlers.Network.InitClientWorldPacket; -import com.bioxx.tfc.TerraFirmaCraft; -import com.bioxx.tfc.Handlers.Network.AbstractPacket; +import com.dunk.tfc.TerraFirmaCraft; +import com.dunk.tfc.Handlers.Network.AbstractPacket; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.PlayerEvent.ItemPickupEvent; diff --git a/src/com/aleksey/decorations/Core/Recipes.java b/src/com/aleksey/decorations/Core/Recipes.java index 2e680ec..13b2d5e 100644 --- a/src/com/aleksey/decorations/Core/Recipes.java +++ b/src/com/aleksey/decorations/Core/Recipes.java @@ -13,17 +13,17 @@ import com.aleksey.decorations.DecorationsMod; import com.aleksey.decorations.Core.Data.LanternInfo; import com.aleksey.decorations.Crafting.BarrelPlasterRecipe; -import com.bioxx.tfc.api.TFCBlocks; -import com.bioxx.tfc.api.TFCCrafting; -import com.bioxx.tfc.api.TFCFluids; -import com.bioxx.tfc.api.TFCItems; -import com.bioxx.tfc.api.Constant.Global; -import com.bioxx.tfc.api.Crafting.AnvilManager; -import com.bioxx.tfc.api.Crafting.AnvilRecipe; -import com.bioxx.tfc.api.Crafting.BarrelManager; -import com.bioxx.tfc.api.Crafting.BarrelRecipe; -import com.bioxx.tfc.api.Crafting.PlanRecipe; -import com.bioxx.tfc.api.Enums.RuleEnum; +import com.dunk.tfc.api.TFCBlocks; +import com.dunk.tfc.api.TFCCrafting; +import com.dunk.tfc.api.TFCFluids; +import com.dunk.tfc.api.TFCItems; +import com.dunk.tfc.api.Constant.Global; +import com.dunk.tfc.api.Crafting.AnvilManager; +import com.dunk.tfc.api.Crafting.AnvilRecipe; +import com.dunk.tfc.api.Crafting.BarrelManager; +import com.dunk.tfc.api.Crafting.BarrelRecipe; +import com.dunk.tfc.api.Crafting.PlanRecipe; +import com.dunk.tfc.api.Enums.RuleEnum; import cpw.mods.fml.common.registry.GameRegistry; diff --git a/src/com/aleksey/decorations/Crafting/BarrelPlasterRecipe.java b/src/com/aleksey/decorations/Crafting/BarrelPlasterRecipe.java index b219adb..edac653 100644 --- a/src/com/aleksey/decorations/Crafting/BarrelPlasterRecipe.java +++ b/src/com/aleksey/decorations/Crafting/BarrelPlasterRecipe.java @@ -3,7 +3,7 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; -import com.bioxx.tfc.api.Crafting.BarrelRecipe; +import com.dunk.tfc.api.Crafting.BarrelRecipe; public class BarrelPlasterRecipe extends BarrelRecipe { diff --git a/src/com/aleksey/decorations/DecorationsMod.java b/src/com/aleksey/decorations/DecorationsMod.java index 42c887d..293ed86 100644 --- a/src/com/aleksey/decorations/DecorationsMod.java +++ b/src/com/aleksey/decorations/DecorationsMod.java @@ -10,7 +10,7 @@ import com.aleksey.decorations.Handlers.ChunkEventHandler; import com.aleksey.decorations.Handlers.CraftingHandler; import com.aleksey.decorations.Handlers.Network.InitClientWorldPacket; -import com.bioxx.tfc.TerraFirmaCraft; +import com.dunk.tfc.TerraFirmaCraft; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.Loader; @@ -23,7 +23,7 @@ import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.registry.ExistingSubstitutionException; -@Mod(modid="DecorationsTFC", name="Decorations", version="1.0.19", dependencies="required-after:terrafirmacraft") +@Mod(modid="DecorationsTFC", name="Decorations", version="1.0.19", dependencies="required-after:terrafirmacraftplus") public class DecorationsMod { @Instance("DecorationsTFC") diff --git a/src/com/aleksey/decorations/Handlers/CraftingHandler.java b/src/com/aleksey/decorations/Handlers/CraftingHandler.java index 3dbfa2c..0dd91be 100644 --- a/src/com/aleksey/decorations/Handlers/CraftingHandler.java +++ b/src/com/aleksey/decorations/Handlers/CraftingHandler.java @@ -5,7 +5,7 @@ import net.minecraft.item.ItemStack; import com.aleksey.decorations.Core.ItemList; -import com.bioxx.tfc.Core.Recipes; +import com.dunk.tfc.Core.Recipes; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.PlayerEvent.ItemCraftedEvent; @@ -23,7 +23,7 @@ public void onCrafting(ItemCraftedEvent e) if(iinventory != null) { if(item == ItemList.Powder && isDmg == 0) - com.bioxx.tfc.Handlers.CraftingHandler.handleItem(e.player, e.craftMatrix, Recipes.hammers); + com.dunk.tfc.Handlers.CraftingHandler.handleItem(e.player, e.craftMatrix, Recipes.hammers); } } } diff --git a/src/com/aleksey/decorations/Handlers/Network/InitClientWorldPacket.java b/src/com/aleksey/decorations/Handlers/Network/InitClientWorldPacket.java index adce9ca..6a9b1ac 100644 --- a/src/com/aleksey/decorations/Handlers/Network/InitClientWorldPacket.java +++ b/src/com/aleksey/decorations/Handlers/Network/InitClientWorldPacket.java @@ -5,7 +5,7 @@ import net.minecraft.entity.player.EntityPlayer; import com.aleksey.decorations.Core.Recipes; -import com.bioxx.tfc.Handlers.Network.AbstractPacket; +import com.dunk.tfc.Handlers.Network.AbstractPacket; public class InitClientWorldPacket extends AbstractPacket { diff --git a/src/com/aleksey/decorations/Items/ItemBlocks/ItemAlabaster.java b/src/com/aleksey/decorations/Items/ItemBlocks/ItemAlabaster.java index 3ea81d0..b4cd860 100644 --- a/src/com/aleksey/decorations/Items/ItemBlocks/ItemAlabaster.java +++ b/src/com/aleksey/decorations/Items/ItemBlocks/ItemAlabaster.java @@ -2,7 +2,7 @@ import net.minecraft.block.Block; -import com.bioxx.tfc.Items.ItemBlocks.ItemTerraBlock; +import com.dunk.tfc.Items.ItemBlocks.ItemTerraBlock; public class ItemAlabaster extends ItemTerraBlock { diff --git a/src/com/aleksey/decorations/Items/ItemBlocks/ItemLantern.java b/src/com/aleksey/decorations/Items/ItemBlocks/ItemLantern.java index 67cd88c..d626022 100644 --- a/src/com/aleksey/decorations/Items/ItemBlocks/ItemLantern.java +++ b/src/com/aleksey/decorations/Items/ItemBlocks/ItemLantern.java @@ -7,11 +7,11 @@ import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; -import com.bioxx.tfc.Items.ItemTerra; -import com.bioxx.tfc.api.Enums.EnumItemReach; -import com.bioxx.tfc.api.Enums.EnumSize; -import com.bioxx.tfc.api.Enums.EnumWeight; -import com.bioxx.tfc.api.Interfaces.ISize; +import com.dunk.tfc.Items.ItemTerra; +import com.dunk.tfc.api.Enums.EnumItemReach; +import com.dunk.tfc.api.Enums.EnumSize; +import com.dunk.tfc.api.Enums.EnumWeight; +import com.dunk.tfc.api.Interfaces.ISize; public class ItemLantern extends ItemBlock implements ISize { diff --git a/src/com/aleksey/decorations/Items/ItemBlocks/ItemMudBrickRaw.java b/src/com/aleksey/decorations/Items/ItemBlocks/ItemMudBrickRaw.java index e0b23f3..010b8f5 100644 --- a/src/com/aleksey/decorations/Items/ItemBlocks/ItemMudBrickRaw.java +++ b/src/com/aleksey/decorations/Items/ItemBlocks/ItemMudBrickRaw.java @@ -7,11 +7,11 @@ import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; -import com.bioxx.tfc.Items.ItemTerra; -import com.bioxx.tfc.api.Enums.EnumItemReach; -import com.bioxx.tfc.api.Enums.EnumSize; -import com.bioxx.tfc.api.Enums.EnumWeight; -import com.bioxx.tfc.api.Interfaces.ISize; +import com.dunk.tfc.Items.ItemTerra; +import com.dunk.tfc.api.Enums.EnumItemReach; +import com.dunk.tfc.api.Enums.EnumSize; +import com.dunk.tfc.api.Enums.EnumWeight; +import com.dunk.tfc.api.Interfaces.ISize; public class ItemMudBrickRaw extends ItemBlock implements ISize { diff --git a/src/com/aleksey/decorations/Items/ItemBlocks/ItemMudBricks.java b/src/com/aleksey/decorations/Items/ItemBlocks/ItemMudBricks.java index aa83423..510b905 100644 --- a/src/com/aleksey/decorations/Items/ItemBlocks/ItemMudBricks.java +++ b/src/com/aleksey/decorations/Items/ItemBlocks/ItemMudBricks.java @@ -9,12 +9,12 @@ import net.minecraft.util.EnumChatFormatting; import com.aleksey.decorations.Blocks.BlockMudBricks; -import com.bioxx.tfc.Items.ItemTerra; -import com.bioxx.tfc.api.Constant.Global; -import com.bioxx.tfc.api.Enums.EnumItemReach; -import com.bioxx.tfc.api.Enums.EnumSize; -import com.bioxx.tfc.api.Enums.EnumWeight; -import com.bioxx.tfc.api.Interfaces.ISize; +import com.dunk.tfc.Items.ItemTerra; +import com.dunk.tfc.api.Constant.Global; +import com.dunk.tfc.api.Enums.EnumItemReach; +import com.dunk.tfc.api.Enums.EnumSize; +import com.dunk.tfc.api.Enums.EnumWeight; +import com.dunk.tfc.api.Interfaces.ISize; public class ItemMudBricks extends ItemBlock implements ISize { diff --git a/src/com/aleksey/decorations/Items/ItemBrush.java b/src/com/aleksey/decorations/Items/ItemBrush.java index b883edc..611b408 100644 --- a/src/com/aleksey/decorations/Items/ItemBrush.java +++ b/src/com/aleksey/decorations/Items/ItemBrush.java @@ -14,11 +14,11 @@ import com.aleksey.decorations.Blocks.BlockAlabaster; import com.aleksey.decorations.Core.Constants; import com.aleksey.decorations.Core.FluidList; -import com.bioxx.tfc.Core.FluidBaseTFC; -import com.bioxx.tfc.Core.TFCTabs; -import com.bioxx.tfc.Items.ItemTerra; -import com.bioxx.tfc.api.Enums.EnumSize; -import com.bioxx.tfc.api.Enums.EnumWeight; +import com.dunk.tfc.Core.FluidBaseTFC; +import com.dunk.tfc.Core.TFCTabs; +import com.dunk.tfc.Items.ItemTerra; +import com.dunk.tfc.api.Enums.EnumSize; +import com.dunk.tfc.api.Enums.EnumWeight; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/com/aleksey/decorations/Items/ItemCustomGem.java b/src/com/aleksey/decorations/Items/ItemCustomGem.java index 31f46b6..dd9ae7f 100644 --- a/src/com/aleksey/decorations/Items/ItemCustomGem.java +++ b/src/com/aleksey/decorations/Items/ItemCustomGem.java @@ -13,7 +13,7 @@ import com.aleksey.decorations.Core.BlockList; import com.aleksey.decorations.TileEntities.TileEntityGem; -import com.bioxx.tfc.Items.ItemGem; +import com.dunk.tfc.Items.ItemGem; public class ItemCustomGem extends ItemGem { diff --git a/src/com/aleksey/decorations/Items/ItemGypsumPowder.java b/src/com/aleksey/decorations/Items/ItemGypsumPowder.java index bfc221d..a575ccd 100644 --- a/src/com/aleksey/decorations/Items/ItemGypsumPowder.java +++ b/src/com/aleksey/decorations/Items/ItemGypsumPowder.java @@ -2,8 +2,8 @@ import net.minecraft.client.renderer.texture.IIconRegister; -import com.bioxx.tfc.Core.TFCTabs; -import com.bioxx.tfc.Items.ItemTerra; +import com.dunk.tfc.Core.TFCTabs; +import com.dunk.tfc.Items.ItemTerra; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/com/aleksey/decorations/Items/ItemLanternCore.java b/src/com/aleksey/decorations/Items/ItemLanternCore.java index 3108509..dcb4e7d 100644 --- a/src/com/aleksey/decorations/Items/ItemLanternCore.java +++ b/src/com/aleksey/decorations/Items/ItemLanternCore.java @@ -12,10 +12,10 @@ import com.aleksey.decorations.Core.FluidList; import com.aleksey.decorations.Core.Data.LanternInfo; -import com.bioxx.tfc.Core.TFCTabs; -import com.bioxx.tfc.Items.ItemTerra; -import com.bioxx.tfc.api.Enums.EnumSize; -import com.bioxx.tfc.api.Enums.EnumWeight; +import com.dunk.tfc.Core.TFCTabs; +import com.dunk.tfc.Items.ItemTerra; +import com.dunk.tfc.api.Enums.EnumSize; +import com.dunk.tfc.api.Enums.EnumWeight; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/com/aleksey/decorations/Items/ItemLiquidDye.java b/src/com/aleksey/decorations/Items/ItemLiquidDye.java index e4ed3ec..3b40258 100644 --- a/src/com/aleksey/decorations/Items/ItemLiquidDye.java +++ b/src/com/aleksey/decorations/Items/ItemLiquidDye.java @@ -15,10 +15,10 @@ import net.minecraftforge.fluids.FluidStack; import com.aleksey.decorations.Core.FluidList; -import com.bioxx.tfc.Items.ItemTerra; -import com.bioxx.tfc.api.TFCItems; -import com.bioxx.tfc.api.Enums.EnumItemReach; -import com.bioxx.tfc.api.Enums.EnumSize; +import com.dunk.tfc.Items.ItemTerra; +import com.dunk.tfc.api.TFCItems; +import com.dunk.tfc.api.Enums.EnumItemReach; +import com.dunk.tfc.api.Enums.EnumSize; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/com/aleksey/decorations/Items/ItemPlaster.java b/src/com/aleksey/decorations/Items/ItemPlaster.java index 7a8d3ca..1bbdec6 100644 --- a/src/com/aleksey/decorations/Items/ItemPlaster.java +++ b/src/com/aleksey/decorations/Items/ItemPlaster.java @@ -9,10 +9,10 @@ import net.minecraft.world.World; import com.aleksey.decorations.Core.FluidList; -import com.bioxx.tfc.Items.ItemTerra; -import com.bioxx.tfc.api.TFCItems; -import com.bioxx.tfc.api.Enums.EnumItemReach; -import com.bioxx.tfc.api.Enums.EnumSize; +import com.dunk.tfc.Items.ItemTerra; +import com.dunk.tfc.api.TFCItems; +import com.dunk.tfc.api.Enums.EnumItemReach; +import com.dunk.tfc.api.Enums.EnumSize; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/com/aleksey/decorations/Render/Blocks/RenderLantern.java b/src/com/aleksey/decorations/Render/Blocks/RenderLantern.java index 755771d..25b5172 100644 --- a/src/com/aleksey/decorations/Render/Blocks/RenderLantern.java +++ b/src/com/aleksey/decorations/Render/Blocks/RenderLantern.java @@ -12,7 +12,7 @@ import org.lwjgl.opengl.GL11; import com.aleksey.decorations.Core.Data.Bound; -import com.bioxx.tfc.api.TFCBlocks; +import com.dunk.tfc.api.TFCBlocks; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; diff --git a/src/com/aleksey/decorations/TESR/TESRGem.java b/src/com/aleksey/decorations/TESR/TESRGem.java index 4084c0f..617d978 100644 --- a/src/com/aleksey/decorations/TESR/TESRGem.java +++ b/src/com/aleksey/decorations/TESR/TESRGem.java @@ -8,7 +8,7 @@ import org.lwjgl.opengl.GL11; import com.aleksey.decorations.TileEntities.TileEntityGem; -import com.bioxx.tfc.Render.TESR.TESRBase; +import com.dunk.tfc.Render.TESR.TESRBase; public class TESRGem extends TESRBase { diff --git a/src/com/aleksey/decorations/TileEntities/TileEntityGem.java b/src/com/aleksey/decorations/TileEntities/TileEntityGem.java index fff42f0..c0675a3 100644 --- a/src/com/aleksey/decorations/TileEntities/TileEntityGem.java +++ b/src/com/aleksey/decorations/TileEntities/TileEntityGem.java @@ -10,7 +10,7 @@ import com.aleksey.decorations.Blocks.BlockCustomGem; import com.aleksey.decorations.Core.Data.Bound; -import com.bioxx.tfc.TileEntities.NetworkTileEntity; +import com.dunk.tfc.TileEntities.NetworkTileEntity; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/com/aleksey/decorations/TileEntities/TileEntityMudBrickRaw.java b/src/com/aleksey/decorations/TileEntities/TileEntityMudBrickRaw.java index 01396a4..6fdcce3 100644 --- a/src/com/aleksey/decorations/TileEntities/TileEntityMudBrickRaw.java +++ b/src/com/aleksey/decorations/TileEntities/TileEntityMudBrickRaw.java @@ -7,7 +7,7 @@ import net.minecraft.tileentity.TileEntity; import com.aleksey.decorations.Core.Constants; -import com.bioxx.tfc.Core.TFC_Time; +import com.dunk.tfc.Core.TFC_Time; public class TileEntityMudBrickRaw extends TileEntity {