diff --git a/build.gradle b/build.gradle index 4f0be7c5b..c75bfd2e8 100644 --- a/build.gradle +++ b/build.gradle @@ -24,7 +24,7 @@ ext.configFile = file('build.properties') ext.config = parseConfig(configFile) ext.priv = parseConfig(file('private.properties')) -def mc_version = "1.15.1" +def mc_version = "1.15.2" version = "${config.version}-${config.build_number}" group = "vazkii.botania" // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = config.mod_name @@ -32,7 +32,7 @@ archivesBaseName = config.mod_name sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8' minecraft { - mappings channel: 'snapshot', version: "20200115-mixed-1.15.1" + mappings channel: 'snapshot', version: "20200123-mixed-1.15.2" accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg') runs { client { @@ -96,14 +96,14 @@ repositories { } dependencies { - minecraft "net.minecraftforge:forge:${mc_version}-30.0.41" - compile fg.deobf("vazkii.patchouli:Patchouli:1.1-25.4") { transitive = false } + minecraft "net.minecraftforge:forge:${mc_version}-31.0.14" + compile fg.deobf("vazkii.patchouli:Patchouli:1.15.2-1.1-25.10") { transitive = false } - compileOnly fg.deobf("mezz.jei:jei-1.15.1:6.0.0.1:api") - runtimeOnly fg.deobf("mezz.jei:jei-1.15.1:6.0.0.1") + compileOnly fg.deobf("mezz.jei:jei-1.15.2:6.0.0.2:api") + runtimeOnly fg.deobf("mezz.jei:jei-1.15.2:6.0.0.2") - compileOnly fg.deobf("top.theillusivec4.curios:curios:FORGE-1.15.1-2.0-beta:api") - runtimeOnly fg.deobf("top.theillusivec4.curios:curios:FORGE-1.15.1-2.0-beta") + compileOnly fg.deobf("top.theillusivec4.curios:curios:FORGE-1.15.2-2.0-beta2:api") + runtimeOnly fg.deobf("top.theillusivec4.curios:curios:FORGE-1.15.2-2.0-beta2") } if (System.getenv().BUILD_NUMBER != null) { 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 636ac8ec1..8b97d56ec 100644 --- a/src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java +++ b/src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java @@ -15,7 +15,7 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.MathHelper; import net.minecraft.util.text.TextFormatting; import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.client.event.RenderSpecificHandEvent; +import net.minecraftforge.client.event.RenderHandEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; import vazkii.botania.client.lib.LibResources; @@ -48,7 +48,7 @@ public class RenderLexicon { private static int quote = -1; @SubscribeEvent - public static void renderItem(RenderSpecificHandEvent evt) { + public static void renderItem(RenderHandEvent evt) { Minecraft mc = Minecraft.getInstance(); if(!ConfigHandler.CLIENT.lexicon3dModel.get() || mc.gameSettings.thirdPersonView != 0 diff --git a/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java b/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java index dbb781c98..88eb70cbb 100644 --- a/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java +++ b/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java @@ -313,7 +313,7 @@ public final class RenderHelper { IVertexBuilder ivertexbuilder = ItemRenderer.getArmorVertexConsumer(buffers, rendertype, true, stack.hasEffect()); renderBakedItemModel(model, stack, color, light, overlay, ms, ivertexbuilder); } else { - stack.getItem().getTileEntityItemStackRenderer().render(stack, ms, buffers, light, overlay); + stack.getItem().getItemStackTileEntityRenderer().render(stack, ms, buffers, light, overlay); } ms.pop(); diff --git a/src/main/java/vazkii/botania/client/core/helper/ShaderWrappedRenderLayer.java b/src/main/java/vazkii/botania/client/core/helper/ShaderWrappedRenderLayer.java index 1877df50c..32e4b1850 100644 --- a/src/main/java/vazkii/botania/client/core/helper/ShaderWrappedRenderLayer.java +++ b/src/main/java/vazkii/botania/client/core/helper/ShaderWrappedRenderLayer.java @@ -31,8 +31,8 @@ public class ShaderWrappedRenderLayer extends RenderType { } @Override - public Optional getTexture() { - return delegate.getTexture(); + public Optional getAffectedOutline() { + return delegate.getAffectedOutline(); } @Override diff --git a/src/main/java/vazkii/botania/client/model/GunModel.java b/src/main/java/vazkii/botania/client/model/GunModel.java index 5ddfda2db..ded5dfd84 100644 --- a/src/main/java/vazkii/botania/client/model/GunModel.java +++ b/src/main/java/vazkii/botania/client/model/GunModel.java @@ -91,6 +91,7 @@ public class GunModel implements IBakedModel { @Override public boolean isBuiltInRenderer() { return originalModel.isBuiltInRenderer(); } @Nonnull @Override public TextureAtlasSprite getParticleTexture() { return originalModel.getParticleTexture(); } @Nonnull @Override public ItemCameraTransforms getItemCameraTransforms() { return originalModel.getItemCameraTransforms(); } + @Override public boolean isSideLit() { return originalModel.isSideLit(); } private final HashMap, CompositeBakedModel> cache = new HashMap<>(); @@ -116,7 +117,7 @@ public class GunModel implements IBakedModel { BlockModel bm = (BlockModel) lensUnbaked; lensBaked = new ItemModelGenerator() .makeItemModel(ModelLoader.defaultTextureGetter(), bm) - .bake(bakery, bm, ModelLoader.defaultTextureGetter(), transform, name); + .bake(bakery, bm, ModelLoader.defaultTextureGetter(), transform, name, false); } else { lensBaked = lensUnbaked.bake(bakery, ModelLoader.defaultTextureGetter(), transform, name); } diff --git a/src/main/java/vazkii/botania/client/model/LexiconModel.java b/src/main/java/vazkii/botania/client/model/LexiconModel.java index 9e7de5b94..6293507fb 100644 --- a/src/main/java/vazkii/botania/client/model/LexiconModel.java +++ b/src/main/java/vazkii/botania/client/model/LexiconModel.java @@ -37,6 +37,7 @@ public class LexiconModel implements IBakedModel { @Override public boolean isAmbientOcclusion() { return false; } @Override public boolean isGui3d() { return false; } @Override public boolean isBuiltInRenderer() { return false; } + @Override public boolean isSideLit() { return original.isSideLit(); } @Nonnull @Override public TextureAtlasSprite getParticleTexture() { return original.getParticleTexture(); } @SuppressWarnings("deprecation") @Nonnull @Override public ItemCameraTransforms getItemCameraTransforms() { return ItemCameraTransforms.DEFAULT; } @Nonnull @Override public ItemOverrideList getOverrides() { return original.getOverrides(); } diff --git a/src/main/java/vazkii/botania/client/model/PlatformModel.java b/src/main/java/vazkii/botania/client/model/PlatformModel.java index 600a376a6..a0d1f455d 100644 --- a/src/main/java/vazkii/botania/client/model/PlatformModel.java +++ b/src/main/java/vazkii/botania/client/model/PlatformModel.java @@ -15,14 +15,11 @@ import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.RenderTypeLookup; import net.minecraft.client.renderer.model.BakedQuad; import net.minecraft.client.renderer.model.IBakedModel; -import net.minecraft.client.renderer.model.ItemCameraTransforms; -import net.minecraft.client.renderer.model.ItemOverrideList; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; import net.minecraftforge.client.MinecraftForgeClient; +import net.minecraftforge.client.model.BakedModelWrapper; import net.minecraftforge.client.model.data.EmptyModelData; -import net.minecraftforge.client.model.data.IDynamicBakedModel; import net.minecraftforge.client.model.data.IModelData; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.BlockPlatform; @@ -32,11 +29,9 @@ import javax.annotation.Nonnull; import java.util.List; import java.util.Random; -public class PlatformModel implements IDynamicBakedModel { - private final IBakedModel original; - +public class PlatformModel extends BakedModelWrapper { public PlatformModel(IBakedModel original) { - this.original = original; + super(original); } @Nonnull @@ -63,7 +58,7 @@ public class PlatformModel implements IDynamicBakedModel { Minecraft mc = Minecraft.getInstance(); if(heldState == null && layer == RenderType.getSolid()) { // No camo - return original.getQuads(state, side, rand, data); + return originalModel.getQuads(state, side, rand, data); } else if(heldState != null) { // Some people used this to get an invisible block in the past, accommodate that. @@ -81,21 +76,4 @@ public class PlatformModel implements IDynamicBakedModel { return ImmutableList.of(); // Nothing renders } - @Override public boolean isAmbientOcclusion() { - return original.isAmbientOcclusion(); - } - @Override public boolean isGui3d() { - return original.isGui3d(); - } - @Override public boolean isBuiltInRenderer() { - return original.isBuiltInRenderer(); - } - @Nonnull @Override public TextureAtlasSprite getParticleTexture() { return original.getParticleTexture(); } - @Nonnull @Override public ItemCameraTransforms getItemCameraTransforms() { - return original.getItemCameraTransforms(); - } - @Nonnull @Override public ItemOverrideList getOverrides() { - return original.getOverrides(); - } - } diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderDoppleganger.java b/src/main/java/vazkii/botania/client/render/entity/RenderDoppleganger.java index 4a39f4615..4e0cba82c 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderDoppleganger.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderDoppleganger.java @@ -95,7 +95,7 @@ public class RenderDoppleganger extends BipedRenderer r) { - Item.Properties pylonProps = ModItems.defaultBuilder().setTEISR(() -> () -> new RenderTilePylon.TEISR()); + Item.Properties pylonProps = ModItems.defaultBuilder().setISTER(() -> () -> new RenderTilePylon.TEISR()); register(r, new BlockItem(manaPylon, pylonProps), manaPylon.getRegistryName()); register(r, new BlockItem(naturaPylon, pylonProps), naturaPylon.getRegistryName()); register(r, new BlockItem(gaiaPylon, pylonProps), gaiaPylon.getRegistryName()); - register(r, new BlockItem(teruTeruBozu, ModItems.defaultBuilder().setTEISR(() -> () -> new TEISR(teruTeruBozu))), teruTeruBozu.getRegistryName()); - register(r, new BlockItem(avatar, ModItems.defaultBuilder().setTEISR(() -> () -> new TEISR(avatar))), avatar.getRegistryName()); - register(r, new BlockItem(bellows, ModItems.defaultBuilder().setTEISR(() -> () -> new TEISR(bellows))), bellows.getRegistryName()); - register(r, new BlockItem(brewery, ModItems.defaultBuilder().setTEISR(() -> () -> new TEISR(brewery))), brewery.getRegistryName()); - register(r, new BlockItem(corporeaIndex, ModItems.defaultBuilder().setTEISR(() -> () -> new TEISR(corporeaIndex))), corporeaIndex.getRegistryName()); - register(r, new BlockItem(hourglass, ModItems.defaultBuilder().setTEISR(() -> () -> new TEISR(hourglass))), hourglass.getRegistryName()); - Item head = new ItemGaiaHead(gaiaHead, gaiaHeadWall, ModItems.defaultBuilder().rarity(Rarity.UNCOMMON).setTEISR(() -> () -> new TEISR(gaiaHead))); + register(r, new BlockItem(teruTeruBozu, ModItems.defaultBuilder().setISTER(() -> () -> new TEISR(teruTeruBozu))), teruTeruBozu.getRegistryName()); + register(r, new BlockItem(avatar, ModItems.defaultBuilder().setISTER(() -> () -> new TEISR(avatar))), avatar.getRegistryName()); + register(r, new BlockItem(bellows, ModItems.defaultBuilder().setISTER(() -> () -> new TEISR(bellows))), bellows.getRegistryName()); + register(r, new BlockItem(brewery, ModItems.defaultBuilder().setISTER(() -> () -> new TEISR(brewery))), brewery.getRegistryName()); + register(r, new BlockItem(corporeaIndex, ModItems.defaultBuilder().setISTER(() -> () -> new TEISR(corporeaIndex))), corporeaIndex.getRegistryName()); + register(r, new BlockItem(hourglass, ModItems.defaultBuilder().setISTER(() -> () -> new TEISR(hourglass))), hourglass.getRegistryName()); + Item head = new ItemGaiaHead(gaiaHead, gaiaHeadWall, ModItems.defaultBuilder().rarity(Rarity.UNCOMMON).setISTER(() -> () -> new TEISR(gaiaHead))); register(r, head, gaiaHead.getRegistryName()); return null; }