Skip to content
This repository has been archived by the owner on May 25, 2024. It is now read-only.

Commit

Permalink
Expand item limit for Neutron Activator & Add back Low Quality Naquad…
Browse files Browse the repository at this point in the history
…ria Sulphate to the outputs from Concentrated Enriched-Naquadah Sludge (#53)

* Expand item limit for Neutron Activator & Add back Low Quality Naquadria Sulphate to the outputs from Concentrated Enriched-Naquadah Sludge

* updateBuildScript & spotlessApply
  • Loading branch information
miozune authored Jul 15, 2022
1 parent 36301fe commit c0eb617
Show file tree
Hide file tree
Showing 91 changed files with 8,371 additions and 6,677 deletions.
265 changes: 231 additions & 34 deletions build.gradle

Large diffs are not rendered by default.

40 changes: 20 additions & 20 deletions dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,28 +2,28 @@

dependencies {

compile('com.github.GTNewHorizons:GT5-Unofficial:5.09.40.65-pre:dev')
compile('com.github.GTNewHorizons:StructureLib:1.0.15:dev')
compile('com.github.GTNewHorizons:bartworks:0.5.53-pre:dev')
compile('com.github.GTNewHorizons:NotEnoughItems:2.2.15-GTNH:dev')
compile('com.github.GTNewHorizons:TecTech:5.0.5.1:dev')
compile('com.github.GTNewHorizons:GT5-Unofficial:5.09.40.65-pre:dev')
compile('com.github.GTNewHorizons:StructureLib:1.0.15:dev')
compile('com.github.GTNewHorizons:bartworks:0.5.53-pre:dev')
compile('com.github.GTNewHorizons:NotEnoughItems:2.2.15-GTNH:dev')
compile('com.github.GTNewHorizons:TecTech:5.0.5.1:dev')

compile('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev')
compile('net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev')
compile('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev')
compile('net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev')

compileOnly('com.github.GTNewHorizons:EnderCore:0.2.6:dev') {transitive = false}
compileOnly('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-75-GTNH:dev') {transitive = false}
compileOnly('com.github.GTNewHorizons:GTplusplus:1.7.28:dev') {transitive = false}
compileOnly('com.github.GTNewHorizons:AppleCore:3.1.9:dev') {transitive = false}
compileOnly('com.github.GTNewHorizons:ForestryMC:4.4.6:dev') {transitive = false}
compileOnly('com.github.GTNewHorizons:Railcraft:9.13.6:dev') {transitive = false}
compileOnly('com.github.GTNewHorizons:EnderIO:2.3.1.30:dev') {transitive = false}
compileOnly('com.github.GTNewHorizons:ExtraCells2:2.5.9:dev') {transitive = false}
compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.27:dev') {transitive = false}
compileOnly('com.github.GTNewHorizons:ThaumicEnergistics:1.3.16-GTNH:dev') {transitive = false}
compileOnly('com.github.GTNewHorizons:EnderCore:0.2.6:dev') {transitive = false}
compileOnly('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-75-GTNH:dev') {transitive = false}
compileOnly('com.github.GTNewHorizons:GTplusplus:1.7.28:dev') {transitive = false}
compileOnly('com.github.GTNewHorizons:AppleCore:3.1.9:dev') {transitive = false}
compileOnly('com.github.GTNewHorizons:ForestryMC:4.4.6:dev') {transitive = false}
compileOnly('com.github.GTNewHorizons:Railcraft:9.13.6:dev') {transitive = false}
compileOnly('com.github.GTNewHorizons:EnderIO:2.3.1.30:dev') {transitive = false}
compileOnly('com.github.GTNewHorizons:ExtraCells2:2.5.9:dev') {transitive = false}
compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.27:dev') {transitive = false}
compileOnly('com.github.GTNewHorizons:ThaumicEnergistics:1.3.16-GTNH:dev') {transitive = false}

runtime('com.github.GTNewHorizons:NewHorizonsCoreMod:1.9.20:dev')
runtime('com.github.GTNewHorizons:ForestryMC:4.4.6:dev')
runtime('com.github.GTNewHorizons:NewHorizonsCoreMod:1.9.20:dev')
runtime('com.github.GTNewHorizons:ForestryMC:4.4.6:dev')

//compileOnly('com.github.GTNewHorizons:Avaritia:1.24)
//compileOnly('com.github.GTNewHorizons:Avaritia:1.24)
}
52 changes: 26 additions & 26 deletions repositories.gradle
Original file line number Diff line number Diff line change
@@ -1,31 +1,31 @@
// Add any additional repositories for your dependencies here

repositories {
maven {
name 'GTNH Maven'
url 'http://jenkins.usrv.eu:8081/nexus/content/groups/public/'
allowInsecureProtocol
}
maven {
name 'ic2'
url 'https://maven.ic2.player.to/'
metadataSources {
mavenPom()
artifact()
}
maven {
name 'GTNH Maven'
url 'http://jenkins.usrv.eu:8081/nexus/content/groups/public/'
allowInsecureProtocol
}
maven {
name 'ic2'
url 'https://maven.ic2.player.to/'
metadataSources {
mavenPom()
artifact()
}

}
maven {
name 'gt'
url 'https://gregtech.overminddl1.com/'
}
maven {
url 'https://cursemaven.com'
content {
includeGroup 'curse.maven'
}
}
maven {
url 'https://jitpack.io'
}
}
maven {
name 'gt'
url 'https://gregtech.overminddl1.com/'
}
maven {
url 'https://cursemaven.com'
content {
includeGroup 'curse.maven'
}
}
maven {
url 'https://jitpack.io'
}
}
34 changes: 16 additions & 18 deletions src/main/java/goodgenerator/blocks/myFluids/BaseFluid.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package goodgenerator.blocks.myFluids;

import static goodgenerator.main.GoodGenerator.MOD_ID;

import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.material.Material;
Expand All @@ -9,46 +11,42 @@
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidRegistry;

import static goodgenerator.main.GoodGenerator.MOD_ID;

public class BaseFluid extends BlockFluidClassic{
@SideOnly( Side.CLIENT )
public class BaseFluid extends BlockFluidClassic {
@SideOnly(Side.CLIENT)
protected IIcon stillIcon;
@SideOnly( Side.CLIENT )

@SideOnly(Side.CLIENT)
protected IIcon flowingIcon;

private String stillTexture;
private String flowingTexture;

public BaseFluid(Fluid fluid, Material material)
{
super( fluid, material );
public BaseFluid(Fluid fluid, Material material) {
super(fluid, material);
}

public void SetTexture(String fluidName)
{
public void SetTexture(String fluidName) {
stillTexture = MOD_ID + ":fluids/" + fluidName + ".still";
flowingTexture = MOD_ID + ":fluids/" + fluidName + ".flowing";
}

public static Fluid BuildFluid(String fluidName){
public static Fluid BuildFluid(String fluidName) {
Fluid tFluid = new Fluid(fluidName);
FluidRegistry.registerFluid(tFluid);
return tFluid;
}

@SideOnly( Side.CLIENT )
@SideOnly(Side.CLIENT)
@Override
public void registerBlockIcons( IIconRegister register )
{
public void registerBlockIcons(IIconRegister register) {
stillIcon = register.registerIcon(stillTexture);
flowingIcon = register.registerIcon(flowingTexture);

super.getFluid().setIcons( stillIcon, flowingIcon );
super.getFluid().setIcons(stillIcon, flowingIcon);
}

@Override
public IIcon getIcon( int side, int meta )
{
return ( side == 0 || side == 1 ) ? stillIcon : flowingIcon;
public IIcon getIcon(int side, int meta) {
return (side == 0 || side == 1) ? stillIcon : flowingIcon;
}
}
Loading

0 comments on commit c0eb617

Please sign in to comment.