Back to the roots, actually only to 1.10.2.

Auto-reformatted the code and updated the copyright

Author: canitzp

build.gradle

@@ -29,7 +29,7 @@ repositories {
     }
     ivy {
         name = "Railcraft"
-        artifactPattern "http://www.railcraft.info/ivy/com.headlamp-games/Railcraft/[revision]/[module]_1.10.2-[revision]-[classifier].[ext]"
+        artifactPattern "http://www.railcraft.info/ivy/com.headlamp-games/Railcraft/[revision]/[module]_" + project.minecraftVersion.toString() + "-[revision]-[classifier].[ext]"
     }
 }
 
@@ -50,7 +50,7 @@ minecraft {
 
 dependencies {
     deobfCompile "mezz.jei:jei_" + project.minecraftVersion.toString() + ":" + project.jeiVersion.toString()
-    deobfCompile "net.darkhax.tesla:Tesla:1.11-" + project.teslaVersion.toString()
+    deobfCompile "net.darkhax.tesla:Tesla:1.10.2-" + project.teslaVersion.toString()
     compileOnly "net.industrial-craft:industrialcraft-2:" + project.ic2Version.toString() + ":api"
     compileOnly name: "Railcraft", version: project.railcraftVersion.toString(), classifier: "dev"
 }

gradle.properties

@@ -2,10 +2,10 @@ org.gradle.jvmargs=-Xmx3G
 
 modName=Traincraft
 modVersion=1.0.0
-minecraftVersion=1.11.2
+minecraftVersion=1.10.2
 mappings=snapshot_20170125
-forgeVersion=13.20.0.2226
-jeiVersion=4.2.4.226
-teslaVersion=1.3.0.51
-ic2Version=2.6.9-ex110
-railcraftVersion=10.0.1
+forgeVersion=12.18.3.2281
+jeiVersion=3.14.7.419
+teslaVersion=1.2.1.49
+ic2Version=2.6.188-ex110
+railcraftVersion=10.1.1

src/main/java/si/meansoft/traincraft/Compat.java

@@ -4,7 +4,7 @@
  * It is distributed under the Traincraft License (https://github.com/Traincraft/Traincraft/blob/master/LICENSE.md)
  * You can find the source code at https://github.com/Traincraft/Traincraft
  *
- * © 2011-2016
+ * © 2011-2017
  */
 
 package si.meansoft.traincraft;
@@ -14,7 +14,7 @@
 /**
  * @author canitzp
  */
-public class Compat{
+public class Compat {
 
     public static boolean isTeslaLoaded = Loader.isModLoaded("tesla");
     public static boolean isRailcraftLoaded = Loader.isModLoaded("railcraft");

src/main/java/si/meansoft/traincraft/IRegistryEntry.java

@@ -4,7 +4,7 @@
  * It is distributed under the Traincraft License (https://github.com/Traincraft/Traincraft/blob/master/LICENSE.md)
  * You can find the source code at https://github.com/Traincraft/Traincraft
  *
- * © 2011-2016
+ * © 2011-2017
  */
 
 package si.meansoft.traincraft;
@@ -15,7 +15,7 @@
 /**
  * @author canitzp
  */
-public interface IRegistryEntry{
+public interface IRegistryEntry {
 
     IRegistryEntry[] getRegisterElements();
 
@@ -26,6 +26,7 @@ public interface IRegistryEntry{
     void ownRegistry();
 
     @SideOnly(Side.CLIENT)
-    default void loadClientSide(){}
+    default void loadClientSide() {
+    }
 
 }

src/main/java/si/meansoft/traincraft/RecipeRegistry.java

@@ -4,7 +4,7 @@
  * It is distributed under the Traincraft License (https://github.com/Traincraft/Traincraft/blob/master/LICENSE.md)
  * You can find the source code at https://github.com/Traincraft/Traincraft
  *
- * © 2011-2016
+ * © 2011-2017
  */
 
 package si.meansoft.traincraft;
@@ -22,33 +22,33 @@
  */
 public class RecipeRegistry {
 
-    public static void init(){
+    public static void init() {
         initShaped();
         initShapeless();
         initDistillRecipes();
         initCrafterRecipes();
         initHearthFurnaceRecipes();
     }
 
-    private static void initShaped(){
+    private static void initShaped() {
 
     }
 
-    private static void initShapeless(){
+    private static void initShapeless() {
         ItemStack plasticStack = new ItemStack(Registry.material, 1, ItemMaterial.Materials.PLASTIC.ordinal());
         GameRegistry.addShapelessRecipe(new ItemStack(Registry.material, 2, ItemMaterial.Materials.FUEL_CANISTER_EMPTY.ordinal()), plasticStack.copy(), plasticStack.copy(), plasticStack.copy(), plasticStack.copy());
     }
 
-    private static void initDistillRecipes(){
+    private static void initDistillRecipes() {
         DistilleryRecipes.addRecipe(new ItemStack(Registry.material, 1, ItemMaterial.Materials.PLASTIC.ordinal()), new ItemStack(Registry.oilSand), new FluidStack(Registry.diesel, 1000), 50, 200);
         DistilleryRecipes.addFillingRecipe(new ItemStack(Registry.material, 2, ItemMaterial.Materials.FUEL_CANISTER_FULL.ordinal()), new ItemStack(Registry.material, 2, ItemMaterial.Materials.FUEL_CANISTER_EMPTY.ordinal()), new FluidStack(Registry.diesel, 1000));
     }
 
-    private static void initCrafterRecipes(){
+    private static void initCrafterRecipes() {
         //CrafterRecipes.addSteamRecipe(new ItemStack(Blocks.BRICK_BLOCK), null, null, null, null, null, null, null, null, null, null);
     }
 
-    private static void initHearthFurnaceRecipes(){
+    private static void initHearthFurnaceRecipes() {
         HearthFurnaceRecipes.addRecipe(new ItemStack(Registry.material, 1, ItemMaterial.Materials.GRAPHITE.ordinal()), new ItemStack(Items.IRON_INGOT), new ItemStack(Registry.material, 1, ItemMaterial.Materials.STEEL_INGOT.ordinal()), 1200);
     }
 

src/main/java/si/meansoft/traincraft/Registry.java

@@ -4,7 +4,7 @@
  * It is distributed under the Traincraft License (https://github.com/Traincraft/Traincraft/blob/master/LICENSE.md)
  * You can find the source code at https://github.com/Traincraft/Traincraft
  *
- * © 2011-2016
+ * © 2011-2017
  */
 
 package si.meansoft.traincraft;
@@ -27,7 +27,7 @@
 /**
  * @author canitzp
  */
-public class Registry{
+public class Registry {
 
     public static int entityIds = 0;
 
@@ -42,9 +42,9 @@ public class Registry{
 
     public static FluidBase diesel, refinedFuel, oil;
 
-    public static void preInit(FMLPreInitializationEvent event){
+    public static void preInit(FMLPreInitializationEvent event) {
         //Blocks
-        register(oilSand = new BlockBase(Material.SAND, "oil_Sand").generateBlock(Blocks.SAND, 50, 80, 7, 11).addOreDict("oreOilSand").setHarvestLevel(BlockBase.ToolEnum.SHOVEL, 2).setSound(SoundType.SAND));
+        register(oilSand = new BlockBase(Material.SAND, "oil_sand").generateBlock(Blocks.SAND, 50, 80, 12, 3).addOreDict("oreOilSand").setHarvestLevel(BlockBase.ToolEnum.SHOVEL, 2).setSound(SoundType.SAND));
         register(petroleum = new BlockBase(Material.ROCK, "ore_petroleum").generateBlock(Blocks.STONE, 20, 70, 5, 9).addOreDict("orePetroleum").setHarvestLevel(BlockBase.ToolEnum.PICKAXE, 2).setSound(SoundType.STONE));
         register(distillery = new BlockDistillery());
         register(hearthFurnace = new BlockHearthFurnace());
@@ -63,20 +63,20 @@ public static void preInit(FMLPreInitializationEvent event){
         TraincraftAPI.addTrackRegister(BlockTrackStraight.class, BlockTrackSlope.class, BlockTrackCurve.class);
         TraincraftAPI.registerTracks();
 
-        register(TrainProvider.create(MuseumSteamTrain.class, "museumTrain", new MuseumSteamTrainModel()));
+        //register(TrainProvider.create(MuseumSteamTrain.class, "museumTrain", new MuseumSteamTrainModel()));
     }
 
-    public static <T extends IRegistryEntry> T[] register(T... entries){
-        for(T entry : entries){
-            for(IRegistryEntry reg : entry.getRegisterElements()){
-                if(reg instanceof IForgeRegistryEntry){
+    public static <T extends IRegistryEntry> T[] register(T... entries) {
+        for (T entry : entries) {
+            for (IRegistryEntry reg : entry.getRegisterElements()) {
+                if (reg instanceof IForgeRegistryEntry) {
                     ((IForgeRegistryEntry) reg).setRegistryName(new ResourceLocation(Traincraft.MODID, reg.getRegisterName()));
                     GameRegistry.register((IForgeRegistryEntry<?>) reg);
                     reg.onRegister(entries);
                 } else {
                     reg.ownRegistry();
                 }
-                if(Traincraft.loadedSide.isClient()){
+                if (Traincraft.loadedSide.isClient()) {
                     reg.loadClientSide();
                 }
             }

src/main/java/si/meansoft/traincraft/TeslaWrapper.java

@@ -4,7 +4,7 @@
  * It is distributed under the Traincraft License (https://github.com/Traincraft/Traincraft/blob/master/LICENSE.md)
  * You can find the source code at https://github.com/Traincraft/Traincraft
  *
- * © 2011-2016
+ * © 2011-2017
  */
 
 package si.meansoft.traincraft;
@@ -19,38 +19,38 @@
 /**
  * @author canitzp
  */
-public class TeslaWrapper implements ITeslaHolder, ITeslaConsumer, ITeslaProducer{
+public class TeslaWrapper implements ITeslaHolder, ITeslaConsumer, ITeslaProducer {
 
     private EnergyStorage storage;
 
-    private TeslaWrapper(EnergyStorage storage){
+    private TeslaWrapper(EnergyStorage storage) {
         this.storage = storage;
     }
 
-    public static <T> T getFromCapability(EnergyStorage storage, Capability<T> c){
-        if(c == TeslaCapabilities.CAPABILITY_HOLDER || c == TeslaCapabilities.CAPABILITY_HOLDER || c == TeslaCapabilities.CAPABILITY_PRODUCER){
+    public static <T> T getFromCapability(EnergyStorage storage, Capability<T> c) {
+        if (c == TeslaCapabilities.CAPABILITY_HOLDER || c == TeslaCapabilities.CAPABILITY_HOLDER || c == TeslaCapabilities.CAPABILITY_PRODUCER) {
             return (T) new TeslaWrapper(storage);
         }
         return null;
     }
 
     @Override
-    public long getStoredPower(){
+    public long getStoredPower() {
         return this.storage.getEnergyStored();
     }
 
     @Override
-    public long getCapacity(){
+    public long getCapacity() {
         return this.storage.getMaxEnergyStored();
     }
 
     @Override
-    public long givePower(long power, boolean simulated){
+    public long givePower(long power, boolean simulated) {
         return this.storage.receiveEnergy((int) power, simulated);
     }
 
     @Override
-    public long takePower(long power, boolean simulated){
+    public long takePower(long power, boolean simulated) {
         return this.storage.extractEnergy((int) power, simulated);
     }
 }

src/main/java/si/meansoft/traincraft/Traincraft.java

@@ -4,12 +4,13 @@
  * It is distributed under the Traincraft License (https://github.com/Traincraft/Traincraft/blob/master/LICENSE.md)
  * You can find the source code at https://github.com/Traincraft/Traincraft
  *
- * © 2011-2016
+ * © 2011-2017
  */
 
 package si.meansoft.traincraft;
 
 import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.fml.common.Mod;
@@ -29,7 +30,7 @@
 /**
  * @author canitzp
  */
-@Mod(modid = Traincraft.MODID, name= Traincraft.NAME, version = Traincraft.VERSION)
+@Mod(modid = Traincraft.MODID, name = Traincraft.NAME, version = Traincraft.VERSION)
 public class Traincraft {
 
     public static final String MODID = "traincraft";
@@ -49,7 +50,7 @@ public class Traincraft {
 
     public static Side loadedSide;
 
-    static{
+    static {
         /*
          * To initialize the buckets for fluids, if we don't call this, we haven't buckets
          * and this has to be called before preInit
@@ -66,15 +67,25 @@ public void preInit(FMLPreInitializationEvent event) {
         // Creating the two creative tabs for Traincraft. One for bLocks and items and the second for the rails
         generalTab = new CreativeTabs("traincraft_general_tab") {
             @Override
-            public ItemStack getTabIconItem() {
+            public ItemStack getIconItemStack() {
                 return new ItemStack(Registry.oilSand);
             }
+
+            @Override
+            public Item getTabIconItem() {
+                return null;
+            }
         };
-        trackTab = new CreativeTabs("traincraft_track_tab"){
+        trackTab = new CreativeTabs("traincraft_track_tab") {
             @Override
-            public ItemStack getTabIconItem(){
+            public ItemStack getIconItemStack() {
                 return new ItemStack(BlockTrackStraight.block);
             }
+
+            @Override
+            public Item getTabIconItem() {
+                return null;
+            }
         };
         logger.info("[Pre Initializing] Register Blocks, Items, ...");
         Registry.preInit(event);

src/main/java/si/meansoft/traincraft/TraincraftResources.java

@@ -4,7 +4,7 @@
  * It is distributed under the Traincraft License (https://github.com/Traincraft/Traincraft/blob/master/LICENSE.md)
  * You can find the source code at https://github.com/Traincraft/Traincraft
  *
- * © 2011-2016
+ * © 2011-2017
  */
 
 package si.meansoft.traincraft;
@@ -23,11 +23,12 @@ public enum TraincraftResources {
     GUI_HEARTH_FURNACE("gui_hearth_furnace");
 
     String name, textureName;
+
     TraincraftResources(String name) {
         this.name = name;
     }
 
-    public ResourceLocation newGuiLocation(){
+    public ResourceLocation newGuiLocation() {
         return new ResourceLocation(Traincraft.MODID, "textures/gui/" + name + ".png");
     }
 

src/main/java/si/meansoft/traincraft/Util.java

@@ -4,7 +4,7 @@
  * It is distributed under the Traincraft License (https://github.com/Traincraft/Traincraft/blob/master/LICENSE.md)
  * You can find the source code at https://github.com/Traincraft/Traincraft
  *
- * © 2011-2016
+ * © 2011-2017
  */
 
 package si.meansoft.traincraft;
@@ -14,44 +14,46 @@
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.math.BlockPos;
+import si.meansoft.traincraft.compat.VanillaUtil;
 
 /**
  * @author canitzp
  */
 public class Util {
 
-    public static void sendTilePacketToAllAround(TileEntity tile){
-        for(EntityPlayer player : tile.getWorld().playerEntities){
-            if(player instanceof EntityPlayerMP){
+    public static void sendTilePacketToAllAround(TileEntity tile) {
+        for (EntityPlayer player : tile.getWorld().playerEntities) {
+            if (player instanceof EntityPlayerMP) {
                 BlockPos pos = tile.getPos();
-                if(player.getDistance(pos.getX(), pos.getY(), pos.getZ()) <= 64){
-                    ((EntityPlayerMP)player).connection.sendPacket(tile.getUpdatePacket());
+                if (player.getDistance(pos.getX(), pos.getY(), pos.getZ()) <= 64) {
+                    ((EntityPlayerMP) player).connection.sendPacket(tile.getUpdatePacket());
                 }
             }
         }
     }
 
-    public static ItemStack decreaseItemStack(ItemStack toDecrease, ItemStack decreaseValue){
-        if(ItemStack.areItemStacksEqual(toDecrease, decreaseValue)){
-            int i = toDecrease.copy().getCount() - decreaseValue.copy().getCount();
-            if(i > 0){
-                toDecrease.shrink(decreaseValue.getCount());
-            } else if(i <= 0){
-                toDecrease = ItemStack.EMPTY;
+    public static ItemStack decreaseItemStack(ItemStack toDecrease, ItemStack decreaseValue) {
+        if (ItemStack.areItemStacksEqual(toDecrease, decreaseValue)) {
+            int i = VanillaUtil.getCount(toDecrease) - VanillaUtil.getCount(decreaseValue);
+            if (i > 0) {
+                VanillaUtil.decreaseStack(toDecrease, VanillaUtil.getCount(decreaseValue));
+            } else if (i <= 0) {
+                toDecrease = VanillaUtil.getEmpty();
             }
             return toDecrease;
         }
         return toDecrease;
     }
 
-    public enum NBTType{
+    public enum NBTType {
         SYNC,
         SAVE;
 
-        public boolean sync(){
+        public boolean sync() {
             return this == SYNC;
         }
-        public boolean save(){
+
+        public boolean save() {
             return this == SAVE;
         }
     }