TFC+ Port

nuckable · Jul 17, 2019 · 5a34d99 · 5a34d99
1 parent 9d6533d
commit 5a34d99
Show file tree

Hide file tree

Showing 34 changed files with 161 additions and 138 deletions.
diff --git 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'
-    }
-}
+            // 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'
+            }
+        }
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
 {