pull into master

.gitignore

@@ -15,4 +15,27 @@
 !/changelog.md
 
 # APIs and dependencies
-!/libs
+!/libs
+
+######################################
+## Remove MAC OSX generated garbage
+######################################
+
+*/.DS_Store
+.DS_Store
+.DS_Store?
+.Trashes
+Icon?
+
+############
+## Windows
+############
+
+# Windows image file caches
+Thumbs.db
+
+# Folder config file
+Desktop.ini
+
+# Recycle Bin used on file shares
+$RECYCLE.BIN/

build.gradle

@@ -20,7 +20,7 @@ buildscript {
 		}
 	}
 	dependencies {
-		classpath 'com.github.GTNH2:ForgeGradle:FG_1.2-SNAPSHOT'
+		classpath 'com.github.GTNewHorizons:ForgeGradle:stable-2021-11-20'
 	}
 }
 
@@ -103,8 +103,8 @@ dependencies {
 	implementation "li.cil.tis3d:TIS-3D:${config.tis3d.version}:dev"
 	compileOnly "net.industrial-craft:industrialcraft-2:${config.ic2.version}:dev"
 	compileOnly "com.github.GTNewHorizons:GT5-Unofficial:${config.gt5.version}:dev"
-	implementation name: "buildcraft", version: "${config.buildcraft.version}", classifier: "dev"
-	compileOnly "mods.railcraft:Railcraft:${config.minecraft.version}-${config.railcraft.version}"
+	implementation "com.mod-buildcraft:buildcraft:7.1.23:dev"
+  compileOnly "com.github.GTNewHorizons:Railcraft:mc-1.7.10-SNAPSHOT:dev"
 	//compileOnly "com.gregoriust.gregtech:gregtech_1.7.10:${config.gregtech.version}:dev"
 	compileOnly "com.gregoriust.gregtech:gregtech_1.7.10:${config.gregtech6.version}:dev"
 	implementation "mcp.mobius.waila:Waila:${config.waila.version}:dev"
@@ -120,12 +120,12 @@ dependencies {
 		exclude module: "EquivalentExchange3"
 		exclude module: "EnderCore"
 	}
-	implementation("net.sengir.forestry:forestry_1.7.10:${config.forestry.version}:dev") {
+	implementation("com.github.GTNewHorizons:ForestryMC:GTNH-Fixes-SNAPSHOT:dev") {
 		exclude module: "buildcraft"
 		exclude module: "industrialcraft-2"
 	}
 	compileOnly "net.bdew:gendustry:${config.gendustry.version}-mc${config.minecraft.version}:dev"
-	implementation("appeng:appliedenergistics2:${config.ae2.version}:dev") {
+	implementation("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-1.7.10-SNAPSHOT:dev") {
 		transitive = false
 	}
 	//compileOnly "curse.maven:armourers-workshop:${config.am.version}"
@@ -148,12 +148,6 @@ minecraft {
 	replace "@VERSION@", "${config.computronics.version}"
 }
 
-sourceSets {
-	main {
-		output.resourcesDir = 'build/classes/java/main'
-	}
-}
-
 apply plugin: 'idea'
 idea {
 	module {
@@ -199,19 +193,19 @@ task deobfJar(type: Jar) {
 	manifest commonManifest
 }
 
-task apiZip(type: Zip) {
+task apiZip(type: Jar) {
 	description = 'Creates a zip file containing the API source files only'
 	classifier = 'api'
 	destinationDir = file(libDir)
 	from sourceSets.main.allSource
 	include 'pl/asie/**/api/**'
 }
 
-task makeJars {
-	description = 'Creates the mod files'
+artifacts {
+	archives(deobfJar)
+	archives(apiZip)
 }
 
-makeJars.dependsOn clean, build, deobfJar, apiZip
 build.shouldRunAfter clean
 deobfJar.shouldRunAfter build
 apiZip.shouldRunAfter deobfJar

build.properties

@@ -1,12 +1,11 @@
 minecraft.version=1.7.10
 forge.version=10.13.4.1614-1.7.10
-computronics.version=1.6.6
+computronics.version=1.6.8-GTNH
 
 ae2.version=rv3-beta-59-GTNH
 am.version=2609484
 bluepower.version=0.2.940
 buildcraft.version=7.0.6
-railcraft.version=9.12.2.1
 endercore.version=1.7.10-0.2.0.39_beta
 enderio.version=1.7.10-2.3.0.429_beta
 forestry.version=4.4.0.0

src/main/java/pl/asie/computronics/integration/forestry/IntegrationForestry.java

@@ -19,7 +19,10 @@
 import forestry.api.genetics.IAlleleSpecies;
 import forestry.api.genetics.IClassification;
 import forestry.api.recipes.RecipeManagers;
+import forestry.apiculture.genetics.alleles.AlleleEffect;
 import forestry.apiculture.render.ParticleRenderer;
+import forestry.core.genetics.alleles.AlleleHelper;
+import forestry.core.genetics.alleles.EnumAllele.*;
 import li.cil.oc.api.Items;
 import li.cil.oc.api.Nanomachines;
 import net.bdew.gendustry.api.EnumMutationSetting;
@@ -45,6 +48,8 @@
 
 import java.util.HashMap;
 
+import static forestry.api.apiculture.EnumBeeChromosome.*;
+
 /**
  * @author Vexatos
  */
@@ -164,21 +169,20 @@ public static IAllele[] getScummyTemplate() {
 		IAllele[] alleles = BeeManager.beeRoot.getTemplate(speciesExotic).clone();
 
 		//Just making sure
-		alleles[EnumBeeChromosome.CAVE_DWELLING.ordinal()] = AlleleManager.alleleRegistry.getAllele("forestry.boolFalse");
-		alleles[EnumBeeChromosome.HUMIDITY_TOLERANCE.ordinal()] = AlleleManager.alleleRegistry.getAllele("forestry.toleranceUp1");
-		alleles[EnumBeeChromosome.FLOWERING.ordinal()] = AlleleManager.alleleRegistry.getAllele("forestry.floweringSlowest");
-		alleles[EnumBeeChromosome.TERRITORY.ordinal()] = AlleleManager.alleleRegistry.getAllele("forestry.territoryDefault");
-
-		//Actual template
-		alleles[EnumBeeChromosome.SPECIES.ordinal()] = speciesScummy;
-		alleles[EnumBeeChromosome.FERTILITY.ordinal()] = AlleleManager.alleleRegistry.getAllele("forestry.fertilityLow");
-		alleles[EnumBeeChromosome.TOLERANT_FLYER.ordinal()] = AlleleManager.alleleRegistry.getAllele("forestry.boolTrue");
-		alleles[EnumBeeChromosome.NOCTURNAL.ordinal()] = AlleleManager.alleleRegistry.getAllele("forestry.boolFalse");
-		alleles[EnumBeeChromosome.SPEED.ordinal()] = AlleleManager.alleleRegistry.getAllele("forestry.speedSlowest");
-		alleles[EnumBeeChromosome.LIFESPAN.ordinal()] = AlleleManager.alleleRegistry.getAllele("forestry.lifespanLonger");
-		alleles[EnumBeeChromosome.TEMPERATURE_TOLERANCE.ordinal()] = AlleleManager.alleleRegistry.getAllele("forestry.toleranceUp1");
-		alleles[EnumBeeChromosome.FLOWER_PROVIDER.ordinal()] = sea;
-		alleles[EnumBeeChromosome.EFFECT.ordinal()] = AlleleManager.alleleRegistry.getAllele("forestry.effectDrunkard");
+		AlleleHelper.instance.set(alleles, SPEED, Speed.SLOWEST);
+		AlleleHelper.instance.set(alleles, LIFESPAN, Lifespan.LONGER);
+		AlleleHelper.instance.set(alleles, FERTILITY, Fertility.LOW);
+		AlleleHelper.instance.set(alleles, TEMPERATURE_TOLERANCE, Tolerance.UP_1);
+		AlleleHelper.instance.set(alleles, NOCTURNAL, false);
+		AlleleHelper.instance.set(alleles, HUMIDITY_TOLERANCE, Tolerance.UP_1);
+		AlleleHelper.instance.set(alleles, TOLERANT_FLYER, true);
+		AlleleHelper.instance.set(alleles, CAVE_DWELLING, false);
+		AlleleHelper.instance.set(alleles, FLOWER_PROVIDER, sea);
+		AlleleHelper.instance.set(alleles, FLOWERING, Flowering.SLOWEST);
+		AlleleHelper.instance.set(alleles, TERRITORY, Territory.AVERAGE);
+		AlleleHelper.instance.set(alleles, EFFECT, AlleleEffect.effectDrunkard);
+		AlleleHelper.instance.set(alleles, SPECIES, speciesScummy);
+
 		return alleles;
 	}
 

src/main/java/pl/asie/computronics/integration/gregtech/gregtech5/GregTech5Recipes.java

@@ -8,6 +8,7 @@
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.util.GT_OreDictUnificator;
+import gregtech.api.util.GT_Utility;
 import mods.railcraft.common.items.ItemElectricMeter;
 import mods.railcraft.common.items.ItemRail;
 import mods.railcraft.common.items.RailcraftItem;
@@ -206,6 +207,6 @@ public static void registerStandardGregTechRecipes() {
 			null, null, null, null, null, null, 800, 30);
 
 		GT_Values.RA.addChemicalRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Chrome, 1),
-			null, Materials.Oxygen.getGas(5000), null, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.ChromiumDioxide, 1), 800);
+				GT_Utility.getIntegratedCircuit(1), Materials.Oxygen.getGas(2000), null, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.ChromiumDioxide, 1), 800);
 	}
 }

src/main/java/pl/asie/computronics/integration/railcraft/block/BlockDigitalBoxBase.java

@@ -49,10 +49,6 @@ public IIcon getIcon(int side, int meta) {
 				return texturesBox[0];
 		}
 	}
-    public IIcon func_149691_a(int side, int meta)
-    {
-        return getIcon(side, meta);
-    }
 
 	@Override
 	@SideOnly(Side.CLIENT)

src/main/java/pl/asie/computronics/integration/railcraft/gui/GuiTicketMachine.java

@@ -109,8 +109,4 @@ private void updateButtons() {
 			}
 		}
 	}
-    protected void drawGuiContainerBackgroundLayer(float p_146976_1_, int p_146976_2_, int p_146976_3_)
-    {
-        super.func_146976_a(p_146976_1_, p_146976_2_, p_146976_3_);
-    }
 }