diff --git a/build.gradle b/build.gradle index 5cb38796b..21772aee1 100644 --- a/build.gradle +++ b/build.gradle @@ -28,7 +28,7 @@ archivesBaseName = config.mod_name sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8' minecraft { - mappings channel: 'snapshot', version: '20190313-1.13.2' + mappings channel: 'snapshot', version: '20190607-1.14.2' accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg') runs { client { @@ -58,10 +58,6 @@ minecraft { // replaceIn 'LibMisc.java' //I may have missed another file, though I can only find it in here. } -dependencies { - minecraft 'net.minecraftforge:forge:1.13.2-25.0.209' -} - repositories { mavenCentral() maven { @@ -84,18 +80,33 @@ repositories { } } -if (System.getenv().BUILD_NUMBER != null) { - //adds the build number to the end of the version string if on a build server - version += ".${System.getenv().BUILD_NUMBER}" -} - //This here is for SCP configurations { sshAntTask } - //End of the SCP config +dependencies { + minecraft 'net.minecraftforge:forge:1.14.2-26.0.5' + + //deobfCompile "com.mod-buildcraft:buildcraft-api:7.99.17" + //deobfCompile "com.azanor.baubles:Baubles:1.12-1.5.2" + //compileOnly fg.deobf("mezz.jei:jei-1.13.2:5.0.0.20:api") + // runtimeOnly fg.deobf("mezz.jei:jei-1.13.2:5.0.0.20") + + //compileOnly fg.deobf("top.theillusivec4.curios:curios:1.13.2-0.11:api") + //runtimeOnly fg.deobf("top.theillusivec4.curios:curios:1.13.2-0.11") + //deobfCompile "thaumcraft:Thaumcraft:1.12.2:6.1.BETA26" + + //and a bit more for SCP + sshAntTask "org.apache.ant:ant-jsch:1.7.1", "jsch:jsch:0.1.29" +} + +if (System.getenv().BUILD_NUMBER != null) { + //adds the build number to the end of the version string if on a build server + version += ".${System.getenv().BUILD_NUMBER}" +} + jar { manifest { attributes(["Specification-Title": "botania", @@ -115,20 +126,6 @@ jar { exclude "**/*.exe" } -dependencies { - //deobfCompile "com.mod-buildcraft:buildcraft-api:7.99.17" - //deobfCompile "com.azanor.baubles:Baubles:1.12-1.5.2" - compileOnly fg.deobf("mezz.jei:jei-1.13.2:5.0.0.20:api") - runtimeOnly fg.deobf("mezz.jei:jei-1.13.2:5.0.0.20") - - compileOnly fg.deobf("top.theillusivec4.curios:curios:1.13.2-0.11:api") - runtimeOnly fg.deobf("top.theillusivec4.curios:curios:1.13.2-0.11") - //deobfCompile "thaumcraft:Thaumcraft:1.12.2:6.1.BETA26" - - //and a bit more for SCP - sshAntTask "org.apache.ant:ant-jsch:1.7.1", "jsch:jsch:0.1.29" -} - task deobfJar(type: Jar) { from(sourceSets.main.output) archiveName = "${baseName} ${version}-deobf.${extension}" diff --git a/build.properties b/build.properties index 5e598177a..522b343d9 100644 --- a/build.properties +++ b/build.properties @@ -7,5 +7,5 @@ dir_repo=./ mc_mappings=stable_39 version=r1.10 dir_output=../Build Output/Botania/ -mc_version=1.12.2 +mc_version=1.14.2 build_number=361 diff --git a/src/main/java/vazkii/botania/api/BotaniaAPI.java b/src/main/java/vazkii/botania/api/BotaniaAPI.java index 6871f762b..db13edf28 100644 --- a/src/main/java/vazkii/botania/api/BotaniaAPI.java +++ b/src/main/java/vazkii/botania/api/BotaniaAPI.java @@ -12,12 +12,15 @@ package vazkii.botania.api; import com.google.common.base.Preconditions; import net.minecraft.block.Block; -import net.minecraft.block.state.IBlockState; +import net.minecraft.block.BlockState; import net.minecraft.entity.Entity; -import net.minecraft.init.SoundEvents; -import net.minecraft.inventory.EntityEquipmentSlot; -import net.minecraft.item.EnumDyeColor; -import net.minecraft.item.EnumRarity; +import net.minecraft.inventory.EquipmentSlotType; +import net.minecraft.item.DyeColor; +import net.minecraft.item.Rarity; +import net.minecraft.util.SoundEvents; +import net.minecraft.inventory.EquipmentSlotType; +import net.minecraft.item.DyeColor; +import net.minecraft.item.Rarity; import net.minecraft.item.IArmorMaterial; import net.minecraft.item.IItemTier; import net.minecraft.item.Item; @@ -25,6 +28,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.Ingredient; import net.minecraft.util.ResourceLocation; import net.minecraft.util.SoundEvent; +import net.minecraft.util.SoundEvents; import net.minecraft.util.text.TextFormatting; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.capabilities.CapabilityInject; @@ -77,19 +81,19 @@ public final class BotaniaAPI { public static Map oreWeights = Collections.emptyMap(); public static Map oreWeightsNether = Collections.emptyMap(); - public static Map, Function> paintableBlocks = Collections.emptyMap(); + public static Map, Function> paintableBlocks = Collections.emptyMap(); public static final Set> gravityRodBlacklist = new LinkedHashSet<>(); private static final int[] MAX_DAMAGE_ARRAY = new int[]{13, 15, 16, 11}; public static final IArmorMaterial MANASTEEL_ARMOR_MAT = new IArmorMaterial() { private final int[] damageReduction = { 2, 5, 6, 2 }; @Override - public int getDurability(EntityEquipmentSlot slotIn) { + public int getDurability(EquipmentSlotType slotIn) { return 16 * MAX_DAMAGE_ARRAY[slotIn.getIndex()]; } @Override - public int getDamageReductionAmount(EntityEquipmentSlot slotIn) { + public int getDamageReductionAmount(EquipmentSlotType slotIn) { return damageReduction[slotIn.getIndex()]; } @@ -156,12 +160,12 @@ public final class BotaniaAPI { public static final IArmorMaterial ELEMENTIUM_ARMOR_MAT = new IArmorMaterial() { private final int[] damageReduction = { 2, 5, 6, 2 }; @Override - public int getDurability(EntityEquipmentSlot slotIn) { + public int getDurability(EquipmentSlotType slotIn) { return 18 * MAX_DAMAGE_ARRAY[slotIn.getIndex()]; } @Override - public int getDamageReductionAmount(EntityEquipmentSlot slotIn) { + public int getDamageReductionAmount(EquipmentSlotType slotIn) { return damageReduction[slotIn.getIndex()]; } @@ -228,12 +232,12 @@ public final class BotaniaAPI { public static final IArmorMaterial TERRASTEEL_ARMOR_MAT = new IArmorMaterial() { private final int[] damageReduction = { 3, 6, 8, 3 }; @Override - public int getDurability(EntityEquipmentSlot slotIn) { + public int getDurability(EquipmentSlotType slotIn) { return 34 * MAX_DAMAGE_ARRAY[slotIn.getIndex()]; } @Override - public int getDamageReductionAmount(EntityEquipmentSlot slotIn) { + public int getDamageReductionAmount(EquipmentSlotType slotIn) { return damageReduction[slotIn.getIndex()]; } @@ -299,12 +303,12 @@ public final class BotaniaAPI { public static final IArmorMaterial MANAWEAVE_ARMOR_MAT = new IArmorMaterial() { private final int[] damageReduction = { 1, 2, 2, 1 }; @Override - public int getDurability(EntityEquipmentSlot slotIn) { + public int getDurability(EquipmentSlotType slotIn) { return 5 * MAX_DAMAGE_ARRAY[slotIn.getIndex()]; } @Override - public int getDamageReductionAmount(EntityEquipmentSlot slotIn) { + public int getDamageReductionAmount(EquipmentSlotType slotIn) { return damageReduction[slotIn.getIndex()]; } @@ -335,7 +339,7 @@ public final class BotaniaAPI { } }; - public static final EnumRarity rarityRelic = EnumRarity.EPIC; // todo 1.13 EnumHelper.addRarity("RELIC", TextFormatting.GOLD, "Relic"); + public static final Rarity rarityRelic = Rarity.EPIC; // todo 1.13 EnumHelper.addRarity("RELIC", TextFormatting.GOLD, "Relic"); public static final KnowledgeType basicKnowledge; public static final KnowledgeType elvenKnowledge; @@ -436,7 +440,7 @@ public final class BotaniaAPI { * @param outputState The blockstate to be placed upon recipe completion. * @return The recipe created. */ - public static RecipePureDaisy registerPureDaisyRecipe(Object input, IBlockState outputState) { + public static RecipePureDaisy registerPureDaisyRecipe(Object input, BlockState outputState) { return registerPureDaisyRecipe(input, outputState, RecipePureDaisy.DEFAULT_TIME); } @@ -448,7 +452,7 @@ public final class BotaniaAPI { * The Pure Daisy only ticks one block at a time in a round robin fashion. * @return The recipe created. */ - public static RecipePureDaisy registerPureDaisyRecipe(Object input, IBlockState outputState, int time) { + public static RecipePureDaisy registerPureDaisyRecipe(Object input, BlockState outputState, int time) { RecipePureDaisy recipe = new RecipePureDaisy(input, outputState, time); pureDaisyRecipes.add(recipe); return recipe; diff --git a/src/main/java/vazkii/botania/api/ColorHelper.java b/src/main/java/vazkii/botania/api/ColorHelper.java index 2ef52538a..346d86ab4 100644 --- a/src/main/java/vazkii/botania/api/ColorHelper.java +++ b/src/main/java/vazkii/botania/api/ColorHelper.java @@ -3,113 +3,111 @@ package vazkii.botania.api; import com.google.common.collect.BiMap; import com.google.common.collect.HashBiMap; import net.minecraft.block.Block; -import net.minecraft.init.Blocks; -import net.minecraft.item.EnumDyeColor; +import net.minecraft.block.Blocks; +import net.minecraft.item.DyeColor; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.event.lifecycle.FMLModIdMappingEvent; -import java.util.function.Function; - @Mod.EventBusSubscriber(modid = "botania") public final class ColorHelper { - public static final BiMap STAINED_GLASS_MAP = HashBiMap.create(); - public static final BiMap STAINED_GLASS_PANE_MAP = HashBiMap.create(); - public static final BiMap TERRACOTTA_MAP = HashBiMap.create(); - public static final BiMap WOOL_MAP = HashBiMap.create(); - public static final BiMap CARPET_MAP = HashBiMap.create(); + public static final BiMap STAINED_GLASS_MAP = HashBiMap.create(); + public static final BiMap STAINED_GLASS_PANE_MAP = HashBiMap.create(); + public static final BiMap TERRACOTTA_MAP = HashBiMap.create(); + public static final BiMap WOOL_MAP = HashBiMap.create(); + public static final BiMap CARPET_MAP = HashBiMap.create(); @SubscribeEvent public static void idShift(FMLModIdMappingEvent evt) { STAINED_GLASS_MAP.clear(); - STAINED_GLASS_MAP.put(EnumDyeColor.WHITE, Blocks.WHITE_STAINED_GLASS); - STAINED_GLASS_MAP.put(EnumDyeColor.ORANGE, Blocks.ORANGE_STAINED_GLASS); - STAINED_GLASS_MAP.put(EnumDyeColor.MAGENTA, Blocks.MAGENTA_STAINED_GLASS); - STAINED_GLASS_MAP.put(EnumDyeColor.LIGHT_BLUE, Blocks.LIGHT_BLUE_STAINED_GLASS); - STAINED_GLASS_MAP.put(EnumDyeColor.YELLOW, Blocks.YELLOW_STAINED_GLASS); - STAINED_GLASS_MAP.put(EnumDyeColor.LIME, Blocks.LIME_STAINED_GLASS); - STAINED_GLASS_MAP.put(EnumDyeColor.PINK, Blocks.PINK_STAINED_GLASS); - STAINED_GLASS_MAP.put(EnumDyeColor.GRAY, Blocks.GRAY_STAINED_GLASS); - STAINED_GLASS_MAP.put(EnumDyeColor.LIGHT_GRAY, Blocks.LIGHT_GRAY_STAINED_GLASS); - STAINED_GLASS_MAP.put(EnumDyeColor.CYAN, Blocks.CYAN_STAINED_GLASS); - STAINED_GLASS_MAP.put(EnumDyeColor.PURPLE, Blocks.PURPLE_STAINED_GLASS); - STAINED_GLASS_MAP.put(EnumDyeColor.BLUE, Blocks.BLUE_STAINED_GLASS); - STAINED_GLASS_MAP.put(EnumDyeColor.BROWN, Blocks.BROWN_STAINED_GLASS); - STAINED_GLASS_MAP.put(EnumDyeColor.GREEN, Blocks.GREEN_STAINED_GLASS); - STAINED_GLASS_MAP.put(EnumDyeColor.RED, Blocks.RED_STAINED_GLASS); - STAINED_GLASS_MAP.put(EnumDyeColor.BLACK, Blocks.BLACK_STAINED_GLASS); + STAINED_GLASS_MAP.put(DyeColor.WHITE, Blocks.WHITE_STAINED_GLASS); + STAINED_GLASS_MAP.put(DyeColor.ORANGE, Blocks.ORANGE_STAINED_GLASS); + STAINED_GLASS_MAP.put(DyeColor.MAGENTA, Blocks.MAGENTA_STAINED_GLASS); + STAINED_GLASS_MAP.put(DyeColor.LIGHT_BLUE, Blocks.LIGHT_BLUE_STAINED_GLASS); + STAINED_GLASS_MAP.put(DyeColor.YELLOW, Blocks.YELLOW_STAINED_GLASS); + STAINED_GLASS_MAP.put(DyeColor.LIME, Blocks.LIME_STAINED_GLASS); + STAINED_GLASS_MAP.put(DyeColor.PINK, Blocks.PINK_STAINED_GLASS); + STAINED_GLASS_MAP.put(DyeColor.GRAY, Blocks.GRAY_STAINED_GLASS); + STAINED_GLASS_MAP.put(DyeColor.LIGHT_GRAY, Blocks.LIGHT_GRAY_STAINED_GLASS); + STAINED_GLASS_MAP.put(DyeColor.CYAN, Blocks.CYAN_STAINED_GLASS); + STAINED_GLASS_MAP.put(DyeColor.PURPLE, Blocks.PURPLE_STAINED_GLASS); + STAINED_GLASS_MAP.put(DyeColor.BLUE, Blocks.BLUE_STAINED_GLASS); + STAINED_GLASS_MAP.put(DyeColor.BROWN, Blocks.BROWN_STAINED_GLASS); + STAINED_GLASS_MAP.put(DyeColor.GREEN, Blocks.GREEN_STAINED_GLASS); + STAINED_GLASS_MAP.put(DyeColor.RED, Blocks.RED_STAINED_GLASS); + STAINED_GLASS_MAP.put(DyeColor.BLACK, Blocks.BLACK_STAINED_GLASS); STAINED_GLASS_PANE_MAP.clear(); - STAINED_GLASS_PANE_MAP.put(EnumDyeColor.WHITE, Blocks.WHITE_STAINED_GLASS_PANE); - STAINED_GLASS_PANE_MAP.put(EnumDyeColor.ORANGE, Blocks.ORANGE_STAINED_GLASS_PANE); - STAINED_GLASS_PANE_MAP.put(EnumDyeColor.MAGENTA, Blocks.MAGENTA_STAINED_GLASS_PANE); - STAINED_GLASS_PANE_MAP.put(EnumDyeColor.LIGHT_BLUE, Blocks.LIGHT_BLUE_STAINED_GLASS_PANE); - STAINED_GLASS_PANE_MAP.put(EnumDyeColor.YELLOW, Blocks.YELLOW_STAINED_GLASS_PANE); - STAINED_GLASS_PANE_MAP.put(EnumDyeColor.LIME, Blocks.LIME_STAINED_GLASS_PANE); - STAINED_GLASS_PANE_MAP.put(EnumDyeColor.PINK, Blocks.PINK_STAINED_GLASS_PANE); - STAINED_GLASS_PANE_MAP.put(EnumDyeColor.GRAY, Blocks.GRAY_STAINED_GLASS_PANE); - STAINED_GLASS_PANE_MAP.put(EnumDyeColor.LIGHT_GRAY, Blocks.LIGHT_GRAY_STAINED_GLASS_PANE); - STAINED_GLASS_PANE_MAP.put(EnumDyeColor.CYAN, Blocks.CYAN_STAINED_GLASS_PANE); - STAINED_GLASS_PANE_MAP.put(EnumDyeColor.PURPLE, Blocks.PURPLE_STAINED_GLASS_PANE); - STAINED_GLASS_PANE_MAP.put(EnumDyeColor.BLUE, Blocks.BLUE_STAINED_GLASS_PANE); - STAINED_GLASS_PANE_MAP.put(EnumDyeColor.BROWN, Blocks.BROWN_STAINED_GLASS_PANE); - STAINED_GLASS_PANE_MAP.put(EnumDyeColor.GREEN, Blocks.GREEN_STAINED_GLASS_PANE); - STAINED_GLASS_PANE_MAP.put(EnumDyeColor.RED, Blocks.RED_STAINED_GLASS_PANE); - STAINED_GLASS_PANE_MAP.put(EnumDyeColor.BLACK, Blocks.BLACK_STAINED_GLASS_PANE); + STAINED_GLASS_PANE_MAP.put(DyeColor.WHITE, Blocks.WHITE_STAINED_GLASS_PANE); + STAINED_GLASS_PANE_MAP.put(DyeColor.ORANGE, Blocks.ORANGE_STAINED_GLASS_PANE); + STAINED_GLASS_PANE_MAP.put(DyeColor.MAGENTA, Blocks.MAGENTA_STAINED_GLASS_PANE); + STAINED_GLASS_PANE_MAP.put(DyeColor.LIGHT_BLUE, Blocks.LIGHT_BLUE_STAINED_GLASS_PANE); + STAINED_GLASS_PANE_MAP.put(DyeColor.YELLOW, Blocks.YELLOW_STAINED_GLASS_PANE); + STAINED_GLASS_PANE_MAP.put(DyeColor.LIME, Blocks.LIME_STAINED_GLASS_PANE); + STAINED_GLASS_PANE_MAP.put(DyeColor.PINK, Blocks.PINK_STAINED_GLASS_PANE); + STAINED_GLASS_PANE_MAP.put(DyeColor.GRAY, Blocks.GRAY_STAINED_GLASS_PANE); + STAINED_GLASS_PANE_MAP.put(DyeColor.LIGHT_GRAY, Blocks.LIGHT_GRAY_STAINED_GLASS_PANE); + STAINED_GLASS_PANE_MAP.put(DyeColor.CYAN, Blocks.CYAN_STAINED_GLASS_PANE); + STAINED_GLASS_PANE_MAP.put(DyeColor.PURPLE, Blocks.PURPLE_STAINED_GLASS_PANE); + STAINED_GLASS_PANE_MAP.put(DyeColor.BLUE, Blocks.BLUE_STAINED_GLASS_PANE); + STAINED_GLASS_PANE_MAP.put(DyeColor.BROWN, Blocks.BROWN_STAINED_GLASS_PANE); + STAINED_GLASS_PANE_MAP.put(DyeColor.GREEN, Blocks.GREEN_STAINED_GLASS_PANE); + STAINED_GLASS_PANE_MAP.put(DyeColor.RED, Blocks.RED_STAINED_GLASS_PANE); + STAINED_GLASS_PANE_MAP.put(DyeColor.BLACK, Blocks.BLACK_STAINED_GLASS_PANE); TERRACOTTA_MAP.clear(); - TERRACOTTA_MAP.put(EnumDyeColor.WHITE, Blocks.WHITE_TERRACOTTA); - TERRACOTTA_MAP.put(EnumDyeColor.ORANGE, Blocks.ORANGE_TERRACOTTA); - TERRACOTTA_MAP.put(EnumDyeColor.MAGENTA, Blocks.MAGENTA_TERRACOTTA); - TERRACOTTA_MAP.put(EnumDyeColor.LIGHT_BLUE, Blocks.LIGHT_BLUE_TERRACOTTA); - TERRACOTTA_MAP.put(EnumDyeColor.YELLOW, Blocks.YELLOW_TERRACOTTA); - TERRACOTTA_MAP.put(EnumDyeColor.LIME, Blocks.LIME_TERRACOTTA); - TERRACOTTA_MAP.put(EnumDyeColor.PINK, Blocks.PINK_TERRACOTTA); - TERRACOTTA_MAP.put(EnumDyeColor.GRAY, Blocks.GRAY_TERRACOTTA); - TERRACOTTA_MAP.put(EnumDyeColor.LIGHT_GRAY, Blocks.LIGHT_GRAY_TERRACOTTA); - TERRACOTTA_MAP.put(EnumDyeColor.CYAN, Blocks.CYAN_TERRACOTTA); - TERRACOTTA_MAP.put(EnumDyeColor.PURPLE, Blocks.PURPLE_TERRACOTTA); - TERRACOTTA_MAP.put(EnumDyeColor.BLUE, Blocks.BLUE_TERRACOTTA); - TERRACOTTA_MAP.put(EnumDyeColor.BROWN, Blocks.BROWN_TERRACOTTA); - TERRACOTTA_MAP.put(EnumDyeColor.GREEN, Blocks.GREEN_TERRACOTTA); - TERRACOTTA_MAP.put(EnumDyeColor.RED, Blocks.RED_TERRACOTTA); - TERRACOTTA_MAP.put(EnumDyeColor.BLACK, Blocks.BLACK_TERRACOTTA); + TERRACOTTA_MAP.put(DyeColor.WHITE, Blocks.WHITE_TERRACOTTA); + TERRACOTTA_MAP.put(DyeColor.ORANGE, Blocks.ORANGE_TERRACOTTA); + TERRACOTTA_MAP.put(DyeColor.MAGENTA, Blocks.MAGENTA_TERRACOTTA); + TERRACOTTA_MAP.put(DyeColor.LIGHT_BLUE, Blocks.LIGHT_BLUE_TERRACOTTA); + TERRACOTTA_MAP.put(DyeColor.YELLOW, Blocks.YELLOW_TERRACOTTA); + TERRACOTTA_MAP.put(DyeColor.LIME, Blocks.LIME_TERRACOTTA); + TERRACOTTA_MAP.put(DyeColor.PINK, Blocks.PINK_TERRACOTTA); + TERRACOTTA_MAP.put(DyeColor.GRAY, Blocks.GRAY_TERRACOTTA); + TERRACOTTA_MAP.put(DyeColor.LIGHT_GRAY, Blocks.LIGHT_GRAY_TERRACOTTA); + TERRACOTTA_MAP.put(DyeColor.CYAN, Blocks.CYAN_TERRACOTTA); + TERRACOTTA_MAP.put(DyeColor.PURPLE, Blocks.PURPLE_TERRACOTTA); + TERRACOTTA_MAP.put(DyeColor.BLUE, Blocks.BLUE_TERRACOTTA); + TERRACOTTA_MAP.put(DyeColor.BROWN, Blocks.BROWN_TERRACOTTA); + TERRACOTTA_MAP.put(DyeColor.GREEN, Blocks.GREEN_TERRACOTTA); + TERRACOTTA_MAP.put(DyeColor.RED, Blocks.RED_TERRACOTTA); + TERRACOTTA_MAP.put(DyeColor.BLACK, Blocks.BLACK_TERRACOTTA); WOOL_MAP.clear(); - WOOL_MAP.put(EnumDyeColor.WHITE, Blocks.WHITE_WOOL); - WOOL_MAP.put(EnumDyeColor.ORANGE, Blocks.ORANGE_WOOL); - WOOL_MAP.put(EnumDyeColor.MAGENTA, Blocks.MAGENTA_WOOL); - WOOL_MAP.put(EnumDyeColor.LIGHT_BLUE, Blocks.LIGHT_BLUE_WOOL); - WOOL_MAP.put(EnumDyeColor.YELLOW, Blocks.YELLOW_WOOL); - WOOL_MAP.put(EnumDyeColor.LIME, Blocks.LIME_WOOL); - WOOL_MAP.put(EnumDyeColor.PINK, Blocks.PINK_WOOL); - WOOL_MAP.put(EnumDyeColor.GRAY, Blocks.GRAY_WOOL); - WOOL_MAP.put(EnumDyeColor.LIGHT_GRAY, Blocks.LIGHT_GRAY_WOOL); - WOOL_MAP.put(EnumDyeColor.CYAN, Blocks.CYAN_WOOL); - WOOL_MAP.put(EnumDyeColor.PURPLE, Blocks.PURPLE_WOOL); - WOOL_MAP.put(EnumDyeColor.BLUE, Blocks.BLUE_WOOL); - WOOL_MAP.put(EnumDyeColor.BROWN, Blocks.BROWN_WOOL); - WOOL_MAP.put(EnumDyeColor.GREEN, Blocks.GREEN_WOOL); - WOOL_MAP.put(EnumDyeColor.RED, Blocks.RED_WOOL); - WOOL_MAP.put(EnumDyeColor.BLACK, Blocks.BLACK_WOOL); + WOOL_MAP.put(DyeColor.WHITE, Blocks.WHITE_WOOL); + WOOL_MAP.put(DyeColor.ORANGE, Blocks.ORANGE_WOOL); + WOOL_MAP.put(DyeColor.MAGENTA, Blocks.MAGENTA_WOOL); + WOOL_MAP.put(DyeColor.LIGHT_BLUE, Blocks.LIGHT_BLUE_WOOL); + WOOL_MAP.put(DyeColor.YELLOW, Blocks.YELLOW_WOOL); + WOOL_MAP.put(DyeColor.LIME, Blocks.LIME_WOOL); + WOOL_MAP.put(DyeColor.PINK, Blocks.PINK_WOOL); + WOOL_MAP.put(DyeColor.GRAY, Blocks.GRAY_WOOL); + WOOL_MAP.put(DyeColor.LIGHT_GRAY, Blocks.LIGHT_GRAY_WOOL); + WOOL_MAP.put(DyeColor.CYAN, Blocks.CYAN_WOOL); + WOOL_MAP.put(DyeColor.PURPLE, Blocks.PURPLE_WOOL); + WOOL_MAP.put(DyeColor.BLUE, Blocks.BLUE_WOOL); + WOOL_MAP.put(DyeColor.BROWN, Blocks.BROWN_WOOL); + WOOL_MAP.put(DyeColor.GREEN, Blocks.GREEN_WOOL); + WOOL_MAP.put(DyeColor.RED, Blocks.RED_WOOL); + WOOL_MAP.put(DyeColor.BLACK, Blocks.BLACK_WOOL); CARPET_MAP.clear(); - CARPET_MAP.put(EnumDyeColor.WHITE, Blocks.WHITE_CARPET); - CARPET_MAP.put(EnumDyeColor.ORANGE, Blocks.ORANGE_CARPET); - CARPET_MAP.put(EnumDyeColor.MAGENTA, Blocks.MAGENTA_CARPET); - CARPET_MAP.put(EnumDyeColor.LIGHT_BLUE, Blocks.LIGHT_BLUE_CARPET); - CARPET_MAP.put(EnumDyeColor.YELLOW, Blocks.YELLOW_CARPET); - CARPET_MAP.put(EnumDyeColor.LIME, Blocks.LIME_CARPET); - CARPET_MAP.put(EnumDyeColor.PINK, Blocks.PINK_CARPET); - CARPET_MAP.put(EnumDyeColor.GRAY, Blocks.GRAY_CARPET); - CARPET_MAP.put(EnumDyeColor.LIGHT_GRAY, Blocks.LIGHT_GRAY_CARPET); - CARPET_MAP.put(EnumDyeColor.CYAN, Blocks.CYAN_CARPET); - CARPET_MAP.put(EnumDyeColor.PURPLE, Blocks.PURPLE_CARPET); - CARPET_MAP.put(EnumDyeColor.BLUE, Blocks.BLUE_CARPET); - CARPET_MAP.put(EnumDyeColor.BROWN, Blocks.BROWN_CARPET); - CARPET_MAP.put(EnumDyeColor.GREEN, Blocks.GREEN_CARPET); - CARPET_MAP.put(EnumDyeColor.RED, Blocks.RED_CARPET); - CARPET_MAP.put(EnumDyeColor.BLACK, Blocks.BLACK_CARPET); + CARPET_MAP.put(DyeColor.WHITE, Blocks.WHITE_CARPET); + CARPET_MAP.put(DyeColor.ORANGE, Blocks.ORANGE_CARPET); + CARPET_MAP.put(DyeColor.MAGENTA, Blocks.MAGENTA_CARPET); + CARPET_MAP.put(DyeColor.LIGHT_BLUE, Blocks.LIGHT_BLUE_CARPET); + CARPET_MAP.put(DyeColor.YELLOW, Blocks.YELLOW_CARPET); + CARPET_MAP.put(DyeColor.LIME, Blocks.LIME_CARPET); + CARPET_MAP.put(DyeColor.PINK, Blocks.PINK_CARPET); + CARPET_MAP.put(DyeColor.GRAY, Blocks.GRAY_CARPET); + CARPET_MAP.put(DyeColor.LIGHT_GRAY, Blocks.LIGHT_GRAY_CARPET); + CARPET_MAP.put(DyeColor.CYAN, Blocks.CYAN_CARPET); + CARPET_MAP.put(DyeColor.PURPLE, Blocks.PURPLE_CARPET); + CARPET_MAP.put(DyeColor.BLUE, Blocks.BLUE_CARPET); + CARPET_MAP.put(DyeColor.BROWN, Blocks.BROWN_CARPET); + CARPET_MAP.put(DyeColor.GREEN, Blocks.GREEN_CARPET); + CARPET_MAP.put(DyeColor.RED, Blocks.RED_CARPET); + CARPET_MAP.put(DyeColor.BLACK, Blocks.BLACK_CARPET); } private ColorHelper() {} diff --git a/src/main/java/vazkii/botania/api/boss/IBotaniaBoss.java b/src/main/java/vazkii/botania/api/boss/IBotaniaBoss.java index 406d5ab80..3850d9941 100644 --- a/src/main/java/vazkii/botania/api/boss/IBotaniaBoss.java +++ b/src/main/java/vazkii/botania/api/boss/IBotaniaBoss.java @@ -11,6 +11,7 @@ package vazkii.botania.api.boss; import net.minecraft.util.ResourceLocation; +import net.minecraft.world.ServerBossInfo; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.internal.ShaderCallback; @@ -54,7 +55,7 @@ public interface IBotaniaBoss { public int bossBarRenderCallback(int x, int y); /** - * Get the serverside UUID of the {@link net.minecraft.world.BossInfoServer} instance tracking this boss + * Get the serverside UUID of the {@link ServerBossInfo} instance tracking this boss * Note that this is NOT the entity's UUID, nor is it the clientside UUID of the BossInfoServer instance! * You will most likely need to sync this yourself using the datawatcher * @return The uuid. diff --git a/src/main/java/vazkii/botania/api/brew/Brew.java b/src/main/java/vazkii/botania/api/brew/Brew.java index d91f0d780..824ac5b49 100644 --- a/src/main/java/vazkii/botania/api/brew/Brew.java +++ b/src/main/java/vazkii/botania/api/brew/Brew.java @@ -12,7 +12,7 @@ package vazkii.botania.api.brew; import com.google.common.collect.ImmutableList; import net.minecraft.item.ItemStack; -import net.minecraft.potion.PotionEffect; +import net.minecraft.potion.EffectInstance; import java.util.List; @@ -25,7 +25,7 @@ public class Brew { private final String name; private final int color; private final int cost; - private final List effects; + private final List effects; private boolean canInfuseBloodPendant = true; private boolean canInfuseIncense = true; @@ -36,7 +36,7 @@ public class Brew { * @param cost The cost, in Mana for this brew. * @param effects A list of effects to apply to the player when they drink it. */ - public Brew(String key, String name, int color, int cost, PotionEffect... effects) { + public Brew(String key, String name, int color, int cost, EffectInstance... effects) { this.key = key; this.name = name; this.color = color; @@ -118,7 +118,7 @@ public class Brew { * Note that for the lexicon, this passes in a botania Managlass * Vial or an Alfglass Flask at all times. */ - public List getPotionEffects(ItemStack stack) { + public List getPotionEffects(ItemStack stack) { return effects; } diff --git a/src/main/java/vazkii/botania/api/corporea/CorporeaIndexRequestEvent.java b/src/main/java/vazkii/botania/api/corporea/CorporeaIndexRequestEvent.java index 670531e2d..f4d0b20fd 100644 --- a/src/main/java/vazkii/botania/api/corporea/CorporeaIndexRequestEvent.java +++ b/src/main/java/vazkii/botania/api/corporea/CorporeaIndexRequestEvent.java @@ -9,7 +9,7 @@ */ package vazkii.botania.api.corporea; -import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraftforge.eventbus.api.Cancelable; import net.minecraftforge.eventbus.api.Event; @@ -19,12 +19,12 @@ import net.minecraftforge.eventbus.api.Event; * */ @Cancelable public class CorporeaIndexRequestEvent extends Event { - public final EntityPlayerMP requester; + public final ServerPlayerEntity requester; public String request; public int requestCount; public ICorporeaSpark indexSpark; - public CorporeaIndexRequestEvent(EntityPlayerMP requester, String request, int requestCount, ICorporeaSpark indexSpark) { + public CorporeaIndexRequestEvent(ServerPlayerEntity requester, String request, int requestCount, ICorporeaSpark indexSpark) { this.requester = requester; this.request = request; this.requestCount = requestCount; diff --git a/src/main/java/vazkii/botania/api/corporea/ICorporeaSpark.java b/src/main/java/vazkii/botania/api/corporea/ICorporeaSpark.java index bb25d9841..7a16ae3c8 100644 --- a/src/main/java/vazkii/botania/api/corporea/ICorporeaSpark.java +++ b/src/main/java/vazkii/botania/api/corporea/ICorporeaSpark.java @@ -10,7 +10,7 @@ */ package vazkii.botania.api.corporea; -import net.minecraft.item.EnumDyeColor; +import net.minecraft.item.DyeColor; import net.minecraft.item.ItemStack; import java.util.List; @@ -82,6 +82,6 @@ public interface ICorporeaSpark { * Gets the network that this spark is on, or the color it's displaying. Sparks may only connect to others * of the same network, and on changing network should trigger a re-cache of the previous network. */ - public EnumDyeColor getNetwork(); + public DyeColor getNetwork(); } diff --git a/src/main/java/vazkii/botania/api/imc/PaintableBlockMessage.java b/src/main/java/vazkii/botania/api/imc/PaintableBlockMessage.java index 9ac5075c5..8349d8f93 100644 --- a/src/main/java/vazkii/botania/api/imc/PaintableBlockMessage.java +++ b/src/main/java/vazkii/botania/api/imc/PaintableBlockMessage.java @@ -1,7 +1,8 @@ package vazkii.botania.api.imc; import net.minecraft.block.Block; -import net.minecraft.item.EnumDyeColor; +import net.minecraft.item.DyeColor; +import net.minecraft.item.DyeColor; import net.minecraftforge.registries.IRegistryDelegate; import java.util.ArrayList; @@ -10,13 +11,13 @@ import java.util.function.Function; public class PaintableBlockMessage { private final IRegistryDelegate block; - private final Function transformer; + private final Function transformer; /** * @param transformer Lookup function from color to destination block * @param block The block being converted */ - public PaintableBlockMessage(Function transformer, Block block) { + public PaintableBlockMessage(Function transformer, Block block) { this.block = block.delegate; this.transformer = transformer; } @@ -25,7 +26,7 @@ public class PaintableBlockMessage { return block; } - public Function getTransformer() { + public Function getTransformer() { return transformer; } } diff --git a/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java b/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java index 6f0311090..40f43d591 100644 --- a/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java +++ b/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java @@ -11,11 +11,12 @@ package vazkii.botania.api.internal; import net.minecraft.entity.Entity; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -137,7 +138,7 @@ public class DummyMethodHandler implements IInternalMethodHandler { public void sparkleFX(World world, double x, double y, double z, float r, float g, float b, float size, int m) {} @Override - public IItemHandlerModifiable getAccessoriesInventory(EntityPlayer player) { + public IItemHandlerModifiable getAccessoriesInventory(PlayerEntity player) { return null; } @@ -162,7 +163,7 @@ public class DummyMethodHandler implements IInternalMethodHandler { } @Override - public void breakOnAllCursors(EntityPlayer player, Item item, ItemStack stack, BlockPos pos, EnumFacing side) {} + public void breakOnAllCursors(PlayerEntity player, Item item, ItemStack stack, BlockPos pos, Direction side) {} @Override public boolean hasSolegnoliaAround(Entity e) { diff --git a/src/main/java/vazkii/botania/api/internal/IGuiLexiconEntry.java b/src/main/java/vazkii/botania/api/internal/IGuiLexiconEntry.java index d774079ee..27eaefc4e 100644 --- a/src/main/java/vazkii/botania/api/internal/IGuiLexiconEntry.java +++ b/src/main/java/vazkii/botania/api/internal/IGuiLexiconEntry.java @@ -10,7 +10,8 @@ */ package vazkii.botania.api.internal; -import net.minecraft.client.gui.GuiButton; +import net.minecraft.client.gui.widget.button.Button; +import net.minecraft.client.gui.widget.button.Button; import vazkii.botania.api.lexicon.LexiconEntry; import java.util.List; @@ -60,7 +61,7 @@ public interface IGuiLexiconEntry { /** * Gets the list of buttons in this gui. */ - public List getButtonList(); + public List