Skip to content

Commit 7b66643

Browse files
jaredlll08jaredlll08
authored
Merge pull request #772 from democat3457/1.12
It's building!
2 parents bd641c0 + 7c5e9bc commit 7b66643

43 files changed

Lines changed: 38 additions & 122 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎build.gradle‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@ repositories {
4444
url "https://www.ryanliptak.com/maven/"
4545
}
4646
maven {
47-
url "https://maven.chaosfield.at/"
47+
url "https://maven.ellpeck.de/"
4848
}
4949
maven {
50-
url "http://maven.ic2.player.to/"
50+
url "http://maven2.ic2.player.to/"
5151
}
5252
maven {
5353
url "https://maven.tterrag.com"
@@ -56,49 +56,49 @@ repositories {
5656
url = "https://maven.thiakil.com"
5757
}
5858
maven {
59-
url "https://tehnut.info/maven/"
59+
url "https://maven.amadornes.com/"
6060
}
6161
maven {
62-
url "https://maven.amadornes.com/"
62+
url "https://www.cursemaven.com"
6363
}
6464
}
6565

6666
dependencies {
67-
deobfCompile "CraftTweaker2:CraftTweaker2-MC1120-Main:1.12-4.1.20.554"
68-
deobfCompile "mezz.jei:jei_1.12.2:4.14.4.264"
69-
deobfCompile "com.blamejared:MTLib:3.0.4.8"
67+
deobfCompile "CraftTweaker2:CraftTweaker2-MC1120-Main:1.12-4.1.20.613"
68+
deobfCompile "mezz.jei:jei_1.12.2:4.16.1.302"
69+
deobfCompile "com.blamejared:MTLib:3.0.5.15"
7070
deobfCompile "com.azanor.baubles:Baubles:1.12-1.5.2"
71-
deobfCompile "vazkii.botania:Botania:r1.10-357.7"
71+
deobfCompile "vazkii.botania:Botania:r1.10-363.148"
7272

7373

74-
deobfCompile("cofh:ThermalExpansion:1.12.2-5.5.3.41:universal") {
74+
deobfCompile("cofh:ThermalExpansion:1.12.2-5.5.4.43:universal") {
7575
exclude group: 'mezz.jei'
7676
}
77-
deobfCompile("cofh:ThermalFoundation:1.12.2-2.6.2.25:universal") {
77+
deobfCompile("cofh:ThermalFoundation:1.12.2-2.6.3.27:universal") {
7878
exclude group: 'mezz.jei'
7979
}
8080

81-
deobfCompile("cofh:CoFHCore:1.12.2-4.6.2.24:universal") {
81+
deobfCompile("cofh:CoFHCore:1.12.2-4.6.3.27:universal") {
8282
exclude group: 'mezz.jei'
8383
}
8484

85-
deobfCompile("cofh:RedstoneFlux:1.12-2.1.0.6:universal") {
85+
deobfCompile("cofh:RedstoneFlux:1.12-2.1.0.7:universal") {
8686
exclude group: 'mezz.jei'
8787
}
8888

89-
deobfCompile("cofh:CoFHWorld:1.12.2-1.3.0.6:universal") {
89+
deobfCompile("cofh:CoFHWorld:1.12.2-1.3.1.7:universal") {
9090
exclude group: 'mezz.jei'
9191
}
9292

9393

94-
deobfCompile("codechicken:CodeChickenLib:1.12.2-3.2.2.353:universal") {
94+
deobfCompile("codechicken:CodeChickenLib:1.12.2-3.2.3.358:universal") {
9595
exclude group: 'mezz.jei'
9696
}
9797

98-
deobfCompile("betterwithmods:BetterWithMods:1.12-2.3.15-995") {
98+
deobfCompile("betterwithmods:BetterWithMods:1.12-2.3.23-4") {
9999
exclude group: 'mezz.jei'
100100
}
101-
deobfCompile("de.ellpeck.actuallyadditions:ActuallyAdditions:1.12.2-r142") {
101+
deobfCompile("de.ellpeck.actuallyadditions:ActuallyAdditions:1.12.2-r152.16") {
102102
exclude group: 'mezz.jei'
103103
}
104104
deobfCompile("slimeknights.mantle:Mantle:1.12-1.3.3.+") {
@@ -110,17 +110,17 @@ dependencies {
110110
deobfCompile('net.sengir.forestry:forestry_1.12.2:5.+') {
111111
exclude group: 'mezz.jei'
112112
}
113-
deobfCompile "team.chisel.ctm:CTM:MC1.12.2-0.3.2.20"
113+
deobfCompile "team.chisel.ctm:CTM:MC1.12.2-1.0.2.31"
114114
deobfCompile("knightminer.tcomplement:TinkersComplement:1.12.2-0.4.2.39") {
115115
exclude group: 'mezz.jei'
116116
}
117-
deobfCompile "team.chisel:Chisel:MC1.12.2-0.2.0.31"
118-
deobfCompile "com.wayoftime.bloodmagic:BloodMagic:1.12.2-2.3.3-101"
119-
deobfCompile "info.amerifrance.guideapi:Guide-API:1.12-2.1.7-62"
120-
deobfCompile("knightminer:Inspirations:1.12.2-0.2.4.70") {
117+
deobfCompile "team.chisel:Chisel:MC1.12.2-1.0.2.45"
118+
deobfCompile "curse.maven:bloodmagic-224791:2610083"
119+
deobfCompile "curse.maven:guideapi-228832:2645993"
120+
deobfCompile("knightminer:Inspirations:1.12.2-0.2.9.9") {
121121
exclude group: 'mezz.jei'
122122
}
123-
deobfCompile "blusunrize:ImmersiveEngineering:0.12-89-518"
123+
deobfCompile "blusunrize:ImmersiveEngineering:0.12-92-559"
124124
}
125125

126126
processResources {

‎src/main/java/com/blamejared/compat/actuallyaddition/Compost.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
@ZenRegister
2626
public class Compost {
2727

28+
@SuppressWarnings("deprecation")
2829
@ZenMethod
2930
public static void addRecipe(IItemStack output, IItemStack outputDisplay, IIngredient input, IItemStack inputDisplay) {
3031
if(!InputHelper.isABlock(outputDisplay) || !InputHelper.isABlock(inputDisplay)) {

‎src/main/java/com/blamejared/compat/betterwithmods/Anvil.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ public static Object[] toShapedAnvilObjects(IIngredient[][] ingredients) {
9999
if(ingredients == null)
100100
return null;
101101
else {
102-
ArrayList prep = new ArrayList();
102+
ArrayList<Object> prep = new ArrayList<>();
103103
char chr = 'a';
104104
for(int y = 0; y < 4; y++) {
105105
StringBuilder matrix = new StringBuilder();

‎src/main/java/com/blamejared/compat/betterwithmods/Bellows.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.blamejared.compat.betterwithmods;
22

33
import betterwithmods.common.registry.BellowsManager;
4-
import betterwithmods.module.hardcore.world.HCBuoy;
54
import betterwithmods.util.item.Stack;
65
import betterwithmods.util.item.StackMap;
76
import com.blamejared.ModTweaker;

‎src/main/java/com/blamejared/compat/betterwithmods/Cauldron.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22

33

44
import betterwithmods.common.BWRegistry;
5-
import betterwithmods.common.registry.bulk.manager.CraftingManagerBulk;
6-
import betterwithmods.common.registry.bulk.recipes.CookingPotRecipe;
75
import com.blamejared.compat.betterwithmods.base.bulkrecipes.CookingPotBuilder;
86
import crafttweaker.annotations.ModOnly;
97
import crafttweaker.annotations.ZenRegister;
@@ -13,8 +11,6 @@
1311
import stanhebben.zenscript.annotations.ZenClass;
1412
import stanhebben.zenscript.annotations.ZenMethod;
1513

16-
import java.util.function.Supplier;
17-
1814
@ZenClass("mods.betterwithmods.Cauldron")
1915
@ModOnly("betterwithmods")
2016
@ZenRegister

‎src/main/java/com/blamejared/compat/betterwithmods/Crucible.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22

33

44
import betterwithmods.common.BWRegistry;
5-
import betterwithmods.common.registry.bulk.manager.CraftingManagerBulk;
6-
import betterwithmods.common.registry.bulk.recipes.CookingPotRecipe;
75
import com.blamejared.compat.betterwithmods.base.bulkrecipes.CookingPotBuilder;
86
import crafttweaker.annotations.ModOnly;
97
import crafttweaker.annotations.ZenRegister;
@@ -13,8 +11,6 @@
1311
import stanhebben.zenscript.annotations.ZenClass;
1412
import stanhebben.zenscript.annotations.ZenMethod;
1513

16-
import java.util.function.Supplier;
17-
1814
@ZenClass("mods.betterwithmods.Crucible")
1915
@ModOnly("betterwithmods")
2016
@ZenRegister

‎src/main/java/com/blamejared/compat/betterwithmods/HeatRegistry.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ public static void addHeatSource(crafttweaker.api.block.IBlockState state, int h
2626
CraftTweakerAPI.apply(new AddHeatSource(CraftTweakerMC.getBlockState(state), heat));
2727
}
2828

29+
@SuppressWarnings("deprecation")
2930
@ZenMethod
3031
public static void addHeatSource(IItemStack stack, int heat) {
3132
if (InputHelper.isABlock(stack)) {

‎src/main/java/com/blamejared/compat/betterwithmods/Hopper.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import betterwithmods.common.BWRegistry;
55
import betterwithmods.common.registry.HopperFilter;
66
import betterwithmods.common.registry.HopperInteractions;
7-
import betterwithmods.module.gameplay.HopperRecipes;
87
import com.blamejared.ModTweaker;
98
import com.blamejared.mtlib.helpers.LogHelper;
109
import com.blamejared.mtlib.utils.BaseAction;

‎src/main/java/com/blamejared/compat/betterwithmods/Kiln.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,9 @@
33
import betterwithmods.common.BWMRecipes;
44
import betterwithmods.common.BWRegistry;
55
import betterwithmods.common.registry.KilnStructureManager;
6-
import betterwithmods.common.registry.block.managers.CraftingManagerBlock;
7-
import betterwithmods.common.registry.block.recipe.KilnRecipe;
86
import com.blamejared.ModTweaker;
97
import com.blamejared.compat.betterwithmods.base.blockrecipes.KilnBuilder;
108
import com.blamejared.mtlib.helpers.InputHelper;
11-
import com.blamejared.mtlib.helpers.LogHelper;
129
import com.blamejared.mtlib.utils.BaseAction;
1310
import crafttweaker.annotations.ModOnly;
1411
import crafttweaker.annotations.ZenRegister;
@@ -20,7 +17,6 @@
2017
import stanhebben.zenscript.annotations.ZenMethod;
2118

2219
import javax.annotation.Nonnull;
23-
import java.util.function.Supplier;
2420

2521
@ZenClass("mods.betterwithmods.Kiln")
2622
@ModOnly("betterwithmods")

‎src/main/java/com/blamejared/compat/betterwithmods/Mill.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22

33

44
import betterwithmods.common.BWRegistry;
5-
import betterwithmods.common.registry.bulk.manager.CraftingManagerBulk;
6-
import betterwithmods.common.registry.bulk.recipes.MillRecipe;
75
import com.blamejared.compat.betterwithmods.base.bulkrecipes.MillBuilder;
86
import crafttweaker.annotations.ModOnly;
97
import crafttweaker.annotations.ZenRegister;
@@ -13,8 +11,6 @@
1311
import stanhebben.zenscript.annotations.ZenClass;
1412
import stanhebben.zenscript.annotations.ZenMethod;
1513

16-
import java.util.function.Supplier;
17-
1814
@ZenClass("mods.betterwithmods.Mill")
1915
@ModOnly("betterwithmods")
2016
@ZenRegister

0 commit comments

Comments
 (0)