Update to 1.15.2

This commit is contained in:
Vincent Lee committed 2020-01-31 12:06:11 -06:00
1 parent d66058f661
commit 9d7e8b5c2f
10 files changed
+30 -50

No files matched your search

@@ -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
@@ -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();
@@ -31,8 +31,8 @@ public class ShaderWrappedRenderLayer extends RenderType {
}
@Override
public Optional<RenderType> getTexture() {
return delegate.getTexture();
public Optional<RenderType> getAffectedOutline() {
return delegate.getAffectedOutline();
}
@Override
@@ -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<Pair<Item, Boolean>, 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);
}
@@ -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(); }
@@ -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<IBakedModel> {
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();
}
}
@@ -95,7 +95,7 @@ public class RenderDoppleganger extends BipedRenderer<EntityDoppleganger, BipedM
}
@Override
protected boolean func_225622_a_(EntityDoppleganger dopple, boolean fallback) {
protected boolean func_225622_a_(EntityDoppleganger dopple) {
return true;
}
@@ -93,7 +93,7 @@ public class BlockAltar extends BlockMod {
}
@Override
public int getLightValue(@Nonnull BlockState state, ILightReader world, @Nonnull BlockPos pos) {
public int getLightValue(@Nonnull BlockState state, IBlockReader world, @Nonnull BlockPos pos) {
TileEntity te = world.getTileEntity(pos);
if (te instanceof TileAltar && ((TileAltar) te).getFluid() == Fluids.LAVA) {
return 15;
@@ -828,18 +828,18 @@ public final class ModBlocks {
@OnlyIn(Dist.CLIENT)
private static Void registerWithTEISRS(IForgeRegistry<Item> 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;
}