Skip to content

Commit

Permalink
Add Oil Rig recipes for IV (#384)
Browse files Browse the repository at this point in the history 
* update BS+Spotless

* update dep file

* add new oilrigg recipes

* fix nei dep

* spotlessApply (#385)

Co-authored-by: Martin Robertz <dream-master@gmx.net>
Co-authored-by: GitHub GTNH Actions <>

* fix recipe derp

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
  • Loading branch information
@Dream-Master @github-actions
Dream-Master and github-actions[bot] authored Aug 23, 2022
1 parent 6caf142 commit 8d1549a
Show file tree
Hide file tree
Showing 171 changed files with 54,324 additions and 22,692 deletions.
35 changes: 35 additions & 0 deletions .gitattributes
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
* text eol=lf

*.jar binary

*.png binary
*.jpg binary
*.jpeg binary
*.gif binary
*.tif binary
*.tiff binary
*.ico binary
*.svg text
*.eps binary

*.kar binary
*.m4a binary
*.mid binary
*.midi binary
*.mp3 binary
*.ogg binary
*.ra binary

*.7z binary
*.gz binary
*.tar binary
*.tgz binary
*.zip binary

*.patch -text

*.bat text eol=crlf
*.cmd text eol=crlf
*.ps1 text eol=crlf

*autogenerated binary
435 changes: 328 additions & 107 deletions build.gradle
View file

Large diffs are not rendered by default.

20 changes: 10 additions & 10 deletions dependencies.gradle
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
// Add your dependencies here

dependencies {
compile("com.github.GTNewHorizons:GT5-Unofficial:5.09.41.08:dev")
compile("com.github.GTNewHorizons:GT5-Unofficial:5.09.41.10-pre:dev")
compile("com.github.GTNewHorizons:Yamcl:0.5.82:dev")
compile("com.github.GTNewHorizons:Baubles:1.0.1.14:dev")
compile("com.github.GTNewHorizons:StructureLib:1.1.3:dev")
compile("com.github.GTNewHorizons:Avaritia:1.28:dev")
compile("com.github.GTNewHorizons:StructureLib:1.1.4:dev")
compile("com.github.GTNewHorizons:Avaritia:1.29:dev")
compile("net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev")

compileOnly("com.github.GTNewHorizons:Hardcore-Ender-Expansion:1.9.3-GTNH:dev") {
transitive = false
}
compileOnly("com.github.GTNewHorizons:twilightforest:2.3.8.13:dev") {
compileOnly("com.github.GTNewHorizons:twilightforest:2.3.8.16:dev") {
transitive = false
}
compileOnly("com.github.GTNewHorizons:Railcraft:9.13.9:dev") {
Expand All @@ -20,22 +20,22 @@ dependencies {
compileOnly("com.github.GTNewHorizons:EnderIO:2.3.1.43:dev") {
transitive = false
}
// compileOnly("com.github.GTNewHorizons:GTplusplus:1.7.71:dev") {
// compileOnly("com.github.GTNewHorizons:GTplusplus:1.7.76:dev") {
// transitive = false
// }
compileOnly("com.github.GTNewHorizons:GalacticGregGT5:1.0.8:dev") {
transitive = false
}
compileOnly("com.github.GTNewHorizons:bartworks:0.5.73:dev") {
compileOnly("com.github.GTNewHorizons:bartworks:0.5.75:dev") {
transitive = false
}
compileOnly("com.github.GTNewHorizons:NotEnoughItems:2.2.22:dev") {
compileOnly("com.github.GTNewHorizons:NotEnoughItems:2.2.28-GTNH:dev") {
transitive = false
}
compileOnly("com.github.GTNewHorizons:Mantle:0.3.4:dev") {
transitive = false
}
compileOnly("com.github.GTNewHorizons:ForestryMC:4.4.5:api") {
compileOnly("com.github.GTNewHorizons:ForestryMC:4.4.12:api") {
transitive = false
}
compileOnly("com.github.GTNewHorizons:Binnie:2.0.42:dev") {
Expand All @@ -50,7 +50,7 @@ dependencies {
compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.9.0-17-GTNH:dev") {
transitive = false
}
compileOnly("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-96-GTNH:dev") {
compileOnly("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-97-GTNH:dev") {
transitive = false
}
compileOnly("com.github.GTNewHorizons:WitcheryExtras:1.1.11:dev") {
Expand All @@ -65,7 +65,7 @@ dependencies {
compileOnly("com.github.GTNewHorizons:BuildCraft:7.1.27:dev") {
transitive = false
}
compileOnly("com.github.GTNewHorizons:GTplusplus:1.7.66-pre:dev") {
compileOnly("com.github.GTNewHorizons:GTplusplus:1.7.76:dev") {
transitive = false
}

Expand Down
Binary file modified ovengloves.xcf
View file
Binary file not shown.
10 changes: 10 additions & 0 deletions settings.gradle
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
plugins {
id 'com.diffplug.blowdryerSetup' version '1.6.0'
}

apply plugin: 'com.diffplug.blowdryerSetup'

blowdryerSetup {
github('GTNewHorizons/ExampleMod1.7.10', 'tag', '0.1.5')
//devLocal '.' // Use this when testing config updates locally
}
95 changes: 52 additions & 43 deletions src/main/java/com/dreammaster/TwilightForest/TF_Loot_Chests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,10 @@

public class TF_Loot_Chests {


public static void init() {
//System.out.println("I'm in your loot, adding new things to TF");
// System.out.println("I'm in your loot, adding new things to TF");

//Hill1 = small
// Hill1 = small
TFTreasure.hill1.common.add(GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Thaumium, 2L), 6);
TFTreasure.hill1.common.add(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Bronze, 4L), 12);
TFTreasure.hill1.common.add(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Nickel, 4L), 12);
Expand All @@ -41,7 +40,7 @@ public static void init() {
TFTreasure.hill2.uncommon.add(GT_ModHandler.getModItem("Thaumcraft", "ItemShard", 4, 3), 12);
TFTreasure.hill2.uncommon.add(GT_ModHandler.getModItem("Thaumcraft", "ItemShard", 4, 4), 12);
TFTreasure.hill2.uncommon.add(GT_ModHandler.getModItem("Thaumcraft", "ItemShard", 4, 5), 12);
TFTreasure.hill2.uncommon.add(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.DamascusSteel, 4L),12);
TFTreasure.hill2.uncommon.add(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.DamascusSteel, 4L), 12);
TFTreasure.hill2.uncommon.add(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.ElectricalSteel, 4L), 12);
TFTreasure.hill2.uncommon.add(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Cobalt, 4L), 12);
TFTreasure.hill2.uncommon.add(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Molybdenum, 4L), 12);
Expand All @@ -53,7 +52,7 @@ public static void init() {
TFTreasure.hill2.rare.add(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminium, 2L), 12);
TFTreasure.hill2.ultrarare.add(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Gallium, 1L), 6);
TFTreasure.hill3.ultrarare.add(GT_ModHandler.getModItem("DraconicEvolution", "dezilsMarshmallow", 1, 0), 2);
//Hill3 = huge
// Hill3 = huge
TFTreasure.hill3.common.add(GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Thaumium, 6L), 12);
TFTreasure.hill3.common.add(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Manganese, 6L), 12);
TFTreasure.hill3.common.add(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Antimony, 6L), 12);
Expand Down Expand Up @@ -83,25 +82,26 @@ public static void init() {
TFTreasure.hill3.rare.add(GT_ModHandler.getModItem("DraconicEvolution", "dezilsMarshmallow", 1, 0), 2);
TFTreasure.hill3.ultrarare.add(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Gallium, 1L), 6);

//UrGhast Tower Basment
// UrGhast Tower Basment
TFTreasure.basement.common.add(new ItemStack(Blocks.torch, 16, 0), 2);
TFTreasure.basement.common.add(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.StainlessSteel, 16L), 12);
TFTreasure.basement.common.add(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Void, 8L), 6);
TFTreasure.basement.uncommon.add(new ItemStack(Items.potionitem, 1, 8198), 12);//potion night vision i
TFTreasure.basement.uncommon.add(GT_ModHandler.getModItem("Thaumcraft", "ItemResource", 8, 1), 12);//Nitor
TFTreasure.basement.uncommon.add(new ItemStack(Items.potionitem, 1, 8193), 6); //potion regen i
TFTreasure.basement.uncommon.add(new ItemStack(Items.potionitem, 1, 8197), 6); //potion health i
TFTreasure.basement.uncommon.add(new ItemStack(Items.potionitem, 1, 8194), 6); //potion swiftness i
TFTreasure.basement.uncommon.add(new ItemStack(Items.potionitem, 1, 8195), 6); //potion fire resistance i
TFTreasure.basement.uncommon.add(GT_ModHandler.getModItem("Thaumcraft", "ItemResource", 8, 0), 12);//Alumentum
TFTreasure.basement.uncommon.add(GT_ModHandler.getModItem("Thaumcraft", "ItemResource", 16, 14), 6);//Salis Mundus
TFTreasure.basement.rare.add(new ItemStack(Items.potionitem, 1, 8257), 6); //potion regen ii
TFTreasure.basement.rare.add(new ItemStack(Items.potionitem, 1, 8229), 6); //potion health ii
TFTreasure.basement.rare.add(new ItemStack(Items.potionitem, 1, 8258), 6); //potion extended swiftness ii
TFTreasure.basement.uncommon.add(new ItemStack(Items.potionitem, 1, 8198), 12); // potion night vision i
TFTreasure.basement.uncommon.add(GT_ModHandler.getModItem("Thaumcraft", "ItemResource", 8, 1), 12); // Nitor
TFTreasure.basement.uncommon.add(new ItemStack(Items.potionitem, 1, 8193), 6); // potion regen i
TFTreasure.basement.uncommon.add(new ItemStack(Items.potionitem, 1, 8197), 6); // potion health i
TFTreasure.basement.uncommon.add(new ItemStack(Items.potionitem, 1, 8194), 6); // potion swiftness i
TFTreasure.basement.uncommon.add(new ItemStack(Items.potionitem, 1, 8195), 6); // potion fire resistance i
TFTreasure.basement.uncommon.add(GT_ModHandler.getModItem("Thaumcraft", "ItemResource", 8, 0), 12); // Alumentum
TFTreasure.basement.uncommon.add(
GT_ModHandler.getModItem("Thaumcraft", "ItemResource", 16, 14), 6); // Salis Mundus
TFTreasure.basement.rare.add(new ItemStack(Items.potionitem, 1, 8257), 6); // potion regen ii
TFTreasure.basement.rare.add(new ItemStack(Items.potionitem, 1, 8229), 6); // potion health ii
TFTreasure.basement.rare.add(new ItemStack(Items.potionitem, 1, 8258), 6); // potion extended swiftness ii
TFTreasure.basement.rare.add(GT_ModHandler.getModItem("DraconicEvolution", "dezilsMarshmallow", 4, 0), 2);
TFTreasure.basement.rare.add(new ItemStack(Items.potionitem, 1, 8259), 6); //potion fire resistance iI
TFTreasure.basement.rare.add(new ItemStack(Items.potionitem, 1, 8259), 6); // potion fire resistance iI

//Litch Tower Library
// Litch Tower Library
TFTreasure.tower_library.common.add(new ItemStack(Blocks.torch, 16, 0), 6);
TFTreasure.tower_library.common.add(GT_ModHandler.getModItem("Thaumcraft", "blockCandle", 4, 0), 12);
TFTreasure.tower_library.common.add(GT_ModHandler.getModItem("Thaumcraft", "blockCandle", 4, 1), 12);
Expand All @@ -119,38 +119,47 @@ public static void init() {
TFTreasure.tower_library.common.add(GT_ModHandler.getModItem("Thaumcraft", "blockCandle", 4, 13), 12);
TFTreasure.tower_library.common.add(GT_ModHandler.getModItem("Thaumcraft", "blockCandle", 4, 14), 12);
TFTreasure.tower_library.common.add(GT_ModHandler.getModItem("Thaumcraft", "blockCandle", 4, 15), 12);
TFTreasure.tower_library.common.add(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.StainlessSteel, 4L), 12);
TFTreasure.tower_library.common.add(
GT_OreDictUnificator.get(OrePrefixes.dust, Materials.StainlessSteel, 4L), 12);
TFTreasure.tower_library.common.add(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.EnderEye, 4L), 12);
TFTreasure.tower_library.common.add(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.EnderPearl, 8L), 12);
TFTreasure.tower_library.common.add(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.StainlessSteel, 2L), 12);
TFTreasure.tower_library.common.add(
GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.StainlessSteel, 2L), 12);
TFTreasure.tower_library.common.add(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Void, 2L), 6);
TFTreasure.tower_library.common.add(GT_ModHandler.getModItem("Thaumcraft", "ItemResource", 2, 1), 12);//Nitor
TFTreasure.tower_library.common.add(new ItemStack(Items.potionitem, 1, 8201), 12); //potion strength i
TFTreasure.tower_library.common.add(GT_ModHandler.getModItem("Thaumcraft", "ItemResource", 1, 0), 12);//Alumentum
TFTreasure.tower_library.common.add(GT_ModHandler.getModItem("Thaumcraft", "ItemResource", 4, 14), 6);//Salis Mundus
TFTreasure.tower_library.uncommon.add(new ItemStack(Items.potionitem, 1, 8198), 12);//potion night vision i
TFTreasure.tower_library.uncommon.add(GT_ModHandler.getModItem("Thaumcraft", "ItemResource", 2, 1), 12);//Nitor
TFTreasure.tower_library.uncommon.add(new ItemStack(Items.potionitem, 1, 8193), 6); //potion regen i
TFTreasure.tower_library.uncommon.add(new ItemStack(Items.potionitem, 1, 8197), 6); //potion health i
TFTreasure.tower_library.uncommon.add(new ItemStack(Items.potionitem, 1, 8194), 6); //potion swiftness i
TFTreasure.tower_library.uncommon.add(new ItemStack(Items.potionitem, 1, 8195), 6); //potion fire resistance i
TFTreasure.tower_library.uncommon.add(GT_ModHandler.getModItem("Thaumcraft", "ItemResource", 1, 0), 12);//Alumentum
TFTreasure.tower_library.uncommon.add(GT_ModHandler.getModItem("Thaumcraft", "ItemResource", 4, 14), 6);//Salis Mundus
TFTreasure.tower_library.uncommon.add(new ItemStack(Items.potionitem, 1, 8233), 12); //potion strength ii
TFTreasure.tower_library.uncommon.add(GT_ModHandler.getModItem("DraconicEvolution", "dezilsMarshmallow", 1, 0), 12);
TFTreasure.tower_library.rare.add(new ItemStack(Items.potionitem, 1, 8257), 6); //potion regen ii
TFTreasure.tower_library.rare.add(new ItemStack(Items.potionitem, 1, 8229), 6); //potion health ii
TFTreasure.tower_library.rare.add(new ItemStack(Items.potionitem, 1, 8258), 6); //potion extended swiftness ii
TFTreasure.tower_library.common.add(GT_ModHandler.getModItem("Thaumcraft", "ItemResource", 2, 1), 12); // Nitor
TFTreasure.tower_library.common.add(new ItemStack(Items.potionitem, 1, 8201), 12); // potion strength i
TFTreasure.tower_library.common.add(
GT_ModHandler.getModItem("Thaumcraft", "ItemResource", 1, 0), 12); // Alumentum
TFTreasure.tower_library.common.add(
GT_ModHandler.getModItem("Thaumcraft", "ItemResource", 4, 14), 6); // Salis Mundus
TFTreasure.tower_library.uncommon.add(new ItemStack(Items.potionitem, 1, 8198), 12); // potion night vision i
TFTreasure.tower_library.uncommon.add(
GT_ModHandler.getModItem("Thaumcraft", "ItemResource", 2, 1), 12); // Nitor
TFTreasure.tower_library.uncommon.add(new ItemStack(Items.potionitem, 1, 8193), 6); // potion regen i
TFTreasure.tower_library.uncommon.add(new ItemStack(Items.potionitem, 1, 8197), 6); // potion health i
TFTreasure.tower_library.uncommon.add(new ItemStack(Items.potionitem, 1, 8194), 6); // potion swiftness i
TFTreasure.tower_library.uncommon.add(new ItemStack(Items.potionitem, 1, 8195), 6); // potion fire resistance i
TFTreasure.tower_library.uncommon.add(
GT_ModHandler.getModItem("Thaumcraft", "ItemResource", 1, 0), 12); // Alumentum
TFTreasure.tower_library.uncommon.add(
GT_ModHandler.getModItem("Thaumcraft", "ItemResource", 4, 14), 6); // Salis Mundus
TFTreasure.tower_library.uncommon.add(new ItemStack(Items.potionitem, 1, 8233), 12); // potion strength ii
TFTreasure.tower_library.uncommon.add(
GT_ModHandler.getModItem("DraconicEvolution", "dezilsMarshmallow", 1, 0), 12);
TFTreasure.tower_library.rare.add(new ItemStack(Items.potionitem, 1, 8257), 6); // potion regen ii
TFTreasure.tower_library.rare.add(new ItemStack(Items.potionitem, 1, 8229), 6); // potion health ii
TFTreasure.tower_library.rare.add(new ItemStack(Items.potionitem, 1, 8258), 6); // potion extended swiftness ii
TFTreasure.tower_library.rare.add(GT_ModHandler.getModItem("DraconicEvolution", "dezilsMarshmallow", 1, 0), 2);
TFTreasure.tower_library.rare.add(new ItemStack(Items.potionitem, 1, 8259), 6); //potion fire resistance iI
TFTreasure.tower_library.rare.add(new ItemStack(Items.potionitem, 1, 8259), 6); // potion fire resistance iI

//Litch Tower Boss Room
// Litch Tower Boss Room
TFTreasure.tower_room.common.add(GT_ModHandler.getModItem("DraconicEvolution", "dezilsMarshmallow", 1, 0), 12);
TFTreasure.tower_room.common.add(GT_ModHandler.getModItem("Thaumcraft", "ItemLootBag", 1, 0), 12);
//TFTreasure.tower_room.common.add(CustomItemList.LichBone.get(2),50);
//TFTreasure.tower_room.common.add(CustomItemList.LichBoneChip.get(8),75);
// TFTreasure.tower_room.common.add(CustomItemList.LichBone.get(2),50);
// TFTreasure.tower_room.common.add(CustomItemList.LichBoneChip.get(8),75);
TFTreasure.tower_room.uncommon.add(GT_ModHandler.getModItem("Thaumcraft", "ItemLootBag", 1, 1), 12);
TFTreasure.tower_room.uncommon.add(GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.NetherStar, 4L), 12);
TFTreasure.tower_room.uncommon.add(
GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.NetherStar, 4L), 12);
TFTreasure.tower_room.rare.add(GT_ModHandler.getModItem("Thaumcraft", "ItemLootBag", 1, 2), 6);
}
}
26 changes: 10 additions & 16 deletions src/main/java/com/dreammaster/auxiliary/NEIGTNewHorizonsConfig.java
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,16 @@
package com.dreammaster.auxiliary;

import codechicken.nei.api.API;
import codechicken.nei.api.IConfigureNEI;
import com.dreammaster.item.food.QuantumBread;
import com.dreammaster.lib.Refstrings;
import com.dreammaster.main.MainRegistry;

import codechicken.nei.api.API;
import codechicken.nei.api.IConfigureNEI;
import gregtech.api.util.GT_ModHandler;
import net.minecraft.item.ItemStack;

public class NEIGTNewHorizonsConfig implements IConfigureNEI
{
public class NEIGTNewHorizonsConfig implements IConfigureNEI {
@Override
public void loadConfig()
{
public void loadConfig() {
API.hideItem(new ItemStack(QuantumBread.Instance()));
API.hideItem(GT_ModHandler.getModItem("Aroma1997Core", "wrenched", 1));
API.hideItem(GT_ModHandler.getModItem("BiblioCraft", "BiblioClipboard", 1));
Expand Down Expand Up @@ -45,11 +42,11 @@ public void loadConfig()
API.hideItem(GT_ModHandler.getModItem("ThaumicTinkerer", "gaseousShadow", 1));
API.hideItem(GT_ModHandler.getModItem("ThaumicTinkerer", "infusedGrainBlock", 1));
API.hideItem(GT_ModHandler.getModItem("ThaumicTinkerer", "nitorGas", 1));
for(int i = 5; i <= 15; i++) {
API.hideItem(GT_ModHandler.getModItem("TwilightForest", "tile.TFBossSpawner", 1, i));
for (int i = 5; i <= 15; i++) {
API.hideItem(GT_ModHandler.getModItem("TwilightForest", "tile.TFBossSpawner", 1, i));
}
for(int i = 8; i <= 15; i++) {
API.hideItem(GT_ModHandler.getModItem("TwilightForest", "tile.TFTowerTranslucent", 1, i));
for (int i = 8; i <= 15; i++) {
API.hideItem(GT_ModHandler.getModItem("TwilightForest", "tile.TFTowerTranslucent", 1, i));
}
API.hideItem(GT_ModHandler.getModItem("TwilightForest", "tile.TFTrophy", 1));
API.hideItem(GT_ModHandler.getModItem("WarpTheory", "blockVanish", 1));
Expand All @@ -69,15 +66,12 @@ public void loadConfig()
}

@Override
public String getName()
{
public String getName() {
return "GTNewHorizons-NEIConfig";
}

@Override
public String getVersion()
{
public String getVersion() {
return Refstrings.VERSION;
}

}
Loading

0 comments on commit 8d1549a

Please sign in to comment.