Anvilcraft/ModTweaker
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #772 from democat3457/1.12

Browse source 
It's building!
This commit is contained in:
Jared 2021-01-16 23:37:35 +02:00 committed by GitHub
commit 7b66643302
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
43 changed files with 38 additions and 122 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
build.gradle
View file

@ -44,10 +44,10 @@ repositories {
url "https://www.ryanliptak.com/maven/"
}
maven {
url "https://maven.chaosfield.at/"
url "https://maven.ellpeck.de/"
}
maven {
url "http://maven.ic2.player.to/"
url "http://maven2.ic2.player.to/"
}
maven {
url "https://maven.tterrag.com"
@ -56,49 +56,49 @@ repositories {
url = "https://maven.thiakil.com"
}
maven {
url "https://tehnut.info/maven/"
url "https://maven.amadornes.com/"
}
maven {
url "https://maven.amadornes.com/"
url "https://www.cursemaven.com"
}
}
dependencies {
deobfCompile "CraftTweaker2:CraftTweaker2-MC1120-Main:1.12-4.1.20.554"
deobfCompile "mezz.jei:jei_1.12.2:4.14.4.264"
deobfCompile "com.blamejared:MTLib:3.0.4.8"
deobfCompile "CraftTweaker2:CraftTweaker2-MC1120-Main:1.12-4.1.20.613"
deobfCompile "mezz.jei:jei_1.12.2:4.16.1.302"
deobfCompile "com.blamejared:MTLib:3.0.5.15"
deobfCompile "com.azanor.baubles:Baubles:1.12-1.5.2"
deobfCompile "vazkii.botania:Botania:r1.10-357.7"
deobfCompile "vazkii.botania:Botania:r1.10-363.148"
deobfCompile("cofh:ThermalExpansion:1.12.2-5.5.3.41:universal") {
deobfCompile("cofh:ThermalExpansion:1.12.2-5.5.4.43:universal") {
exclude group: 'mezz.jei'
}
deobfCompile("cofh:ThermalFoundation:1.12.2-2.6.2.25:universal") {
deobfCompile("cofh:ThermalFoundation:1.12.2-2.6.3.27:universal") {
exclude group: 'mezz.jei'
}
deobfCompile("cofh:CoFHCore:1.12.2-4.6.2.24:universal") {
deobfCompile("cofh:CoFHCore:1.12.2-4.6.3.27:universal") {
exclude group: 'mezz.jei'
}
deobfCompile("cofh:RedstoneFlux:1.12-2.1.0.6:universal") {
deobfCompile("cofh:RedstoneFlux:1.12-2.1.0.7:universal") {
exclude group: 'mezz.jei'
}
deobfCompile("cofh:CoFHWorld:1.12.2-1.3.0.6:universal") {
deobfCompile("cofh:CoFHWorld:1.12.2-1.3.1.7:universal") {
exclude group: 'mezz.jei'
}
deobfCompile("codechicken:CodeChickenLib:1.12.2-3.2.2.353:universal") {
deobfCompile("codechicken:CodeChickenLib:1.12.2-3.2.3.358:universal") {
exclude group: 'mezz.jei'
}
deobfCompile("betterwithmods:BetterWithMods:1.12-2.3.15-995") {
deobfCompile("betterwithmods:BetterWithMods:1.12-2.3.23-4") {
exclude group: 'mezz.jei'
}
deobfCompile("de.ellpeck.actuallyadditions:ActuallyAdditions:1.12.2-r142") {
deobfCompile("de.ellpeck.actuallyadditions:ActuallyAdditions:1.12.2-r152.16") {
exclude group: 'mezz.jei'
}
deobfCompile("slimeknights.mantle:Mantle:1.12-1.3.3.+") {
@ -110,17 +110,17 @@ dependencies {
deobfCompile('net.sengir.forestry:forestry_1.12.2:5.+') {
exclude group: 'mezz.jei'
}
deobfCompile "team.chisel.ctm:CTM:MC1.12.2-0.3.2.20"
deobfCompile "team.chisel.ctm:CTM:MC1.12.2-1.0.2.31"
deobfCompile("knightminer.tcomplement:TinkersComplement:1.12.2-0.4.2.39") {
exclude group: 'mezz.jei'
}
deobfCompile "team.chisel:Chisel:MC1.12.2-0.2.0.31"
deobfCompile "com.wayoftime.bloodmagic:BloodMagic:1.12.2-2.3.3-101"
deobfCompile "info.amerifrance.guideapi:Guide-API:1.12-2.1.7-62"
deobfCompile("knightminer:Inspirations:1.12.2-0.2.4.70") {
deobfCompile "team.chisel:Chisel:MC1.12.2-1.0.2.45"
deobfCompile "curse.maven:bloodmagic-224791:2610083"
deobfCompile "curse.maven:guideapi-228832:2645993"
deobfCompile("knightminer:Inspirations:1.12.2-0.2.9.9") {
exclude group: 'mezz.jei'
}
deobfCompile "blusunrize:ImmersiveEngineering:0.12-89-518"
deobfCompile "blusunrize:ImmersiveEngineering:0.12-92-559"
}
processResources {

1
src/main/java/com/blamejared/compat/actuallyaddition/Compost.java
View file

@ -25,6 +25,7 @@ import java.util.List;
@ZenRegister
public class Compost {
@SuppressWarnings("deprecation")
@ZenMethod
public static void addRecipe(IItemStack output, IItemStack outputDisplay, IIngredient input, IItemStack inputDisplay) {
if(!InputHelper.isABlock(outputDisplay) || !InputHelper.isABlock(inputDisplay)) {

2
src/main/java/com/blamejared/compat/betterwithmods/Anvil.java
View file

@ -99,7 +99,7 @@ public class Anvil {
if(ingredients == null)
return null;
else {
ArrayList prep = new ArrayList();
ArrayList<Object> prep = new ArrayList<>();
char chr = 'a';
for(int y = 0; y < 4; y++) {
StringBuilder matrix = new StringBuilder();

1
src/main/java/com/blamejared/compat/betterwithmods/Bellows.java
View file

@ -1,7 +1,6 @@
package com.blamejared.compat.betterwithmods;
import betterwithmods.common.registry.BellowsManager;
import betterwithmods.module.hardcore.world.HCBuoy;
import betterwithmods.util.item.Stack;
import betterwithmods.util.item.StackMap;
import com.blamejared.ModTweaker;

4
src/main/java/com/blamejared/compat/betterwithmods/Cauldron.java
View file

@ -2,8 +2,6 @@ package com.blamejared.compat.betterwithmods;
import betterwithmods.common.BWRegistry;
import betterwithmods.common.registry.bulk.manager.CraftingManagerBulk;
import betterwithmods.common.registry.bulk.recipes.CookingPotRecipe;
import com.blamejared.compat.betterwithmods.base.bulkrecipes.CookingPotBuilder;
import crafttweaker.annotations.ModOnly;
import crafttweaker.annotations.ZenRegister;
@ -13,8 +11,6 @@ import stanhebben.zenscript.annotations.NotNull;
import stanhebben.zenscript.annotations.ZenClass;
import stanhebben.zenscript.annotations.ZenMethod;
import java.util.function.Supplier;
@ZenClass("mods.betterwithmods.Cauldron")
@ModOnly("betterwithmods")
@ZenRegister

4
src/main/java/com/blamejared/compat/betterwithmods/Crucible.java
View file

@ -2,8 +2,6 @@ package com.blamejared.compat.betterwithmods;
import betterwithmods.common.BWRegistry;
import betterwithmods.common.registry.bulk.manager.CraftingManagerBulk;
import betterwithmods.common.registry.bulk.recipes.CookingPotRecipe;
import com.blamejared.compat.betterwithmods.base.bulkrecipes.CookingPotBuilder;
import crafttweaker.annotations.ModOnly;
import crafttweaker.annotations.ZenRegister;
@ -13,8 +11,6 @@ import stanhebben.zenscript.annotations.NotNull;
import stanhebben.zenscript.annotations.ZenClass;
import stanhebben.zenscript.annotations.ZenMethod;
import java.util.function.Supplier;
@ZenClass("mods.betterwithmods.Crucible")
@ModOnly("betterwithmods")
@ZenRegister

1
src/main/java/com/blamejared/compat/betterwithmods/HeatRegistry.java
View file

@ -26,6 +26,7 @@ public class HeatRegistry {
CraftTweakerAPI.apply(new AddHeatSource(CraftTweakerMC.getBlockState(state), heat));
}
@SuppressWarnings("deprecation")
@ZenMethod
public static void addHeatSource(IItemStack stack, int heat) {
if (InputHelper.isABlock(stack)) {

1
src/main/java/com/blamejared/compat/betterwithmods/Hopper.java
View file

@ -4,7 +4,6 @@ import betterwithmods.api.tile.IHopperFilter;
import betterwithmods.common.BWRegistry;
import betterwithmods.common.registry.HopperFilter;
import betterwithmods.common.registry.HopperInteractions;
import betterwithmods.module.gameplay.HopperRecipes;
import com.blamejared.ModTweaker;
import com.blamejared.mtlib.helpers.LogHelper;
import com.blamejared.mtlib.utils.BaseAction;

4
src/main/java/com/blamejared/compat/betterwithmods/Kiln.java
View file

@ -3,12 +3,9 @@ package com.blamejared.compat.betterwithmods;
import betterwithmods.common.BWMRecipes;
import betterwithmods.common.BWRegistry;
import betterwithmods.common.registry.KilnStructureManager;
import betterwithmods.common.registry.block.managers.CraftingManagerBlock;
import betterwithmods.common.registry.block.recipe.KilnRecipe;
import com.blamejared.ModTweaker;
import com.blamejared.compat.betterwithmods.base.blockrecipes.KilnBuilder;
import com.blamejared.mtlib.helpers.InputHelper;
import com.blamejared.mtlib.helpers.LogHelper;
import com.blamejared.mtlib.utils.BaseAction;
import crafttweaker.annotations.ModOnly;
import crafttweaker.annotations.ZenRegister;
@ -20,7 +17,6 @@ import stanhebben.zenscript.annotations.ZenClass;
import stanhebben.zenscript.annotations.ZenMethod;
import javax.annotation.Nonnull;
import java.util.function.Supplier;
@ZenClass("mods.betterwithmods.Kiln")
@ModOnly("betterwithmods")

4
src/main/java/com/blamejared/compat/betterwithmods/Mill.java
View file

@ -2,8 +2,6 @@ package com.blamejared.compat.betterwithmods;
import betterwithmods.common.BWRegistry;
import betterwithmods.common.registry.bulk.manager.CraftingManagerBulk;
import betterwithmods.common.registry.bulk.recipes.MillRecipe;
import com.blamejared.compat.betterwithmods.base.bulkrecipes.MillBuilder;
import crafttweaker.annotations.ModOnly;
import crafttweaker.annotations.ZenRegister;
@ -13,8 +11,6 @@ import stanhebben.zenscript.annotations.NotNull;
import stanhebben.zenscript.annotations.ZenClass;
import stanhebben.zenscript.annotations.ZenMethod;
import java.util.function.Supplier;
@ZenClass("mods.betterwithmods.Mill")
@ModOnly("betterwithmods")
@ZenRegister

5
src/main/java/com/blamejared/compat/betterwithmods/Misc.java
View file

@ -1,17 +1,12 @@
package com.blamejared.compat.betterwithmods;
import betterwithmods.common.registry.BellowsManager;
import betterwithmods.module.hardcore.crafting.HCFurnace;
import betterwithmods.util.item.Stack;
import betterwithmods.util.item.StackMap;
import com.blamejared.ModTweaker;
import com.blamejared.mtlib.utils.BaseMapAddition;
import com.google.common.collect.Maps;
import crafttweaker.annotations.ModOnly;
import crafttweaker.annotations.ZenRegister;
import crafttweaker.api.item.IIngredient;
import crafttweaker.api.minecraft.CraftTweakerMC;
import crafttweaker.mc1120.CraftTweaker;
import net.minecraft.item.crafting.Ingredient;
import stanhebben.zenscript.annotations.ZenClass;
import stanhebben.zenscript.annotations.ZenMethod;

1
src/main/java/com/blamejared/compat/betterwithmods/Movement.java
View file

@ -19,6 +19,7 @@ import stanhebben.zenscript.annotations.ZenMethod;
@ZenRegister
public class Movement {
@SuppressWarnings("deprecation")
@ZenMethod
public static void set(IItemStack input, float speed) {
ItemStack stack = InputHelper.toStack(input);

1
src/main/java/com/blamejared/compat/betterwithmods/Saw.java
View file

@ -3,7 +3,6 @@ package com.blamejared.compat.betterwithmods;
import betterwithmods.common.BWRegistry;
import com.blamejared.compat.betterwithmods.base.blockrecipes.SawBuilder;
import com.blamejared.mtlib.helpers.LogHelper;
import crafttweaker.annotations.ModOnly;
import crafttweaker.annotations.ZenRegister;
import crafttweaker.api.item.IIngredient;

1
src/main/java/com/blamejared/compat/betterwithmods/Turntable.java
View file

@ -3,7 +3,6 @@ package com.blamejared.compat.betterwithmods;
import betterwithmods.common.BWMRecipes;
import betterwithmods.common.BWRegistry;
import com.blamejared.compat.betterwithmods.base.blockrecipes.TurntableBuilder;
import com.blamejared.mtlib.helpers.LogHelper;
import crafttweaker.annotations.ModOnly;
import crafttweaker.annotations.ZenRegister;
import crafttweaker.api.item.IIngredient;

5
src/main/java/com/blamejared/compat/betterwithmods/base/blockrecipes/BlockRecipeBuilder.java
View file

@ -7,7 +7,6 @@ import betterwithmods.common.registry.block.recipe.BlockRecipe;
import com.blamejared.ModTweaker;
import com.blamejared.compat.betterwithmods.base.RemoveAll;
import com.blamejared.mtlib.helpers.InputHelper;
import com.blamejared.mtlib.helpers.LogHelper;
import crafttweaker.api.item.IIngredient;
import crafttweaker.api.item.IItemStack;
import crafttweaker.api.minecraft.CraftTweakerMC;
@ -49,13 +48,13 @@ public abstract class BlockRecipeBuilder<T extends BlockRecipe> {
}
@ZenMethod
public BlockRecipeBuilder setInputBlockDrop(IItemStack input) {
public BlockRecipeBuilder<? extends BlockRecipe> setInputBlockDrop(IItemStack input) {
this.input = new BlockDropIngredient(CraftTweakerMC.getItemStack(input));
return this;
}
@ZenMethod
public BlockRecipeBuilder setInputBlockDrop(IItemStack[] inputs) {
public BlockRecipeBuilder<? extends BlockRecipe> setInputBlockDrop(IItemStack[] inputs) {
this.input = new BlockDropIngredient(CraftTweakerMC.getItemStacks(inputs));
return this;
}

4
src/main/java/com/blamejared/compat/betterwithmods/base/blockrecipes/BlockRecipeRemoveInput.java
View file

@ -5,13 +5,9 @@ import betterwithmods.common.registry.block.recipe.BlockRecipe;
import com.blamejared.mtlib.helpers.InputHelper;
import com.blamejared.mtlib.helpers.LogHelper;
import com.blamejared.mtlib.utils.BaseAction;
import com.google.common.collect.Lists;
import crafttweaker.api.item.IItemStack;
import net.minecraft.item.ItemStack;
import java.util.List;
import java.util.stream.Collectors;
public class BlockRecipeRemoveInput<T extends BlockRecipe> extends BaseAction {
private final ItemStack input;

5
src/main/java/com/blamejared/compat/betterwithmods/base/blockrecipes/TurntableBuilder.java
View file

@ -1,9 +1,7 @@
package com.blamejared.compat.betterwithmods.base.blockrecipes;
import betterwithmods.common.BWMRecipes;
import betterwithmods.common.BWRegistry;
import betterwithmods.common.registry.block.managers.CraftingManagerBlock;
import betterwithmods.common.registry.block.recipe.BlockRecipe;
import betterwithmods.common.registry.block.recipe.TurntableRecipe;
import com.blamejared.ModTweaker;
import com.blamejared.mtlib.helpers.InputHelper;
@ -13,10 +11,8 @@ import crafttweaker.api.item.IIngredient;
import crafttweaker.api.item.IItemStack;
import crafttweaker.api.minecraft.CraftTweakerMC;
import net.minecraft.block.Block;
import net.minecraft.block.state.BlockStateContainer;
import net.minecraft.block.state.IBlockState;
import net.minecraft.init.Blocks;
import net.minecraft.item.ItemStack;
import stanhebben.zenscript.annotations.ZenMethod;
import java.util.function.Supplier;
@ -35,6 +31,7 @@ public class TurntableBuilder extends BlockRecipeBuilder<TurntableRecipe> {
return this;
}
@SuppressWarnings("deprecation")
@ZenMethod
public TurntableBuilder setProductState(IItemStack productState) {
if (InputHelper.isABlock(productState)) {

2
src/main/java/com/blamejared/compat/betterwithmods/base/bulkrecipes/MillBuilder.java
View file

@ -4,8 +4,6 @@ import betterwithmods.common.registry.bulk.manager.CraftingManagerBulk;
import betterwithmods.common.registry.bulk.recipes.MillRecipe;
import crafttweaker.api.item.IIngredient;
import crafttweaker.api.item.IItemStack;
import net.minecraft.util.SoundEvent;
import net.minecraftforge.fml.common.registry.ForgeRegistries;
import stanhebben.zenscript.annotations.ZenMethod;
import java.util.function.Supplier;

2
src/main/java/com/blamejared/compat/botania/LocalizationHelper.java
View file

@ -7,7 +7,7 @@ import java.util.Map;
public class LocalizationHelper {
@SuppressWarnings("unchecked")
public static void setLocale(String unlocalized, String localized) {
try {
Field locale = I18n.class.getDeclaredField("i18nLocale");

1
src/main/java/com/blamejared/compat/botania/handlers/Orechid.java
View file

@ -1,7 +1,6 @@
package com.blamejared.compat.botania.handlers;
import com.blamejared.ModTweaker;
import crafttweaker.CraftTweakerAPI;
import crafttweaker.IAction;
import crafttweaker.annotations.ModOnly;
import crafttweaker.annotations.ZenRegister;

3
src/main/java/com/blamejared/compat/botania/handlers/PureDaisy.java
View file

@ -19,8 +19,6 @@ import crafttweaker.api.item.IItemStack;
import crafttweaker.api.liquid.ILiquidStack;
import net.minecraft.block.Block;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.FluidStack;
import stanhebben.zenscript.annotations.Optional;
import stanhebben.zenscript.annotations.ZenClass;
import stanhebben.zenscript.annotations.ZenMethod;
import vazkii.botania.api.BotaniaAPI;
@ -39,6 +37,7 @@ public class PureDaisy {
addRecipe(blockInput, blockOutput, 150);
}
@SuppressWarnings("deprecation")
@ZenMethod
public static void addRecipe(IIngredient blockInput, IItemStack blockOutput, int time) {
if(blockInput == null || blockOutput == null) {

7
src/main/java/com/blamejared/compat/botania/lexicon/RemoveRecipeMapping.java
View file

@ -6,16 +6,12 @@ import crafttweaker.CraftTweakerAPI;
import crafttweaker.IAction;
import crafttweaker.api.item.IItemStack;
import net.minecraft.item.ItemStack;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.api.lexicon.LexiconRecipeMappings;
import vazkii.botania.api.lexicon.LexiconRecipeMappings.EntryData;
public class RemoveRecipeMapping implements IAction {
private ItemStack stack;
private IItemStack iStack;
private LexiconEntry entry;
private int page;
public RemoveRecipeMapping(IItemStack stack) {
this.iStack = stack;
@ -27,9 +23,6 @@ public class RemoveRecipeMapping implements IAction {
CraftTweakerAPI.getLogger().logError("There isn't a recipe mapping for " + iStack);
return;
}
EntryData data = LexiconRecipeMappings.getDataForStack(stack);
this.entry = data.entry;
this.page = data.page;
LexiconRecipeMappings.remove(stack);
CraftTweakerAPI.getLogger().logInfo("Removing Lexicon Recipe Lookup: " + stack.getUnlocalizedName());
}

2
src/main/java/com/blamejared/compat/botania/lexicon/SetCategoryIcon.java
View file

@ -10,7 +10,6 @@ import vazkii.botania.api.lexicon.LexiconCategory;
public class SetCategoryIcon implements IAction {
private LexiconCategory category;
private ResourceLocation oldIcon;
private ResourceLocation newIcon;
private final String name;
@ -26,7 +25,6 @@ public class SetCategoryIcon implements IAction {
CraftTweakerAPI.getLogger().logError("Cannot find lexicon category " + name);
return;
}
oldIcon = category.getIcon();
category.setIcon(newIcon);
CraftTweakerAPI.getLogger().logInfo("Setting Lexicon Category icon: " + category.getUnlocalizedName());
}

5
src/main/java/com/blamejared/compat/botania/lexicon/SetCategoryPriority.java
View file

@ -4,7 +4,6 @@ import com.blamejared.compat.botania.BotaniaHelper;
import crafttweaker.CraftTweakerAPI;
import crafttweaker.IAction;
import crafttweaker.mc1120.brackets.BracketHandlerItem;
import vazkii.botania.api.lexicon.LexiconCategory;
public class SetCategoryPriority implements IAction {
@ -28,12 +27,12 @@ public class SetCategoryPriority implements IAction {
}
oldPriority = category.getSortingPriority();
category.setPriority(newPriority);
CraftTweakerAPI.getLogger().logInfo("Setting Lexicon Category priority: " + category.getUnlocalizedName());
CraftTweakerAPI.getLogger().logInfo("Setting Lexicon Category priority from " + oldPriority + " to: " + category.getUnlocalizedName());
}
@Override
public String describe() {
return "Attempting to set the priority for Lexicon Category " + name + " to " + newPriority;
return "Attempting to set the priority for Lexicon Category " + name + " from " + oldPriority + "to " + newPriority;
}
}

5
src/main/java/com/blamejared/compat/botania/lexicon/pages/AddPageCrafting.java
View file

@ -2,17 +2,12 @@ package com.blamejared.compat.botania.lexicon.pages;
import com.blamejared.compat.botania.BotaniaHelper;
import crafttweaker.*;
import crafttweaker.api.item.IIngredient;
import net.minecraft.util.ResourceLocation;
import vazkii.botania.api.BotaniaAPI;
import vazkii.botania.api.lexicon.*;
import vazkii.botania.api.recipe.RecipeBrew;
import vazkii.botania.common.lexicon.page.*;
import java.util.*;
import static com.blamejared.mtlib.helpers.InputHelper.toObjects;
public class AddPageCrafting implements IAction {
private String name;

1
src/main/java/com/blamejared/compat/botania/lexicon/pages/AddPageElven.java
View file

@ -3,7 +3,6 @@ package com.blamejared.compat.botania.lexicon.pages;
import com.blamejared.compat.botania.BotaniaHelper;
import crafttweaker.*;
import crafttweaker.api.item.*;
import vazkii.botania.api.BotaniaAPI;
import vazkii.botania.api.lexicon.*;
import vazkii.botania.api.recipe.*;
import vazkii.botania.common.lexicon.page.*;

6
src/main/java/com/blamejared/compat/botania/lexicon/pages/AddPageEntity.java
View file

@ -2,17 +2,11 @@ package com.blamejared.compat.botania.lexicon.pages;
import com.blamejared.compat.botania.BotaniaHelper;
import crafttweaker.*;
import crafttweaker.api.item.*;
import net.minecraft.entity.EntityList;
import net.minecraft.util.ResourceLocation;
import vazkii.botania.api.lexicon.*;
import vazkii.botania.api.recipe.RecipeElvenTrade;
import vazkii.botania.common.lexicon.page.*;
import java.util.*;
import static com.blamejared.mtlib.helpers.InputHelper.*;
public class AddPageEntity implements IAction {
private String name;

2
src/main/java/com/blamejared/compat/botania/lexicon/pages/AddPageImage.java
View file

@ -2,8 +2,6 @@ package com.blamejared.compat.botania.lexicon.pages;
import com.blamejared.compat.botania.BotaniaHelper;
import crafttweaker.*;
import net.minecraft.entity.EntityList;
import net.minecraft.util.ResourceLocation;
import vazkii.botania.api.lexicon.*;
import vazkii.botania.common.lexicon.page.*;

6
src/main/java/com/blamejared/compat/botania/lexicon/pages/AddPageText.java
View file

@ -2,15 +2,9 @@ package com.blamejared.compat.botania.lexicon.pages;
import com.blamejared.compat.botania.BotaniaHelper;
import crafttweaker.*;
import crafttweaker.api.item.*;
import vazkii.botania.api.lexicon.*;
import vazkii.botania.api.recipe.RecipeManaInfusion;
import vazkii.botania.common.lexicon.page.*;
import java.util.*;
import static com.blamejared.mtlib.helpers.InputHelper.*;
public class AddPageText implements IAction {
private String name;

3
src/main/java/com/blamejared/compat/chisel/Chisel.java
View file

@ -4,9 +4,6 @@ import crafttweaker.CraftTweakerAPI;
import crafttweaker.mc1120.commands.*;
import net.minecraft.command.ICommandSender;
import net.minecraft.server.MinecraftServer;
import net.minecraft.util.text.TextFormatting;
import slimeknights.tconstruct.library.TinkerRegistry;
import slimeknights.tconstruct.library.materials.*;
import team.chisel.api.carving.CarvingUtils;
import static crafttweaker.mc1120.commands.SpecialMessagesChat.*;

1
src/main/java/com/blamejared/compat/forestry/Carpenter.java
View file

@ -46,6 +46,7 @@ public class Carpenter {
ModTweaker.LATE_ADDITIONS.add(new Add(new CarpenterRecipe(packagingTime, toFluid(fluidInput), toStack(box), new ShapedRecipeCustom(toStack(output), toShapedObjects(ingredients)))));
}
@SuppressWarnings("unused")
private static IItemStack[][] transform(IItemStack[] arr, int N) {
int M = (arr.length + N - 1) / N;
IItemStack[][] mat = new IItemStack[M][];

4
src/main/java/com/blamejared/compat/forestry/Fermenter.java
View file

@ -17,11 +17,7 @@ import forestry.api.fuels.FuelManager;
import forestry.api.recipes.IFermenterRecipe;
import forestry.api.recipes.RecipeManagers;
import forestry.factory.recipes.FermenterRecipe;
import net.minecraft.init.Blocks;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;
import stanhebben.zenscript.annotations.ZenClass;
import stanhebben.zenscript.annotations.ZenMethod;

5
src/main/java/com/blamejared/compat/forestry/Squeezer.java
View file

@ -10,19 +10,14 @@ import crafttweaker.api.item.IIngredient;
import crafttweaker.api.item.IItemStack;
import crafttweaker.api.item.WeightedItemStack;
import crafttweaker.api.liquid.ILiquidStack;
import crafttweaker.mc1120.item.MCItemStack;
import crafttweaker.mc1120.liquid.MCLiquidStack;
import forestry.api.recipes.ISqueezerRecipe;
import forestry.api.recipes.RecipeManagers;
import forestry.core.fluids.FluidHelper;
import forestry.factory.recipes.*;
import net.minecraft.item.ItemStack;
import stanhebben.zenscript.annotations.Optional;
import stanhebben.zenscript.annotations.ZenClass;
import stanhebben.zenscript.annotations.ZenMethod;
import java.util.*;
import static com.blamejared.mtlib.helpers.InputHelper.*;
import static com.blamejared.mtlib.helpers.StackHelper.matches;

1
src/main/java/com/blamejared/compat/forestry/Still.java
View file

@ -6,7 +6,6 @@ import com.blamejared.mtlib.utils.BaseAddForestry;
import com.blamejared.mtlib.utils.BaseRemoveForestry;
import crafttweaker.annotations.ModOnly;
import crafttweaker.annotations.ZenRegister;
import crafttweaker.api.item.IIngredient;
import crafttweaker.api.liquid.ILiquidStack;
import forestry.api.recipes.IStillRecipe;
import forestry.api.recipes.RecipeManagers;

2
src/main/java/com/blamejared/compat/forestry/ThermionicFabricator.java
View file

@ -17,8 +17,6 @@ import forestry.factory.recipes.FabricatorRecipe;
import forestry.factory.recipes.FabricatorSmeltingRecipe;
import net.minecraft.item.ItemStack;
import net.minecraft.util.NonNullList;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;
import stanhebben.zenscript.annotations.Optional;
import stanhebben.zenscript.annotations.ZenClass;
import stanhebben.zenscript.annotations.ZenMethod;

1
src/main/java/com/blamejared/compat/immersivetech/Boiler.java
View file

@ -7,7 +7,6 @@ import crafttweaker.annotations.ModOnly;
import crafttweaker.annotations.ZenRegister;
import crafttweaker.api.liquid.ILiquidStack;
import ferro2000.immersivetech.api.craftings.BoilerRecipes;
import ferro2000.immersivetech.api.craftings.SolarTowerRecipes;
import net.minecraftforge.fluids.FluidStack;
import stanhebben.zenscript.annotations.ZenClass;
import stanhebben.zenscript.annotations.ZenMethod;

1
src/main/java/com/blamejared/compat/immersivetech/Distiller.java
View file

@ -13,7 +13,6 @@ import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.FluidStack;
import stanhebben.zenscript.annotations.ZenClass;
import stanhebben.zenscript.annotations.ZenMethod;
import stanhebben.zenscript.definitions.zenclasses.ParsedZenClassMethod;
@ZenClass("mods.immersivetech.Distiller")
@ZenRegister

1
src/main/java/com/blamejared/compat/tconstruct/Melting.java
View file

@ -21,7 +21,6 @@ import net.minecraftforge.oredict.OreDictionary;
import slimeknights.mantle.util.RecipeMatch;
import slimeknights.tconstruct.library.TinkerRegistry;
import slimeknights.tconstruct.library.events.TinkerRegisterEvent;
import slimeknights.tconstruct.library.smeltery.MeltingRecipe;
import stanhebben.zenscript.annotations.Optional;
import stanhebben.zenscript.annotations.*;

2
src/main/java/com/blamejared/compat/thaumcraft/handlers/brackets/BracketHandlerAspect.java
View file

@ -26,8 +26,6 @@ public class BracketHandlerAspect implements IBracketHandler {
method = CraftTweakerAPI.getJavaMethod(BracketHandlerAspect.class, "getAspect", String.class);
}
@SuppressWarnings("unchecked")
public static void rebuildRegistry() {
aspects.clear();
Aspect.aspects.forEach(aspects::put);

2
src/main/java/com/blamejared/compat/thaumcraft/handlers/expand/IEntityAspectExpansion.java
View file

@ -15,6 +15,7 @@ import thaumcraft.api.internal.CommonInternals;
@ZenRegister
public class IEntityAspectExpansion {
@SuppressWarnings("deprecation")
@ZenMethod
public static void setAspects(IEntityDefinition definition, CTAspectStack... aspects) {
ModTweaker.LATE_ADDITIONS.add(new BaseAction("Aspects") {
@ -43,6 +44,7 @@ public class IEntityAspectExpansion {
});
}
@SuppressWarnings("deprecation")
@ZenMethod
public static void removeAspects(IEntityDefinition definition, CTAspectStack... aspects) {
ModTweaker.LATE_REMOVALS.add(new BaseAction("Aspects") {

5
src/main/java/com/blamejared/compat/thaumcraft/handlers/expand/IItemAspectExpansion.java
View file

@ -10,13 +10,12 @@ import stanhebben.zenscript.annotations.*;
import thaumcraft.api.ThaumcraftApi;
import thaumcraft.api.aspects.AspectList;
import java.util.*;
@ZenExpansion("crafttweaker.item.IItemStack")
@ModOnly("thaumcraft")
@ZenRegister
public class IItemAspectExpansion {
@SuppressWarnings("deprecation")
@ZenMethod
public static void setAspects(IItemStack stack, CTAspectStack... aspects) {
ModTweaker.LATE_ADDITIONS.add(new BaseAction("Aspects") {
@ -46,7 +45,7 @@ public class IItemAspectExpansion {
}
@SuppressWarnings("deprecation")
@ZenMethod
public static void removeAspects(IItemStack stack, CTAspectStack... aspects) {
ModTweaker.LATE_REMOVALS.add(new BaseAction("Aspects") {

1
src/main/java/com/blamejared/compat/thaumcraft/handlers/handlers/ArcaneWorkbench.java
View file

@ -5,7 +5,6 @@ import com.blamejared.compat.thaumcraft.handlers.ThaumCraft;
import com.blamejared.compat.thaumcraft.handlers.aspects.CTAspectStack;
import com.blamejared.mtlib.helpers.*;
import com.blamejared.mtlib.utils.BaseAction;
import com.blamejared.reference.Reference;
import crafttweaker.annotations.*;
import crafttweaker.api.item.*;
import crafttweaker.api.minecraft.CraftTweakerMC;

1
src/main/java/com/blamejared/compat/thaumcraft/handlers/handlers/Crucible.java
View file

@ -5,7 +5,6 @@ import com.blamejared.compat.thaumcraft.handlers.ThaumCraft;
import com.blamejared.compat.thaumcraft.handlers.aspects.CTAspectStack;
import com.blamejared.mtlib.helpers.InputHelper;
import com.blamejared.mtlib.utils.BaseAction;
import com.blamejared.reference.Reference;
import crafttweaker.annotations.*;
import crafttweaker.api.item.*;
import net.minecraft.item.ItemStack;