From e7f79f3336400bf970d51c2ec04b0e85f779755f Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 17 Jul 2019 19:48:28 -0700 Subject: [PATCH] Update forge, restore jei integration --- build.gradle | 8 +++---- .../handler/BlockHighlightRenderHandler.java | 2 +- .../client/core/handler/RenderLexicon.java | 2 +- .../integration/jei}/JEIBotaniaPlugin.java | 12 +++++----- .../jei}/brewery/BreweryRecipeCategory.java | 0 .../crafting/AncientWillRecipeWrapper.java | 0 .../crafting/CompositeLensRecipeWrapper.java | 0 .../TerraPickTippingRecipeWrapper.java | 0 .../elventrade/ElvenTradeRecipeCategory.java | 0 .../jei}/manapool/ManaPoolRecipeCategory.java | 0 .../orechid/OrechidIgnemRecipeCategory.java | 0 .../orechid/OrechidIgnemRecipeWrapper.java | 0 .../jei}/orechid/OrechidRecipeCategory.java | 0 .../jei}/orechid/OrechidRecipeWrapper.java | 0 .../PetalApothecaryRecipeCategory.java | 0 .../puredaisy/PureDaisyRecipeCategory.java | 0 .../runicaltar/RunicAltarRecipeCategory.java | 0 .../render/world/SkyblockSkyRenderer.java | 4 ++-- .../tile/string/TileRedStringContainer.java | 24 ++++++++++++++++--- .../botania/common/core/loot/LootHandler.java | 2 +- .../equipment/bauble/ItemBloodPendant.java | 2 +- .../equipment/tool/bow/ItemLivingwoodBow.java | 4 ++-- 22 files changed, 39 insertions(+), 21 deletions(-) rename {jei => src/main/java/vazkii/botania/client/integration/jei}/JEIBotaniaPlugin.java (95%) rename {jei => src/main/java/vazkii/botania/client/integration/jei}/brewery/BreweryRecipeCategory.java (100%) rename {jei => src/main/java/vazkii/botania/client/integration/jei}/crafting/AncientWillRecipeWrapper.java (100%) rename {jei => src/main/java/vazkii/botania/client/integration/jei}/crafting/CompositeLensRecipeWrapper.java (100%) rename {jei => src/main/java/vazkii/botania/client/integration/jei}/crafting/TerraPickTippingRecipeWrapper.java (100%) rename {jei => src/main/java/vazkii/botania/client/integration/jei}/elventrade/ElvenTradeRecipeCategory.java (100%) rename {jei => src/main/java/vazkii/botania/client/integration/jei}/manapool/ManaPoolRecipeCategory.java (100%) rename {jei => src/main/java/vazkii/botania/client/integration/jei}/orechid/OrechidIgnemRecipeCategory.java (100%) rename {jei => src/main/java/vazkii/botania/client/integration/jei}/orechid/OrechidIgnemRecipeWrapper.java (100%) rename {jei => src/main/java/vazkii/botania/client/integration/jei}/orechid/OrechidRecipeCategory.java (100%) rename {jei => src/main/java/vazkii/botania/client/integration/jei}/orechid/OrechidRecipeWrapper.java (100%) rename {jei => src/main/java/vazkii/botania/client/integration/jei}/petalapothecary/PetalApothecaryRecipeCategory.java (100%) rename {jei => src/main/java/vazkii/botania/client/integration/jei}/puredaisy/PureDaisyRecipeCategory.java (100%) rename {jei => src/main/java/vazkii/botania/client/integration/jei}/runicaltar/RunicAltarRecipeCategory.java (100%) diff --git a/build.gradle b/build.gradle index 6d20abf33..c1f462b42 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: '20190630-1.14.3' + mappings channel: 'snapshot', version: '20190709-1.14.3' accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg') runs { client { @@ -87,12 +87,12 @@ configurations { //End of the SCP config dependencies { - minecraft 'net.minecraftforge:forge:1.14.3-27.0.23' + minecraft 'net.minecraftforge:forge:1.14.3-27.0.57' //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("mezz.jei:jei-1.14.3:6.0.0.8:api") + runtimeOnly fg.deobf("mezz.jei:jei-1.14.3:6.0.0.8") compileOnly fg.deobf("top.theillusivec4.curios:curios:FORGE-1.14.3-0.14:api") runtimeOnly fg.deobf("top.theillusivec4.curios:curios:FORGE-1.14.3-0.14") diff --git a/src/main/java/vazkii/botania/client/core/handler/BlockHighlightRenderHandler.java b/src/main/java/vazkii/botania/client/core/handler/BlockHighlightRenderHandler.java index f4464197c..be08b31ac 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BlockHighlightRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/BlockHighlightRenderHandler.java @@ -83,7 +83,7 @@ public final class BlockHighlightRenderHandler { } double offY = -1.0 / 16 + 0.005; - for(Entity e : mc.world.func_217416_b()) + for(Entity e : mc.world.getAllEntities()) if(e instanceof EntityMagicLandmine) { BlockPos bpos = e.getPosition(); AxisAlignedBB aabb = new AxisAlignedBB(bpos).offset(0, offY, 0).grow(2.5, 0, 2.5); diff --git a/src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java b/src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java index 676f6d545..3b9274614 100644 --- a/src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java +++ b/src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java @@ -108,7 +108,7 @@ public class RenderLexicon { pageFlip = pageFlipTicks / 5F; - model.func_217103_a(0F, 0F, pageFlip, opening, 0F, 1F / 16F); + model.render(0F, 0F, pageFlip, opening, 0F, 1F / 16F); if(ticks < 3) { FontRenderer font = Minecraft.getInstance().fontRenderer; GlStateManager.rotatef(180F, 0F, 0F, 1F); diff --git a/jei/JEIBotaniaPlugin.java b/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java similarity index 95% rename from jei/JEIBotaniaPlugin.java rename to src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java index 217528c30..66ec05af2 100644 --- a/jei/JEIBotaniaPlugin.java +++ b/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java @@ -95,11 +95,11 @@ public class JEIBotaniaPlugin implements IModPlugin { @Override public void registerRecipes(@Nonnull IRecipeRegistration registry) { - registry.addRecipes(BotaniaAPI.brewRecipes, BreweryRecipeCategory.UID); - registry.addRecipes(BotaniaAPI.pureDaisyRecipes, PureDaisyRecipeCategory.UID); - registry.addRecipes(BotaniaAPI.petalRecipes, PetalApothecaryRecipeCategory.UID); - registry.addRecipes(BotaniaAPI.elvenTradeRecipes, ElvenTradeRecipeCategory.UID); - registry.addRecipes(BotaniaAPI.runeAltarRecipes, RunicAltarRecipeCategory.UID); + registry.addRecipes(BotaniaAPI.brewRecipes.values(), BreweryRecipeCategory.UID); + registry.addRecipes(BotaniaAPI.pureDaisyRecipes.values(), PureDaisyRecipeCategory.UID); + registry.addRecipes(BotaniaAPI.petalRecipes.values(), PetalApothecaryRecipeCategory.UID); + registry.addRecipes(BotaniaAPI.elvenTradeRecipes.values(), ElvenTradeRecipeCategory.UID); + registry.addRecipes(BotaniaAPI.runeAltarRecipes.values(), RunicAltarRecipeCategory.UID); registry.addRecipes(BotaniaAPI.manaInfusionRecipes.values(), ManaPoolRecipeCategory.UID); registry.addRecipes( @@ -162,7 +162,7 @@ public class JEIBotaniaPlugin implements IModPlugin { @Override public void onRuntimeAvailable(IJeiRuntime jeiRuntime) { IRecipeManager recipeRegistry = jeiRuntime.getRecipeManager(); - for(RecipeElvenTrade recipe : BotaniaAPI.elvenTradeRecipes) { + for(RecipeElvenTrade recipe : BotaniaAPI.elvenTradeRecipes.values()) { List inputs = recipe.getInputs(); List outputs = recipe.getOutputs(); if(inputs.size() == 1 && outputs.size() == 1 && inputs.get(0).test(outputs.get(0))) { diff --git a/jei/brewery/BreweryRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeCategory.java similarity index 100% rename from jei/brewery/BreweryRecipeCategory.java rename to src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeCategory.java diff --git a/jei/crafting/AncientWillRecipeWrapper.java b/src/main/java/vazkii/botania/client/integration/jei/crafting/AncientWillRecipeWrapper.java similarity index 100% rename from jei/crafting/AncientWillRecipeWrapper.java rename to src/main/java/vazkii/botania/client/integration/jei/crafting/AncientWillRecipeWrapper.java diff --git a/jei/crafting/CompositeLensRecipeWrapper.java b/src/main/java/vazkii/botania/client/integration/jei/crafting/CompositeLensRecipeWrapper.java similarity index 100% rename from jei/crafting/CompositeLensRecipeWrapper.java rename to src/main/java/vazkii/botania/client/integration/jei/crafting/CompositeLensRecipeWrapper.java diff --git a/jei/crafting/TerraPickTippingRecipeWrapper.java b/src/main/java/vazkii/botania/client/integration/jei/crafting/TerraPickTippingRecipeWrapper.java similarity index 100% rename from jei/crafting/TerraPickTippingRecipeWrapper.java rename to src/main/java/vazkii/botania/client/integration/jei/crafting/TerraPickTippingRecipeWrapper.java diff --git a/jei/elventrade/ElvenTradeRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeCategory.java similarity index 100% rename from jei/elventrade/ElvenTradeRecipeCategory.java rename to src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeCategory.java diff --git a/jei/manapool/ManaPoolRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeCategory.java similarity index 100% rename from jei/manapool/ManaPoolRecipeCategory.java rename to src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeCategory.java diff --git a/jei/orechid/OrechidIgnemRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/orechid/OrechidIgnemRecipeCategory.java similarity index 100% rename from jei/orechid/OrechidIgnemRecipeCategory.java rename to src/main/java/vazkii/botania/client/integration/jei/orechid/OrechidIgnemRecipeCategory.java diff --git a/jei/orechid/OrechidIgnemRecipeWrapper.java b/src/main/java/vazkii/botania/client/integration/jei/orechid/OrechidIgnemRecipeWrapper.java similarity index 100% rename from jei/orechid/OrechidIgnemRecipeWrapper.java rename to src/main/java/vazkii/botania/client/integration/jei/orechid/OrechidIgnemRecipeWrapper.java diff --git a/jei/orechid/OrechidRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/orechid/OrechidRecipeCategory.java similarity index 100% rename from jei/orechid/OrechidRecipeCategory.java rename to src/main/java/vazkii/botania/client/integration/jei/orechid/OrechidRecipeCategory.java diff --git a/jei/orechid/OrechidRecipeWrapper.java b/src/main/java/vazkii/botania/client/integration/jei/orechid/OrechidRecipeWrapper.java similarity index 100% rename from jei/orechid/OrechidRecipeWrapper.java rename to src/main/java/vazkii/botania/client/integration/jei/orechid/OrechidRecipeWrapper.java diff --git a/jei/petalapothecary/PetalApothecaryRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeCategory.java similarity index 100% rename from jei/petalapothecary/PetalApothecaryRecipeCategory.java rename to src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeCategory.java diff --git a/jei/puredaisy/PureDaisyRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeCategory.java similarity index 100% rename from jei/puredaisy/PureDaisyRecipeCategory.java rename to src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeCategory.java diff --git a/jei/runicaltar/RunicAltarRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeCategory.java similarity index 100% rename from jei/runicaltar/RunicAltarRecipeCategory.java rename to src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeCategory.java diff --git a/src/main/java/vazkii/botania/client/render/world/SkyblockSkyRenderer.java b/src/main/java/vazkii/botania/client/render/world/SkyblockSkyRenderer.java index d4b48a09c..c8c4c3942 100644 --- a/src/main/java/vazkii/botania/client/render/world/SkyblockSkyRenderer.java +++ b/src/main/java/vazkii/botania/client/render/world/SkyblockSkyRenderer.java @@ -45,14 +45,14 @@ public class SkyblockSkyRenderer implements IRenderHandler { // [VanillaCopy] WorldRenderer.renderSky, overworld section, edits noted @Override - public void render(float partialTicks, ClientWorld world, Minecraft mc) { + public void render(int ticks, float partialTicks, ClientWorld world, Minecraft mc) { // Environment setup int glSkyList = mc.worldRenderer.glSkyList; net.minecraft.client.renderer.vertex.VertexBuffer skyVBO = mc.worldRenderer.skyVBO; // Begin GlStateManager.disableTexture(); - Vec3d vec3d = world.func_217382_a(mc.gameRenderer.getActiveRenderInfo().getBlockPos(), partialTicks); + Vec3d vec3d = world.getSkyColor(mc.gameRenderer.getActiveRenderInfo().getBlockPos(), partialTicks); float f = (float)vec3d.x; float f1 = (float)vec3d.y; float f2 = (float)vec3d.z; diff --git a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringContainer.java b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringContainer.java index 0ad58f47a..a4e772d1d 100644 --- a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringContainer.java +++ b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringContainer.java @@ -25,12 +25,15 @@ import vazkii.botania.common.lib.LibMisc; import net.minecraftforge.items.wrapper.EmptyHandler; import javax.annotation.Nonnull; +import javax.annotation.Nullable; import java.util.Arrays; public class TileRedStringContainer extends TileRedString { @ObjectHolder(LibMisc.MOD_ID + ":" + LibBlockNames.RED_STRING_CONTAINER) public static TileEntityType TYPE; private static final LazyOptional EMPTY = LazyOptional.of(EmptyHandler::new); + @Nullable + private LazyOptional lastBoundInv = null; public TileRedStringContainer() { this(TYPE); @@ -51,16 +54,31 @@ public class TileRedStringContainer extends TileRedString { @Nonnull @Override public LazyOptional getCapability(@Nonnull Capability cap, Direction side) { - // todo 1.13 need to invalidate when binding breaks if(cap == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) { if(getTileAtBinding() != null) { - return getTileAtBinding().getCapability(cap, side); + lastBoundInv = getTileAtBinding().getCapability(cap, side); + return lastBoundInv.cast(); + } else { + invalidateLastCap(); + return EMPTY.cast(); } - return EMPTY.cast(); } return super.getCapability(cap, side); } + private void invalidateLastCap() { + if(lastBoundInv != null) { + lastBoundInv.invalidate(); + lastBoundInv = null; + } + } + + @Override + public void remove() { + super.remove(); + invalidateLastCap(); + } + @Override public void markDirty() { super.markDirty(); diff --git a/src/main/java/vazkii/botania/common/core/loot/LootHandler.java b/src/main/java/vazkii/botania/common/core/loot/LootHandler.java index eadf9e833..08a7f27fa 100644 --- a/src/main/java/vazkii/botania/common/core/loot/LootHandler.java +++ b/src/main/java/vazkii/botania/common/core/loot/LootHandler.java @@ -42,7 +42,7 @@ public final class LootHandler { private static LootEntry.Builder getInjectEntry(String name, int weight) { ResourceLocation table = new ResourceLocation(LibMisc.MOD_ID, "inject/" + name); - return TableLootEntry.func_216171_a(table) + return TableLootEntry.builder(table) .weight(weight); } diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBloodPendant.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBloodPendant.java index 27382366f..578b037da 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBloodPendant.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBloodPendant.java @@ -85,7 +85,7 @@ public class ItemBloodPendant extends ItemBauble implements IBrewContainer, IBre list.add(new TranslationTextComponent("botaniamisc.brewOf", I18n.format(brew.getUnlocalizedName(stack))).applyTextStyle(TextFormatting.LIGHT_PURPLE)); for(EffectInstance effect : brew.getPotionEffects(stack)) { - TextFormatting format = effect.getPotion().type.func_220306_a(); + TextFormatting format = effect.getPotion().type.getColor(); ITextComponent cmp = new TranslationTextComponent(effect.getEffectName()); if(effect.getAmplifier() > 0) { cmp.appendText(" "); diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/bow/ItemLivingwoodBow.java b/src/main/java/vazkii/botania/common/item/equipment/tool/bow/ItemLivingwoodBow.java index e2d98a3e5..f277c60b9 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/bow/ItemLivingwoodBow.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/bow/ItemLivingwoodBow.java @@ -81,7 +81,7 @@ public class ItemLivingwoodBow extends BowItem implements IManaUsingItem { if (entityLiving instanceof PlayerEntity) { PlayerEntity playerentity = (PlayerEntity)entityLiving; boolean flag = canFire(stack, playerentity); // Botania - custom check - ItemStack itemstack = playerentity.func_213356_f(stack); + ItemStack itemstack = playerentity.findAmmo(stack); int i = (int) ((getUseDuration(stack) - timeLeft) * chargeVelocityMultiplier()); // Botania - velocity multiplier i = net.minecraftforge.event.ForgeEventFactory.onArrowLoose(stack, worldIn, playerentity, i, !itemstack.isEmpty() || flag); @@ -148,7 +148,7 @@ public class ItemLivingwoodBow extends BowItem implements IManaUsingItem { boolean canFire(ItemStack stack, PlayerEntity player) { return player.abilities.isCreativeMode || EnchantmentHelper.getEnchantmentLevel(Enchantments.INFINITY, stack) > 0 - || !player.func_213356_f(stack).isEmpty(); + || !player.findAmmo(stack).isEmpty(); } void onFire(ItemStack bow, LivingEntity living, boolean infinity, AbstractArrowEntity arrow) {