Update forge mappings to 20201028-1.16.3 (#7435)

This commit is contained in:
David Quintana authored and GitHub committed 2020-10-29 01:11:57 +01:00
1 parent 6e0e67b14d
commit 53eedb0f10
93 files changed
+598 -588

No files matched your search

@@ -241,10 +241,10 @@ public class ForgeHooksClient
if (status == BETA || status == BETA_OUTDATED)
{
// render a warning at the top of the screen,
ITextComponent line = new TranslationTextComponent("forge.update.beta.1", TextFormatting.RED, TextFormatting.RESET).func_240699_a_(TextFormatting.RED);
AbstractGui.func_238472_a_(mStack, font, line, width / 2, 4 + (0 * (font.FONT_HEIGHT + 1)), -1);
ITextComponent line = new TranslationTextComponent("forge.update.beta.1", TextFormatting.RED, TextFormatting.RESET).mergeStyle(TextFormatting.RED);
AbstractGui.drawCenteredString(mStack, font, line, width / 2, 4 + (0 * (font.FONT_HEIGHT + 1)), -1);
line = new TranslationTextComponent("forge.update.beta.2");
AbstractGui.func_238472_a_(mStack, font, line, width / 2, 4 + (1 * (font.FONT_HEIGHT + 1)), -1);
AbstractGui.drawCenteredString(mStack, font, line, width / 2, 4 + (1 * (font.FONT_HEIGHT + 1)), -1);
}
String line = null;
@@ -280,7 +280,7 @@ public class ForgeHooksClient
public static void drawScreen(Screen screen, MatrixStack mStack, int mouseX, int mouseY, float partialTicks)
{
if (!MinecraftForge.EVENT_BUS.post(new GuiScreenEvent.DrawScreenEvent.Pre(screen, mStack, mouseX, mouseY, partialTicks)))
screen.func_230430_a_(mStack, mouseX, mouseY, partialTicks);
screen.render(mStack, mouseX, mouseY, partialTicks);
MinecraftForge.EVENT_BUS.post(new GuiScreenEvent.DrawScreenEvent.Post(screen, mStack, mouseX, mouseY, partialTicks));
}
@@ -751,7 +751,7 @@ public class ForgeHooksClient
IVertexBuilder ivertexbuilder;
if (fabulous)
{
ivertexbuilder = ItemRenderer.func_239391_c_(bufferIn, rendertype, true, itemStackIn.hasEffect());
ivertexbuilder = ItemRenderer.getEntityGlintVertexBuilder(bufferIn, rendertype, true, itemStackIn.hasEffect());
} else {
ivertexbuilder = ItemRenderer.getBuffer(bufferIn, rendertype, true, itemStackIn.hasEffect());
}
@@ -195,9 +195,9 @@ public enum ForgeRenderTypes
return makeType("forge_item_entity_cutout_mipped", DefaultVertexFormats.ENTITY, 7, 256, true, false, rendertype$state);
}
public static RenderType layeredItemTranslucent(ResourceLocation p_239268_0_) {
public static RenderType layeredItemTranslucent(ResourceLocation locationIn) {
RenderType.State rendertype$state = RenderType.State.getBuilder()
.texture(new RenderState.TextureState(p_239268_0_, false, false))
.texture(new RenderState.TextureState(locationIn, false, false))
.transparency(TRANSLUCENT_TRANSPARENCY)
.diffuseLighting(DIFFUSE_LIGHTING_ENABLED)
.alpha(DEFAULT_ALPHA)
@@ -64,7 +64,7 @@ public class ClientChatReceivedEvent extends Event
/**
* The UUID of the player or entity that sent this message, or null if not known.
* This will be equal to {@link net.minecraft.util.Util#field_240973_b_} for system messages.
* This will be equal to {@link net.minecraft.util.Util#DUMMY_UUID} for system messages.
*/
@Nullable
public UUID getSenderUUID()
@@ -34,7 +34,7 @@ public class FOVUpdateEvent extends Event
{
this.entity = entity;
this.fov = fov;
this.setNewfov(MathHelper.lerp(Minecraft.getInstance().gameSettings.field_243227_aN, 1.0F, fov));
this.setNewfov(MathHelper.lerp(Minecraft.getInstance().gameSettings.fovScaleEffect, 1.0F, fov));
}
public PlayerEntity getEntity()
@@ -106,7 +106,7 @@ public class ForgeIngameGui extends IngameGui
}
@Override
public void func_238445_a_(MatrixStack mStack, float partialTicks)
public void renderIngameGui(MatrixStack mStack, float partialTicks)
{
this.scaledWidth = this.mc.getMainWindow().getScaledWidth();
this.scaledHeight = this.mc.getMainWindow().getScaledHeight();
@@ -146,12 +146,12 @@ public class ForgeIngameGui extends IngameGui
}
else if (!this.mc.gameSettings.hideGUI)
{
if (renderHotbar) func_238443_a_(partialTicks, mStack);
if (renderHotbar) renderHotbar(partialTicks, mStack);
}
if (!this.mc.gameSettings.hideGUI) {
RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F);
func_230926_e_(-90);
setBlitOffset(-90);
rand.setSeed((long)(ticks * 312871));
if (renderCrosshairs) func_238456_d_(mStack);
@@ -169,7 +169,7 @@ public class ForgeIngameGui extends IngameGui
if (renderJumpBar)
{
func_238446_a_(mStack, this.scaledWidth / 2 - 91);
renderHorseJumpBar(mStack, this.scaledWidth / 2 - 91);
}
else if (renderExperiance)
{
@@ -186,7 +186,7 @@ public class ForgeIngameGui extends IngameGui
renderHUDText(this.scaledWidth, this.scaledHeight, mStack);
renderFPSGraph(mStack);
func_238444_a_(mStack);
renderPotionIcons(mStack);
if (!mc.gameSettings.hideGUI) {
renderRecordOverlay(this.scaledWidth, this.scaledHeight, partialTicks, mStack);
renderSubtitles(mStack);
@@ -226,7 +226,7 @@ public class ForgeIngameGui extends IngameGui
protected void func_238456_d_(MatrixStack mStack)
{
if (pre(CROSSHAIRS, mStack)) return;
bind(AbstractGui.field_230665_h_);
bind(AbstractGui.GUI_ICONS_LOCATION);
RenderSystem.enableBlend();
RenderSystem.enableAlphaTest();
super.func_238456_d_(mStack);
@@ -234,10 +234,10 @@ public class ForgeIngameGui extends IngameGui
}
@Override
protected void func_238444_a_(MatrixStack mStack)
protected void renderPotionIcons(MatrixStack mStack)
{
if (pre(POTION_ICONS, mStack)) return;
super.func_238444_a_(mStack);
super.renderPotionIcons(mStack);
post(POTION_ICONS, mStack);
}
@@ -251,7 +251,7 @@ public class ForgeIngameGui extends IngameGui
protected void renderBossHealth(MatrixStack mStack)
{
if (pre(BOSSHEALTH, mStack)) return;
bind(AbstractGui.field_230665_h_);
bind(AbstractGui.GUI_ICONS_LOCATION);
RenderSystem.defaultBlendFunc();
mc.getProfiler().startSection("bossHealth");
RenderSystem.enableBlend();
@@ -283,7 +283,7 @@ public class ForgeIngameGui extends IngameGui
ItemStack itemstack = this.mc.player.inventory.armorItemInSlot(3);
if (this.mc.gameSettings.func_243230_g().func_243192_a() && !itemstack.isEmpty())
if (this.mc.gameSettings.getPointOfView().func_243192_a() && !itemstack.isEmpty())
{
Item item = itemstack.getItem();
if (item == Blocks.CARVED_PUMPKIN.asItem())
@@ -313,15 +313,15 @@ public class ForgeIngameGui extends IngameGui
{
if (i < level)
{
func_238474_b_(mStack, left, top, 34, 9, 9, 9);
blit(mStack, left, top, 34, 9, 9, 9);
}
else if (i == level)
{
func_238474_b_(mStack, left, top, 25, 9, 9, 9);
blit(mStack, left, top, 25, 9, 9, 9);
}
else if (i > level)
{
func_238474_b_(mStack, left, top, 16, 9, 9, 9);
blit(mStack, left, top, 16, 9, 9, 9);
}
left += 8;
}
@@ -349,7 +349,7 @@ public class ForgeIngameGui extends IngameGui
}
@Override
protected void func_238443_a_(float partialTicks, MatrixStack mStack)
protected void renderHotbar(float partialTicks, MatrixStack mStack)
{
if (pre(HOTBAR, mStack)) return;
@@ -359,7 +359,7 @@ public class ForgeIngameGui extends IngameGui
}
else
{
super.func_238443_a_(partialTicks, mStack);
super.renderHotbar(partialTicks, mStack);
}
post(HOTBAR, mStack);
@@ -382,7 +382,7 @@ public class ForgeIngameGui extends IngameGui
for (int i = 0; i < full + partial; ++i)
{
func_238474_b_(mStack, left - i * 8 - 9, top, (i < full ? 16 : 25), 18, 9, 9);
blit(mStack, left - i * 8 - 9, top, (i < full ? 16 : 25), 18, 9, 9);
}
right_height += 10;
}
@@ -394,7 +394,7 @@ public class ForgeIngameGui extends IngameGui
public void renderHealth(int width, int height, MatrixStack mStack)
{
bind(field_230665_h_);
bind(GUI_ICONS_LOCATION);
if (pre(HEALTH, mStack)) return;
mc.getProfiler().startSection("health");
RenderSystem.enableBlend();
@@ -424,7 +424,7 @@ public class ForgeIngameGui extends IngameGui
this.playerHealth = health;
int healthLast = this.lastPlayerHealth;
ModifiableAttributeInstance attrMaxHealth = player.getAttribute(Attributes.field_233818_a_);
ModifiableAttributeInstance attrMaxHealth = player.getAttribute(Attributes.MAX_HEALTH);
float healthMax = (float)attrMaxHealth.getValue();
float absorb = MathHelper.ceil(player.getAbsorptionAmount());
@@ -461,35 +461,35 @@ public class ForgeIngameGui extends IngameGui
if (health <= 4) y += rand.nextInt(2);
if (i == regen) y -= 2;
func_238474_b_(mStack, x, y, BACKGROUND, TOP, 9, 9);
blit(mStack, x, y, BACKGROUND, TOP, 9, 9);
if (highlight)
{
if (i * 2 + 1 < healthLast)
func_238474_b_(mStack, x, y, MARGIN + 54, TOP, 9, 9); //6
blit(mStack, x, y, MARGIN + 54, TOP, 9, 9); //6
else if (i * 2 + 1 == healthLast)
func_238474_b_(mStack, x, y, MARGIN + 63, TOP, 9, 9); //7
blit(mStack, x, y, MARGIN + 63, TOP, 9, 9); //7
}
if (absorbRemaining > 0.0F)
{
if (absorbRemaining == absorb && absorb % 2.0F == 1.0F)
{
func_238474_b_(mStack, x, y, MARGIN + 153, TOP, 9, 9); //17
blit(mStack, x, y, MARGIN + 153, TOP, 9, 9); //17
absorbRemaining -= 1.0F;
}
else
{
func_238474_b_(mStack, x, y, MARGIN + 144, TOP, 9, 9); //16
blit(mStack, x, y, MARGIN + 144, TOP, 9, 9); //16
absorbRemaining -= 2.0F;
}
}
else
{
if (i * 2 + 1 < health)
func_238474_b_(mStack, x, y, MARGIN + 36, TOP, 9, 9); //4
blit(mStack, x, y, MARGIN + 36, TOP, 9, 9); //4
else if (i * 2 + 1 == health)
func_238474_b_(mStack, x, y, MARGIN + 45, TOP, 9, 9); //5
blit(mStack, x, y, MARGIN + 45, TOP, 9, 9); //5
}
}
@@ -533,12 +533,12 @@ public class ForgeIngameGui extends IngameGui
y = top + (rand.nextInt(3) - 1);
}
func_238474_b_(mStack, x, y, 16 + background * 9, 27, 9, 9);
blit(mStack, x, y, 16 + background * 9, 27, 9, 9);
if (idx < level)
func_238474_b_(mStack, x, y, icon + 36, 27, 9, 9);
blit(mStack, x, y, icon + 36, 27, 9, 9);
else if (idx == level)
func_238474_b_(mStack, x, y, icon + 45, 27, 9, 9);
blit(mStack, x, y, icon + 45, 27, 9, 9);
}
RenderSystem.disableBlend();
mc.getProfiler().endSection();
@@ -561,7 +561,7 @@ public class ForgeIngameGui extends IngameGui
}
int color = (int)(220.0F * opacity) << 24 | 1052704;
func_238467_a_(mStack, 0, 0, width, height, color);
fill(mStack, 0, 0, width, height, color);
RenderSystem.enableAlphaTest();
RenderSystem.enableDepthTest();
mc.getProfiler().endSection();
@@ -570,7 +570,7 @@ public class ForgeIngameGui extends IngameGui
protected void renderExperience(int x, MatrixStack mStack)
{
bind(field_230665_h_);
bind(GUI_ICONS_LOCATION);
if (pre(EXPERIENCE, mStack)) return;
RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F);
RenderSystem.disableBlend();
@@ -586,14 +586,14 @@ public class ForgeIngameGui extends IngameGui
}
@Override
public void func_238446_a_(MatrixStack mStack, int x)
public void renderHorseJumpBar(MatrixStack mStack, int x)
{
bind(field_230665_h_);
bind(GUI_ICONS_LOCATION);
if (pre(JUMPBAR, mStack)) return;
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
RenderSystem.disableBlend();
super.func_238446_a_(mStack, x);
super.renderHorseJumpBar(mStack, x);
RenderSystem.enableBlend();
mc.getProfiler().endSection();
@@ -637,8 +637,8 @@ public class ForgeIngameGui extends IngameGui
for (String msg : listL)
{
if (msg == null) continue;
func_238467_a_(mStack, 1, top - 1, 2 + fontrenderer.getStringWidth(msg) + 1, top + fontrenderer.FONT_HEIGHT - 1, -1873784752);
fontrenderer.func_238421_b_(mStack, msg, 2, top, 14737632);
fill(mStack, 1, top - 1, 2 + fontrenderer.getStringWidth(msg) + 1, top + fontrenderer.FONT_HEIGHT - 1, -1873784752);
fontrenderer.drawString(mStack, msg, 2, top, 14737632);
top += fontrenderer.FONT_HEIGHT;
}
@@ -648,8 +648,8 @@ public class ForgeIngameGui extends IngameGui
if (msg == null) continue;
int w = fontrenderer.getStringWidth(msg);
int left = width - 2 - w;
func_238467_a_(mStack, left - 1, top - 1, left + w + 1, top + fontrenderer.FONT_HEIGHT - 1, -1873784752);
fontrenderer.func_238421_b_(mStack, msg, left, top, 14737632);
fill(mStack, left - 1, top - 1, left + w + 1, top + fontrenderer.FONT_HEIGHT - 1, -1873784752);
fontrenderer.drawString(mStack, msg, left, top, 14737632);
top += fontrenderer.FONT_HEIGHT;
}
}
@@ -683,8 +683,8 @@ public class ForgeIngameGui extends IngameGui
RenderSystem.enableBlend();
RenderSystem.defaultBlendFunc();
int color = (animateOverlayMessageColor ? MathHelper.hsvToRGB(hue / 50.0F, 0.7F, 0.6F) & WHITE : WHITE);
func_238448_a_(mStack, fontrenderer, -4, fontrenderer.func_238414_a_(overlayMessage), 16777215 | (opacity << 24));
fontrenderer.func_238422_b_(mStack, overlayMessage.func_241878_f(), -fontrenderer.func_238414_a_(overlayMessage) / 2, -4, color | (opacity << 24));
func_238448_a_(mStack, fontrenderer, -4, fontrenderer.getStringPropertyWidth(overlayMessage), 16777215 | (opacity << 24));
fontrenderer.func_238422_b_(mStack, overlayMessage.func_241878_f(), -fontrenderer.getStringPropertyWidth(overlayMessage) / 2, -4, color | (opacity << 24));
RenderSystem.disableBlend();
RenderSystem.popMatrix();
}
@@ -719,13 +719,13 @@ public class ForgeIngameGui extends IngameGui
RenderSystem.pushMatrix();
RenderSystem.scalef(4.0F, 4.0F, 4.0F);
int l = opacity << 24 & -16777216;
this.getFontRenderer().func_238407_a_(mStack, this.displayedTitle.func_241878_f(), (float)(-this.getFontRenderer().func_238414_a_(this.displayedTitle) / 2), -10.0F, 16777215 | l);
this.getFontRenderer().func_238407_a_(mStack, this.displayedTitle.func_241878_f(), (float)(-this.getFontRenderer().getStringPropertyWidth(this.displayedTitle) / 2), -10.0F, 16777215 | l);
RenderSystem.popMatrix();
if (this.displayedSubTitle != null)
{
RenderSystem.pushMatrix();
RenderSystem.scalef(2.0F, 2.0F, 2.0F);
this.getFontRenderer().func_238407_a_(mStack, this.displayedSubTitle.func_241878_f(), (float)(-this.getFontRenderer().func_238414_a_(this.displayedSubTitle) / 2), 5.0F, 16777215 | l);
this.getFontRenderer().func_238407_a_(mStack, this.displayedSubTitle.func_241878_f(), (float)(-this.getFontRenderer().getStringPropertyWidth(this.displayedSubTitle) / 2), 5.0F, 16777215 | l);
RenderSystem.popMatrix();
}
RenderSystem.disableBlend();
@@ -777,7 +777,7 @@ public class ForgeIngameGui extends IngameGui
Entity tmp = player.getRidingEntity();
if (!(tmp instanceof LivingEntity)) return;
bind(field_230665_h_);
bind(GUI_ICONS_LOCATION);
if (pre(HEALTHMOUNT, mStack)) return;
@@ -808,12 +808,12 @@ public class ForgeIngameGui extends IngameGui
for (int i = 0; i < rowCount; ++i)
{
int x = left_align - i * 8 - 9;
func_238474_b_(mStack, x, top, BACKGROUND, 9, 9, 9);
blit(mStack, x, top, BACKGROUND, 9, 9, 9);
if (i * 2 + 1 + heart < health)
func_238474_b_(mStack, x, top, FULL, 9, 9, 9);
blit(mStack, x, top, FULL, 9, 9, 9);
else if (i * 2 + 1 + heart == health)
func_238474_b_(mStack, x, top, HALF, 9, 9, 9);
blit(mStack, x, top, HALF, 9, 9, 9);
}
right_height += 10;
@@ -52,7 +52,7 @@ public class NotificationModUpdateScreen extends Screen
}
@Override
public void func_231160_c_()
public void init()
{
if (!hasCheckedForUpdates)
{
@@ -66,7 +66,7 @@ public class NotificationModUpdateScreen extends Screen
@SuppressWarnings("deprecation")
@Override
public void func_230430_a_(MatrixStack mStack, int mouseX, int mouseY, float partialTicks)
public void render(MatrixStack mStack, int mouseX, int mouseY, float partialTicks)
{
if (showNotification == null || !showNotification.shouldDraw() || !FMLConfig.runVersionCheck())
{
@@ -76,19 +76,19 @@ public class NotificationModUpdateScreen extends Screen
Minecraft.getInstance().getTextureManager().bindTexture(VERSION_CHECK_ICONS);
RenderSystem.color4f(1, 1, 1, 1);
int x = modButton.field_230690_l_;
int y = modButton.field_230691_m_;
int w = modButton.func_230998_h_();
int h = modButton.func_238483_d_();
int x = modButton.x;
int y = modButton.y;
int w = modButton.getWidth();
int h = modButton.getHeightRealms();
func_238463_a_(mStack, x + w - (h / 2 + 4), y + (h / 2 - 4), showNotification.getSheetOffset() * 8, (showNotification.isAnimated() && ((System.currentTimeMillis() / 800 & 1) == 1)) ? 8 : 0, 8, 8, 64, 16);
blit(mStack, x + w - (h / 2 + 4), y + (h / 2 - 4), showNotification.getSheetOffset() * 8, (showNotification.isAnimated() && ((System.currentTimeMillis() / 800 & 1) == 1)) ? 8 : 0, 8, 8, 64, 16);
}
public static NotificationModUpdateScreen init(MainMenuScreen guiMainMenu, Button modButton)
{
NotificationModUpdateScreen notificationModUpdateScreen = new NotificationModUpdateScreen(modButton);
notificationModUpdateScreen.func_231152_a_(guiMainMenu.getMinecraft(), guiMainMenu.field_230708_k_, guiMainMenu.field_230709_l_);
notificationModUpdateScreen.func_231160_c_();
notificationModUpdateScreen.resize(guiMainMenu.getMinecraft(), guiMainMenu.width, guiMainMenu.height);
notificationModUpdateScreen.init();
return notificationModUpdateScreen;
}
@@ -106,7 +106,7 @@ public abstract class ScrollPanel extends FocusableGui implements IRenderable
}
@Override
public boolean func_231043_a_(double mouseX, double mouseY, double scroll)
public boolean mouseScrolled(double mouseX, double mouseY, double scroll)
{
if (scroll != 0)
{
@@ -123,15 +123,15 @@ public abstract class ScrollPanel extends FocusableGui implements IRenderable
}
@Override
public boolean func_231047_b_(double mouseX, double mouseY)
public boolean isMouseOver(double mouseX, double mouseY)
{
return mouseX >= this.left && mouseX <= this.left + this.width &&
mouseY >= this.top && mouseY <= this.bottom;
}
@Override
public boolean func_231044_a_(double mouseX, double mouseY, int button) {
if (super.func_231044_a_(mouseX, mouseY, button))
public boolean mouseClicked(double mouseX, double mouseY, int button) {
if (super.mouseClicked(mouseX, mouseY, button))
return true;
this.scrolling = button == 0 && mouseX >= barLeft && mouseX < barLeft + barWidth;
@@ -148,8 +148,8 @@ public abstract class ScrollPanel extends FocusableGui implements IRenderable
}
@Override
public boolean func_231048_c_(double p_mouseReleased_1_, double p_mouseReleased_3_, int p_mouseReleased_5_) {
if (super.func_231048_c_(p_mouseReleased_1_, p_mouseReleased_3_, p_mouseReleased_5_))
public boolean mouseReleased(double p_mouseReleased_1_, double p_mouseReleased_3_, int p_mouseReleased_5_) {
if (super.mouseReleased(p_mouseReleased_1_, p_mouseReleased_3_, p_mouseReleased_5_))
return true;
boolean ret = this.scrolling;
this.scrolling = false;
@@ -169,7 +169,7 @@ public abstract class ScrollPanel extends FocusableGui implements IRenderable
}
@Override
public boolean func_231045_a_(double mouseX, double mouseY, int button, double deltaX, double deltaY)
public boolean mouseDragged(double mouseX, double mouseY, int button, double deltaX, double deltaY)
{
if (this.scrolling)
{
@@ -184,7 +184,7 @@ public abstract class ScrollPanel extends FocusableGui implements IRenderable
@SuppressWarnings("deprecation")
@Override
public void func_230430_a_(MatrixStack matrix, int mouseX, int mouseY, float partialTicks)
public void render(MatrixStack matrix, int mouseX, int mouseY, float partialTicks)
{
this.drawBackground();
@@ -204,7 +204,7 @@ public abstract class ScrollPanel extends FocusableGui implements IRenderable
{
RenderSystem.disableLighting();
RenderSystem.disableFog();
this.client.getTextureManager().bindTexture(AbstractGui.field_230663_f_);
this.client.getTextureManager().bindTexture(AbstractGui.BACKGROUND_LOCATION);
RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F);
final float texScale = 32.0F;
worldr.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_COLOR);
@@ -265,7 +265,7 @@ public abstract class ScrollPanel extends FocusableGui implements IRenderable
}
@Override
public List<? extends IGuiEventListener> func_231039_at__()
public List<? extends IGuiEventListener> getEventListeners()
{
return Collections.emptyList();
}
@@ -63,7 +63,7 @@ public class BakedItemModel implements IBakedModel
@Override public boolean isAmbientOcclusion() { return true; }
@Override public boolean isGui3d() { return false; }
@Override public boolean func_230044_c_() { return isSideLit; }
@Override public boolean isSideLit() { return isSideLit; }
@Override public boolean isBuiltInRenderer() { return false; }
@Override public TextureAtlasSprite getParticleTexture() { return particle; }
@Override public ItemOverrideList getOverrides() { return overrides; }
@@ -70,9 +70,9 @@ public abstract class BakedModelWrapper<T extends IBakedModel> implements IBaked
}
@Override
public boolean func_230044_c_()
public boolean isSideLit()
{
return originalModel.func_230044_c_();
return originalModel.isSideLit();
}
@Override
@@ -112,7 +112,7 @@ public class BlockModelConfiguration implements IModelConfiguration
@Override
public boolean isSideLit()
{
return owner.func_230176_c_().func_230178_a_();
return owner.getGuiLight().isSideLit();
}
@Override
@@ -100,7 +100,7 @@ public class CompositeModel implements IDynamicBakedModel
}
@Override
public boolean func_230044_c_()
public boolean isSideLit()
{
return isSideLit;
}
@@ -259,9 +259,9 @@ public final class DynamicBucketModel implements IModelGeometry<DynamicBucketMod
}
@Override
public IBakedModel func_239290_a_(IBakedModel originalModel, ItemStack stack, @Nullable ClientWorld world, @Nullable LivingEntity entity)
public IBakedModel getOverrideModel(IBakedModel originalModel, ItemStack stack, @Nullable ClientWorld world, @Nullable LivingEntity entity)
{
IBakedModel overriden = nested.func_239290_a_(originalModel, stack, world, entity);
IBakedModel overriden = nested.getOverrideModel(originalModel, stack, world, entity);
if (overriden != originalModel) return overriden;
return FluidUtil.getFluidContained(stack)
.map(fluidStack -> {
@@ -439,7 +439,7 @@ public final class FluidModel implements IModelGeometry<FluidModel>
}
@Override
public boolean func_230044_c_()
public boolean isSideLit()
{
return false;
}
@@ -88,7 +88,7 @@ public class ItemMultiLayerBakedModel implements IDynamicBakedModel
}
@Override
public boolean func_230044_c_()
public boolean isSideLit()
{
return sideLit;
}
@@ -182,7 +182,7 @@ public final class MultiLayerModel implements IModelGeometry<MultiLayerModel>
}
@Override
public boolean func_230044_c_()
public boolean isSideLit()
{
return isSideLit;
}
@@ -245,7 +245,7 @@ public final class MultiLayerModel implements IModelGeometry<MultiLayerModel>
.put("cutout", RenderType.getCutout())
.put("cutout_mipped", RenderType.getCutoutMipped())
.put("translucent", RenderType.getTranslucent())
.put("tripwire", RenderType.func_241715_r_())
.put("tripwire", RenderType.getTripwire())
.build();
public static final Loader INSTANCE = new Loader();
@@ -128,7 +128,7 @@ public class PerspectiveMapWrapper implements IDynamicBakedModel
@Override public boolean isAmbientOcclusion() { return parent.isAmbientOcclusion(); }
@Override public boolean isAmbientOcclusion(BlockState state) { return parent.isAmbientOcclusion(state); }
@Override public boolean isGui3d() { return parent.isGui3d(); }
@Override public boolean func_230044_c_() { return parent.func_230044_c_(); }
@Override public boolean isSideLit() { return parent.isSideLit(); }
@Override public boolean isBuiltInRenderer() { return parent.isBuiltInRenderer(); }
@Override public TextureAtlasSprite getParticleTexture() { return parent.getParticleTexture(); }
@SuppressWarnings("deprecation")
@@ -165,9 +165,9 @@ public class PerspectiveMapWrapper implements IDynamicBakedModel
@Nullable
@Override
public IBakedModel func_239290_a_(IBakedModel model, ItemStack stack, @Nullable ClientWorld worldIn, @Nullable LivingEntity entityIn)
public IBakedModel getOverrideModel(IBakedModel model, ItemStack stack, @Nullable ClientWorld worldIn, @Nullable LivingEntity entityIn)
{
model = parent.getOverrides().func_239290_a_(parent, stack, worldIn, entityIn);
model = parent.getOverrides().getOverrideModel(parent, stack, worldIn, entityIn);
return new PerspectiveMapWrapper(model, transforms);
}
@@ -176,7 +176,7 @@ public class QuadTransformer
int[] outData = Arrays.copyOf(inData, inData.length);
processVertices(inData, outData);
return new BakedQuad(outData, input.getTintIndex(), input.getFace(), input.func_187508_a(), input.func_239287_f_());
return new BakedQuad(outData, input.getTintIndex(), input.getFace(), input.getSprite(), input.applyDiffuseLighting());
}
/**
@@ -208,7 +208,7 @@ public class QuadTransformer
int[] outData = Arrays.copyOf(inData, inData.length);
processVertices(inData, outData);
outputs.add(new BakedQuad(outData, input.getTintIndex(), input.getFace(), input.func_187508_a(), input.func_239287_f_()));
outputs.add(new BakedQuad(outData, input.getTintIndex(), input.getFace(), input.getSprite(), input.applyDiffuseLighting()));
}
return outputs;
}
@@ -113,7 +113,7 @@ public class SeparatePerspectiveModel implements IModelGeometry<SeparatePerspect
}
@Override
public boolean func_230044_c_()
public boolean isSideLit()
{
return isSideLit;
}
@@ -63,7 +63,7 @@ public final class AnimationItemOverrideList extends ItemOverrideList
@SuppressWarnings("resource")
@Override
public IBakedModel func_239290_a_(IBakedModel originalModel, ItemStack stack, @Nullable ClientWorld world, @Nullable LivingEntity entity)
public IBakedModel getOverrideModel(IBakedModel originalModel, ItemStack stack, @Nullable ClientWorld world, @Nullable LivingEntity entity)
{
return stack.getCapability(CapabilityAnimation.ANIMATION_CAPABILITY, null)
.map(asm ->
@@ -82,6 +82,6 @@ public final class AnimationItemOverrideList extends ItemOverrideList
})
// TODO where should uvlock data come from?
.map(state -> model.bakeModel(bakery, bakedTextureGetter, new ModelTransformComposition(state, this.state), modelLoc))
.orElseGet(() -> super.func_239290_a_(originalModel, stack, world, entity));
.orElseGet(() -> super.getOverrideModel(originalModel, stack, world, entity));
}
}
@@ -800,7 +800,7 @@ public enum B3DLoader implements ISelectiveResourceReloadListener
}
@Override
public boolean func_230044_c_()
public boolean isSideLit()
{
return isSideLit;
}
@@ -425,10 +425,10 @@ public abstract class BlockStateProvider implements IDataProvider {
}
public static final ImmutableMap<Direction, Property<WallHeight>> WALL_PROPS = ImmutableMap.<Direction, Property<WallHeight>>builder()
.put(Direction.EAST, BlockStateProperties.field_235908_S_)
.put(Direction.NORTH, BlockStateProperties.field_235909_T_)
.put(Direction.SOUTH, BlockStateProperties.field_235910_U_)
.put(Direction.WEST, BlockStateProperties.field_235911_V_)
.put(Direction.EAST, BlockStateProperties.WALL_HEIGHT_EAST)
.put(Direction.NORTH, BlockStateProperties.WALL_HEIGHT_NORTH)
.put(Direction.SOUTH, BlockStateProperties.WALL_HEIGHT_SOUTH)
.put(Direction.WEST, BlockStateProperties.WALL_HEIGHT_WEST)
.build();
public void wallBlock(WallBlock block, ModelFile post, ModelFile side, ModelFile sideTall) {
@@ -249,7 +249,7 @@ public class ModelBuilder<T extends ModelBuilder<T>> extends ModelFile {
if (part.partRotation != null) {
JsonObject rotation = new JsonObject();
rotation.add("origin", serializeVector3f(part.partRotation.origin));
rotation.addProperty("axis", part.partRotation.axis.func_176610_l());
rotation.addProperty("axis", part.partRotation.axis.getString());
rotation.addProperty("angle", part.partRotation.angle);
if (part.partRotation.rescale) {
rotation.addProperty("rescale", part.partRotation.rescale);
@@ -272,7 +272,7 @@ public class ModelBuilder<T extends ModelBuilder<T>> extends ModelFile {
faceObj.add("uv", new Gson().toJsonTree(face.blockFaceUV.uvs));
}
if (face.cullFace != null) {
faceObj.addProperty("cullface", face.cullFace.func_176610_l());
faceObj.addProperty("cullface", face.cullFace.getString());
}
if (face.blockFaceUV.rotation != 0) {
faceObj.addProperty("rotation", face.blockFaceUV.rotation);
@@ -280,7 +280,7 @@ public class ModelBuilder<T extends ModelBuilder<T>> extends ModelFile {
if (face.tintIndex != -1) {
faceObj.addProperty("tintindex", face.tintIndex);
}
faces.add(dir.func_176610_l(), faceObj);
faces.add(dir.getString(), faceObj);
}
if (!part.mapFaces.isEmpty()) {
partObj.add("faces", faces);
@@ -87,13 +87,13 @@ public class LightUtil
public static void putBakedQuad(IVertexConsumer consumer, BakedQuad quad)
{
consumer.setTexture(quad.func_187508_a());
consumer.setTexture(quad.getSprite());
consumer.setQuadOrientation(quad.getFace());
if(quad.hasTintIndex())
{
consumer.setQuadTint(quad.getTintIndex());
}
consumer.setApplyDiffuseLighting(quad.func_239287_f_());
consumer.setApplyDiffuseLighting(quad.applyDiffuseLighting());
float[] data = new float[4];
VertexFormat formatFrom = consumer.getVertexFormat();
VertexFormat formatTo = DefaultVertexFormats.BLOCK;
@@ -51,7 +51,7 @@ public enum KeyModifier {
@Override
public boolean isActive(@Nullable IKeyConflictContext conflictContext)
{
return Screen.func_231172_r_();
return Screen.hasControlDown();
}
@Override
@@ -71,7 +71,7 @@ public enum KeyModifier {
@Override
public boolean isActive(@Nullable IKeyConflictContext conflictContext)
{
return Screen.func_231173_s_();
return Screen.hasShiftDown();
}
@Override
@@ -90,7 +90,7 @@ public enum KeyModifier {
@Override
public boolean isActive(@Nullable IKeyConflictContext conflictContext)
{
return Screen.func_231174_t_();
return Screen.hasAltDown();
}
@Override