Clean up compat for dead mods

This commit is contained in:
Vincent Lee committed 2020-06-28 19:41:48 -05:00
1 parent 3530a2de69
commit 0f9e759307
8 files changed
+2 -55

No files matched your search

@@ -82,6 +82,7 @@ public final class RenderHelper {
public static final RenderType ENTITY_TRANSLUCENT_GOLD;
static {
// todo 1.16 update to match vanilla where necessary (alternate render targets, etc.)
RenderState.TransparencyState lightningTransparency = ObfuscationReflectionHelper.getPrivateValue(RenderState.class, null, "field_228512_d_");
TRANSLUCENT_TRANSPARENCY = ObfuscationReflectionHelper.getPrivateValue(RenderState.class, null, "field_228515_g_");
RenderState.TextureState mipmapBlockAtlasTexture = new RenderState.TextureState(AtlasTexture.LOCATION_BLOCKS_TEXTURE, false, true);
@@ -45,9 +45,6 @@ public class AncientWillRecipeWrapper implements ICustomCraftingCategoryExtensio
ImmutableList.Builder<ItemStack> helmets = ImmutableList.builder();
ImmutableList.Builder<ItemStack> wills = ImmutableList.builder();
helmets.add(new ItemStack(ModItems.terrasteelHelm));
if (Botania.thaumcraftLoaded) {
helmets.add(new ItemStack(ModItems.terrasteelHelmRevealing));
}
wills.add(new ItemStack(ModItems.ancientWillAhrim));
wills.add(new ItemStack(ModItems.ancientWillDharok));
wills.add(new ItemStack(ModItems.ancientWillGuthan));
@@ -117,10 +117,6 @@ public class Botania {
public static boolean gardenOfGlassLoaded = false;
public static boolean thaumcraftLoaded = false;
public static boolean bcApiLoaded = false;
public static boolean bloodMagicLoaded = false;
public static boolean coloredLightsLoaded = false;
public static boolean curiosLoaded = false;
public static IProxy proxy;
@@ -197,20 +193,10 @@ public class Botania {
CapabilityManager.INSTANCE.register(IExoflameHeatable.class, new NoopCapStorage<>(), NoopExoflameHeatable::new);
gardenOfGlassLoaded = ModList.get().isLoaded("gardenofglass");
thaumcraftLoaded = ModList.get().isLoaded("thaumcraft");
bcApiLoaded = ModList.get().isLoaded("buildcraftlib");
bloodMagicLoaded = ModList.get().isLoaded("bloodmagic"); // Psh, noob
coloredLightsLoaded = ModList.get().isLoaded("easycoloredlights");
curiosLoaded = ModList.get().isLoaded("curios");
PacketHandler.init();
if (Botania.thaumcraftLoaded) {
if (ConfigHandler.COMMON.enableThaumcraftAspects.get()) {
// todo 1.13 MinecraftForge.EVENT_BUS.register(TCAspects.class);
}
}
EquipmentHandler.init();
CorporeaHelper.instance().registerRequestMatcher(prefix("string"), CorporeaStringMatcher.class, CorporeaStringMatcher::createFromNBT);
CorporeaHelper.instance().registerRequestMatcher(prefix("item_stack"), CorporeaItemStackMatcher.class, CorporeaItemStackMatcher::createFromNBT);
@@ -165,9 +165,6 @@ public final class BotaniaCreativeTab extends ItemGroup {
addItem(ModBlocks.scorchedGrass);
addItem(ModBlocks.infusedGrass);
addItem(ModBlocks.mutatedGrass);
if (Botania.thaumcraftLoaded) {
addItem(ModItems.manaInkwell);
}
addItem(ModBlocks.wildDrum);
addItem(ModBlocks.gatheringDrum);
addItem(ModBlocks.canopyDrum);
@@ -273,9 +270,6 @@ public final class BotaniaCreativeTab extends ItemGroup {
addItem(ModItems.enderDagger);
addItem(ModItems.livingwoodBow);
addItem(ModItems.manasteelHelm);
if (Botania.thaumcraftLoaded) {
addItem(ModItems.manasteelHelmRevealing);
}
addItem(ModItems.manasteelChest);
addItem(ModItems.manasteelLegs);
addItem(ModItems.manasteelBoots);
@@ -292,9 +286,6 @@ public final class BotaniaCreativeTab extends ItemGroup {
addItem(ModItems.thunderSword);
addItem(ModItems.crystalBow);
addItem(ModItems.elementiumHelm);
if (Botania.thaumcraftLoaded) {
addItem(ModItems.elementiumHelmRevealing);
}
addItem(ModItems.elementiumChest);
addItem(ModItems.elementiumLegs);
addItem(ModItems.elementiumBoots);
@@ -305,9 +296,6 @@ public final class BotaniaCreativeTab extends ItemGroup {
addItem(ModItems.terraAxe);
addItem(ModItems.temperanceStone);
addItem(ModItems.terrasteelHelm);
if (Botania.thaumcraftLoaded) {
addItem(ModItems.terrasteelHelmRevealing);
}
addItem(ModItems.terrasteelChest);
addItem(ModItems.terrasteelLegs);
addItem(ModItems.terrasteelBoots);
@@ -114,11 +114,7 @@ public final class ConfigHandler {
public final ForgeConfigSpec.BooleanValue enchanterEnabled;
public final ForgeConfigSpec.BooleanValue fluxfieldEnabled;
public final ForgeConfigSpec.BooleanValue relicsEnabled;
// todo 1.16 remove
public final ForgeConfigSpec.BooleanValue ringOfOdinFireResist;
public final ForgeConfigSpec.BooleanValue invertMagnetRing;
public final ForgeConfigSpec.BooleanValue enableThaumcraftStablizers;
public final ForgeConfigSpec.BooleanValue enableThaumcraftAspects;
public final ForgeConfigSpec.IntValue harvestLevelWeight;
public final ForgeConfigSpec.IntValue harvestLevelBore;
@@ -163,18 +159,9 @@ public final class ConfigHandler {
relicsEnabled = builder
.comment("Set this to false to disable the Relic System. This only disables the entries, drops and achievements. Old ones that are already in the world will stay.")
.define("relics.enabled", true);
ringOfOdinFireResist = builder
.comment("Set this to false to make the Ring of Odin not apply fire resistance. Mostly for people who use Witchery transformations.")
.define("ringOfOdin.fireResist", true);
invertMagnetRing = builder
.comment("Set this to true to invert the Ring of Magnetization's controls (from shift to stop to shift to work)")
.define("magnetRing.invert", false);
enableThaumcraftStablizers = builder
.comment("Set this to false to disable Thaumcraft Infusion Stabilizing in botania blocks")
.define("thaumraftStabilizers.enabled", true);
enableThaumcraftAspects = builder
.comment("Set this to false to disable Thaumcraft aspects on Botania items")
.define("thaumcraftAspects.enabled", true);
harvestLevelWeight = builder
.comment("The harvest level of the Mana Lens: Weight. 3 is diamond level. Defaults to 2 (iron level)")
.defineInRange("harvestLevel.weightLens", 2, 0, Integer.MAX_VALUE);
@@ -48,9 +48,6 @@ public class ArmorUpgradeRecipe implements ICraftingRecipe {
ItemStack stack = inv.getStackInSlot(i);
if (!stack.isEmpty() && stack.getItem() instanceof ArmorItem && stack.hasTag()) {
EnchantmentHelper.setEnchantments(EnchantmentHelper.getEnchantments(stack), out);
if (Botania.thaumcraftLoaded) {
HelmRevealingRecipe.copyTCData(stack, out);
}
break;
}
}
@@ -122,7 +122,7 @@ public class CorporeaHelperImpl implements CorporeaHelper {
List<ItemStack> stacks = new ArrayList<>();
CorporeaRequestEvent event = new CorporeaRequestEvent(matcher, itemCount, spark, !doit);
if (MinecraftForge.EVENT_BUS.post(event)) {
return new CorporeaResult(stacks, 0, 0); // todo 1.15 what to do here
return new CorporeaResult(stacks, 0, 0);
}
List<InvWithLocation> inventories = getInventoriesOnNetwork(spark);
@@ -68,15 +68,6 @@ public class BrewProvider extends RecipeProvider {
consumer.accept(new FinishedRecipe(idFor("bloodthirst"), ModBrews.bloodthirst, Ingredient.fromItems(Items.NETHER_WART), Ingredient.fromItems(Items.FERMENTED_SPIDER_EYE), Ingredient.fromItems(Items.LAPIS_LAZULI), Ingredient.fromItems(Items.FIRE_CHARGE), Ingredient.fromItems(Items.IRON_INGOT)));
consumer.accept(new FinishedRecipe(idFor("allure"), ModBrews.allure, Ingredient.fromItems(Items.NETHER_WART), Ingredient.fromItems(Items.COD), Ingredient.fromItems(Items.QUARTZ), Ingredient.fromItems(Items.GOLDEN_CARROT)));
consumer.accept(new FinishedRecipe(idFor("clear"), ModBrews.clear, Ingredient.fromItems(Items.NETHER_WART), Ingredient.fromItems(Items.QUARTZ), Ingredient.fromItems(Items.EMERALD), Ingredient.fromItems(Items.MELON_SLICE)));
// todo 1.15 conditional recipe or remove
if (Botania.thaumcraftLoaded) {
Item salisMundus = Registry.ITEM.getValue(new ResourceLocation("thaumcraft", "salis_mundus")).get();
Item bathSalts = Registry.ITEM.getValue(new ResourceLocation("thaumcraft", "bath_salts")).get();
Item amber = Registry.ITEM.getValue(new ResourceLocation("thaumcraft", "amber")).get();
consumer.accept(new FinishedRecipe(idFor("warp_ward"), ModBrews.warpWard, Ingredient.fromItems(Items.NETHER_WART), Ingredient.fromItems(salisMundus), Ingredient.fromItems(bathSalts), Ingredient.fromItems(amber)));
}
}
private static ResourceLocation idFor(String s) {