Skip to content

Commit

Permalink
Fixed Build Script.
Browse files Browse the repository at this point in the history 
Fixed IC2C compile issue.
Fixed Radiation effect using a statc potion ID.
Removed IE, Magneticraft, TiCon and Translocators as compile requirements.
  • Loading branch information
@draknyte1
draknyte1 committed Dec 13, 2019
1 parent 7b592a6 commit be8b163
Show file tree
Hide file tree
Showing 9 changed files with 350 additions and 213 deletions.
156 changes: 72 additions & 84 deletions build.gradle
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
buildscript {
repositories {
mavenCentral()
maven {
name = "forge"
url = "http://files.minecraftforge.net/maven"
}
jcenter()
//maven {
// name = "forge"
// url = "http://files.minecraftforge.net/maven"
//}
maven {
name = "gt"
url = "https://gregtech.overminddl1.com/"
}
maven {
name = "sonatype"
url = "https://oss.sonatype.org/content/repositories/snapshots/"
Expand All @@ -15,8 +20,30 @@ buildscript {
}
}

apply plugin: 'forge'
// Because Forge is too stupid to fix Deprecation Issues, and we cannot fix it on our end! (until we fork Forge)
allprojects {
tasks.withType(JavaCompile) {
options.compilerArgs << "-Xlint:deprecation"
}
}

apply plugin: 'eclipse'
eclipse {
classpath {
downloadJavadoc = true
downloadSources = true
}
}

apply plugin: 'idea'
idea{
module {
downloadJavadoc = true
downloadSources = true
}
}

apply plugin: 'forge'

file "build.properties" withReader {
def prop = new Properties()
Expand All @@ -28,9 +55,12 @@ version = "${config.gt.version}"
group= "gregtech"
archivesBaseName = "gregtech"


sourceCompatibility = 1.7
targetCompatibility = 1.7
compileJava.options.bootClasspath = org.gradle.internal.jvm.Jvm.current().getJre().getHomeDir().toString() +"/lib/rt.jar"
compileJava {
options.encoding = "UTF-8"
}

minecraft {
version = "${config.minecraft.version}-${config.forge.version}"
Expand All @@ -46,89 +76,47 @@ configurations {
}

repositories {
maven {
name 'Forge'
url 'http://files.minecraftforge.net/maven'
}
maven {
name = "chickenbones"
url = "http://chickenbones.net/maven/"
}
maven {
name = "ic2, forestry"
url = "http://maven.ic2.player.to/"
}
maven { // EnderIO & EnderCore
name 'tterrag Repo'
url "http://maven.tterrag.com"
}
maven { // TConstruct
name 'DVS1 Maven FS'
url 'http://dvs1.progwml6.com/files/maven'
}

maven { // AppleCore
url "http://www.ryanliptak.com/maven/"
}
ivy {
name "BuildCraft"
artifactPattern "http://www.mod-buildcraft.com/releases/BuildCraft/[revision]/[module]-[revision]-[classifier].[ext]"
}
ivy {
name 'CoFHLib'
artifactPattern "http://addons-origin.cursecdn.com/files/${config.cofhlib.cf}/[module]-[revision].[ext]"
}
ivy {
name 'CoFHCore'
artifactPattern "http://addons-origin.cursecdn.com/files/${config.cofhcore.cf}/[module]-[revision].[ext]"
}
ivy {
name 'Railcraft'
artifactPattern "http://addons-origin.cursecdn.com/files/${config.railcraft.cf}/[module]_[revision].[ext]"
}
ivy {
name 'IC2NuclearControl'
artifactPattern "http://addons-origin.cursecdn.com/files/${config.nc.cf}/[module]-[revision].[ext]"
}
ivy {
name 'ImmersiveEngineering'
artifactPattern "http://addons-origin.cursecdn.com/files/${config.immeng.cf}/[module]-[revision].[ext]"
}
ivy {
name 'magneticraft'
artifactPattern "http://addons-origin.cursecdn.com/files/${config.magneticraft.cf}/[module]-[revision].[ext]"
}
maven {
name = "gt"
url = "http://gregtech.overminddl1.com/"
}
maven {
name = "ic2"
url = "http://maven.ic2.player.to/"
}
}

dependencies {
// compile fileTree(dir: 'libs', include: '*.jar')

compile "tconstruct:TConstruct:${config.minecraft.version}-${config.tconstruct.version}:deobf"
provided ("appeng:appliedenergistics2:${config.ae2.version}:dev") {
exclude module: '*'
}
provided "codechicken:CodeChickenLib:${config.minecraft.version}-${config.codechickenlib.version}:dev"
provided "codechicken:CodeChickenCore:${config.minecraft.version}-${config.codechickencore.version}:dev"
provided "codechicken:NotEnoughItems:${config.minecraft.version}-${config.nei.version}:dev"
provided "codechicken:Translocator:${config.minecraft.version}-${config.translocators.version}:dev"
provided "net.industrial-craft:industrialcraft-2:${config.ic2.version}:dev"
provided "net.sengir.forestry:forestry_${config.minecraft.version}:${config.forestry.version}:dev"
provided "applecore:AppleCore:${config.applecore.version}:api"
provided "com.enderio.core:EnderCore:${config.enderiocore.version}:dev"
provided ("com.enderio:EnderIO:${config.enderio.version}:dev") {
transitive = false
}
provided name: 'buildcraft', version: config.buildcraft.version, classifier: "dev", ext: 'jar'
provided name: 'CoFHLib', version: config.cofhlib.version, ext: 'jar'
provided name: 'CoFHCore', version: config.cofhcore.version, ext: 'jar'
provided name: 'Railcraft', version: config.railcraft.version, ext: 'jar'
provided name: 'IC2NuclearControl', version: config.nc.version, ext: 'jar'
provided name: 'ImmersiveEngineering', version: config.immeng.version, ext: 'jar'
provided name: 'magneticraft', version: config.magneticraft.version, ext: 'jar'
// compile files("libs/Galacticraft-API-1.7-${config.gc.version}.jar")
// compile files("libs/GalacticraftCore-Dev-${config.gc.version}.jar")
provided name: "Galacticraft-API", version: config.gc.version, ext: 'jar'
provided name: "GalacticraftCore-Dev", version: config.gc.version, ext: 'jar'
// Mostly Used for compileOnly, if you prefer normal IC2, uncomment it instead.
//provided "net.industrial-craft:industrialcraft-2:${config.ic2.version}:dev"
compile "ic2:IC2Classic:1.2.1.8:dev"

compile "mcp.mobius.waila:Waila:1.5.11-RC2-NONEI_1.7.10:dev"
compile "codechicken:CodeChickenLib:1.7.10-1.1.3.140:dev"
compile "codechicken:CodeChickenCore:1.7.10-1.0.7.47:dev"
compile "codechicken:NotEnoughItems:1.7.10-1.0.5.120:dev"

compileOnly "com.enderio.core:EnderCore:1.7.10-0.2.0.39_beta:dev"
// "com.enderio:EnderIO:1.7.10-2.3.0.429_beta:dev"
compileOnly "com.enderio:EnderIO:1.7.10-2.3.0.430_beta:dev"

compileOnly "cofh:CoFHCore:1.7.10R3.0.4:dev"
compileOnly "cofh:CoFHLib:1.7.10R3.0.3:dev"
compileOnly "com.mod-buildcraft:buildcraft:7.1.23:dev"
compileOnly "net.sengir.forestry:forestry_1.7.10:4.2.16.64:dev"
compileOnly "mods.railcraft:Railcraft_1.7.10:9.12.3.0:dev"

compileOnly "micdoodle8.mods:GalacticraftCore:1.7-3.0.12.504:Dev"
compileOnly "micdoodle8.mods:MicdoodleCore:1.7-3.0.12.504:Dev"

compileOnly "thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev"
compileOnly "com.azanor.baubles:Baubles:1.7.10-1.0.1.10:deobf"
compileOnly "appeng:appliedenergistics2:rv3-beta-6:dev"
compileOnly "applecore:AppleCore:1.7.10-3.1.1:deobf"
compileOnly "com.shedar.IC2NuclearControl:IC2NuclearControl:2.4.3a:dev"

}

processResources
Expand Down
30 changes: 2 additions & 28 deletions build.properties
View file
Original file line number Diff line number Diff line change
@@ -1,30 +1,4 @@
minecraft.version=1.7.10
forge.version=10.13.4.1566-1.7.10

gt.version=5.09.31
ae2.version=rv2-beta-33
applecore.version=1.7.10-1.2.1+107.59407
buildcraft.version=7.1.11
codechickenlib.version=1.1.3.140
codechickencore.version=1.0.7.47
cofhcore.cf=2246/920
cofhcore.version=[1.7.10]3.0.3-303-dev
cofhlib.cf=2246/918
cofhlib.version=[1.7.10]1.0.3-175-dev
enderio.cf=2219/296
enderio.version=1.7.10-2.3.0.417_beta
enderiocore.version=1.7.10-0.1.0.25_beta
forestry.version=4.2.10.58
gc.version=1.7-3.0.12.504
forge.version=10.13.4.1614-1.7.10
ic2.version=2.2.790-experimental
nei.version=1.0.3.57
railcraft.cf=2219/321
railcraft.version=1.7.10-9.4.0.0
nc.cf=2275/987
nc.version=2.3.4a
immeng.cf=2299/20
immeng.version=0.7.7-deobf
magneticraft.cf=2276/268
magneticraft.version=0.6.1-final
tconstruct.version=1.8.4.build951
translocators.version=1.1.2.16
gt.version=5.09.31
8 changes: 4 additions & 4 deletions src/main/java/gregtech/api/items/GT_RadioactiveCellIC_Item.java
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
package gregtech.api.items;


import java.util.ArrayList;

import gregtech.api.GregTech_API;
import gregtech.api.util.GT_Utility;
import ic2.api.reactor.IReactor;
import ic2.api.reactor.IReactorComponent;
import ic2.core.IC2Potion;
import ic2.core.item.armor.ItemArmorHazmat;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;

import java.util.ArrayList;


public class GT_RadioactiveCellIC_Item extends GT_RadioactiveCell_Item implements IReactorComponent {
public final int numberOfCells;
Expand Down Expand Up @@ -146,7 +146,7 @@ public void onUpdate(ItemStack stack, World world, Entity entity, int slotIndex,
if (this.sRadiation > 0 && (entity instanceof EntityLivingBase)) {
EntityLivingBase entityLiving = (EntityLivingBase) entity;
if (!GregTech_API.mIC2Classic&&!ItemArmorHazmat.hasCompleteHazmat(entityLiving)) {
IC2Potion.radiation.applyTo(entityLiving, sRadiation * 20, sRadiation * 10);
GT_Utility.applyRadioactivity(entityLiving, sRadiation, stack.stackSize);
}
}
}
Expand Down
54 changes: 41 additions & 13 deletions src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Fluid.java
View file
Original file line number Diff line number Diff line change
@@ -1,22 +1,32 @@
package gregtech.api.metatileentity.implementations;

import static gregtech.api.enums.GT_Values.D1;

import java.util.ArrayList;
import java.util.List;

import org.apache.commons.lang3.tuple.MutableTriple;

import gregtech.GT_Mod;
import gregtech.api.GregTech_API;
import gregtech.api.enums.*;
import gregtech.api.enums.Dyes;
import gregtech.api.enums.Materials;
import gregtech.api.enums.OrePrefixes;
import gregtech.api.enums.SubTag;
import gregtech.api.enums.Textures;
import gregtech.api.interfaces.ITexture;
import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
import gregtech.api.interfaces.tileentity.ICoverable;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import gregtech.api.metatileentity.BaseMetaPipeEntity;
import gregtech.api.metatileentity.MetaPipeEntity;
import gregtech.api.objects.GT_RenderedTexture;
import gregtech.api.util.GT_CoverBehavior;
import gregtech.api.objects.XSTR;
import gregtech.api.util.GT_CoverBehavior;
import gregtech.api.util.GT_Log;
import gregtech.api.util.GT_Utility;
import gregtech.common.GT_Client;
import gregtech.common.covers.GT_Cover_Drain;
import gregtech.common.covers.GT_Cover_FluidRegulator;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
Expand All @@ -30,12 +40,6 @@
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.FluidTankInfo;
import net.minecraftforge.fluids.IFluidHandler;
import org.apache.commons.lang3.tuple.MutableTriple;

import java.util.ArrayList;
import java.util.List;

import static gregtech.api.enums.GT_Values.D1;

public class GT_MetaPipeEntity_Fluid extends MetaPipeEntity {
public final float mThickNess;
Expand Down Expand Up @@ -392,8 +396,21 @@ public boolean canConnect(byte aSide, TileEntity tTileEntity) {
if (coverBehavior instanceof GT_Cover_Drain) return true;

// Tinker Construct Faucets return a null tank info, so check the class
if (GregTech_API.mTConstruct && tTileEntity instanceof tconstruct.smeltery.logic.FaucetLogic) return true;

if (GregTech_API.mTConstruct) {
try {
Class aTinkerFaucet = Class.forName("tconstruct.smeltery.logic.FaucetLogic");
if (aTinkerFaucet != null) {
if (aTinkerFaucet.isInstance(tTileEntity)) {
return true;
}
}
}
catch (Throwable t) {

}
}


final IFluidHandler fTileEntity = (tTileEntity instanceof IFluidHandler) ? (IFluidHandler) tTileEntity : null;

if (fTileEntity != null) {
Expand All @@ -402,8 +419,19 @@ public boolean canConnect(byte aSide, TileEntity tTileEntity) {
if (tInfo.length > 0) return true;

// Translocators return a TankInfo, but it's of 0 length - so check the class if we see this pattern
if (GregTech_API.mTranslocator && tTileEntity instanceof codechicken.translocator.TileLiquidTranslocator) return true;
if (gTileEntity != null && gTileEntity.getCoverBehaviorAtSide(tSide) instanceof GT_Cover_FluidRegulator) return true;
if (GregTech_API.mTranslocator) {
try {
Class aCodeChickenTranslocator = Class.forName("codechicken.translocator.TileLiquidTranslocator");
if (aCodeChickenTranslocator != null) {
if (aCodeChickenTranslocator.isInstance(tTileEntity)) {
return true;
}
}
}
catch (Throwable t) {

}
}

}
}
Expand Down
Loading

0 comments on commit be8b163

Please sign in to comment.