mirror of
https://github.com/GTNewHorizons/Botania.git
synced 2026-11-17 02:45:13 +00:00
Book fixes + other random fixes
This commit is contained in:
1 parent
efc5d5c2ee
commit
9cda2d5e87
21 files changed
+143
-205
No files matched your search
@@ -337,7 +337,7 @@ public final class LexiconData {
|
||||
new PageText("12"), new PageCraftingRecipe("11", ModCraftingRecipes.recipesPetalsDouble),
|
||||
new PageCraftingRecipe("9", ModCraftingRecipes.recipesPetalBlocks),
|
||||
new PageCraftingRecipe("13", ModCraftingRecipes.recipesReversePetalBlocks))
|
||||
.setIcon(new ItemStack(ModBlocks.flower, 1, 6));
|
||||
.setIcon(new ItemStack(ModBlocks.pinkFlower));
|
||||
|
||||
apothecary = new BasicLexiconEntry(LibLexicon.BASICS_APOTHECARY, categoryBasics);
|
||||
apothecary.setPriority().setLexiconPages(new PageText("0"), new PageImage("1", LibResources.ENTRY_APOTHECARY),
|
||||
@@ -543,7 +543,7 @@ public final class LexiconData {
|
||||
|
||||
flowerSpeed = new BasicLexiconEntry(LibLexicon.FFLOWER_SPEED, categoryFunctionalFlowers);
|
||||
flowerSpeed.setPriority().setLexiconPages(new PageText("0"), new PageText("1"));
|
||||
flowerSpeed.setIcon(new ItemStack(Blocks.DIRT, 1, 2));
|
||||
flowerSpeed.setIcon(new ItemStack(Blocks.PODZOL));
|
||||
|
||||
jadedAmaranthus = new BasicLexiconEntry(LibLexicon.FFLOWER_JADED_AMARANTHUS, categoryFunctionalFlowers);
|
||||
jadedAmaranthus.setLexiconPages(new PageText("0"),
|
||||
|
||||
@@ -33,8 +33,8 @@ public class RelicLexiconEntry extends BasicLexiconEntry {
|
||||
@Override
|
||||
@OnlyIn(Dist.CLIENT)
|
||||
public boolean isVisible() {
|
||||
EntityPlayerSP player = Minecraft.getMinecraft().player;
|
||||
if(advancement == null || player.capabilities.isCreativeMode) {
|
||||
EntityPlayerSP player = Minecraft.getInstance().player;
|
||||
if(advancement == null || player.abilities.isCreativeMode) {
|
||||
return true;
|
||||
} else {
|
||||
Advancement adv = player.connection.getAdvancementManager().getAdvancementList().getAdvancement(advancement);
|
||||
|
||||
@@ -50,7 +50,7 @@ public class PageBrew extends PageRecipe implements ITwoNamedPage {
|
||||
int y = gui.getTop() + 12;
|
||||
|
||||
Brew brew = recipe.getBrew();
|
||||
FontRenderer renderer = Minecraft.getMinecraft().fontRenderer;
|
||||
FontRenderer renderer = Minecraft.getInstance().fontRenderer;
|
||||
boolean unicode = renderer.getUnicodeFlag();
|
||||
renderer.setUnicodeFlag(true);
|
||||
String s = TextFormatting.BOLD + I18n.format("botaniamisc.brewOf", I18n.format(brew.getUnlocalizedName()));
|
||||
@@ -58,7 +58,7 @@ public class PageBrew extends PageRecipe implements ITwoNamedPage {
|
||||
renderer.setUnicodeFlag(unicode);
|
||||
PageText.renderText(x, y + 22, width, height, text);
|
||||
|
||||
ItemStack book = PlayerHelper.getFirstHeldItemClass(Minecraft.getMinecraft().player, ILexicon.class);
|
||||
ItemStack book = PlayerHelper.getFirstHeldItemClass(Minecraft.getInstance().player, ILexicon.class);
|
||||
if(book != null && ((ILexicon) book.getItem()).isKnowledgeUnlocked(book, BotaniaAPI.elvenKnowledge)) {
|
||||
renderItemAtLinePos(gui, 20, 2, y + 12, recipe.getOutput(new ItemStack(ModItems.vial)));
|
||||
renderItemAtLinePos(gui, 20, 3, y + 12, recipe.getOutput(new ItemStack(ModItems.flask)));
|
||||
@@ -84,18 +84,10 @@ public class PageBrew extends PageRecipe implements ITwoNamedPage {
|
||||
public void renderItemAtLinePos(IGuiLexiconEntry gui, int offset, int pos, int yPos, ItemStack stack) {
|
||||
if(stack.isEmpty())
|
||||
return;
|
||||
stack = stack.copy();
|
||||
|
||||
if(stack.getItemDamage() == Short.MAX_VALUE)
|
||||
stack.setItemDamage(0);
|
||||
|
||||
int xPos = gui.getLeft() + (pos == -1 ? gui.getWidth() / 2 - 8 : pos * 18) + offset;
|
||||
|
||||
ItemStack stack1 = stack.copy();
|
||||
if(stack1.getItemDamage() == -1)
|
||||
stack1.setItemDamage(0);
|
||||
|
||||
renderItem(gui, xPos, yPos, stack1, false);
|
||||
renderItem(gui, xPos, yPos, stack, false);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -18,7 +18,9 @@ import net.minecraft.client.resources.I18n;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.item.crafting.IRecipe;
|
||||
import net.minecraft.item.crafting.Ingredient;
|
||||
import net.minecraft.item.crafting.ShapedRecipe;
|
||||
import net.minecraft.item.crafting.ShapedRecipes;
|
||||
import net.minecraft.item.crafting.ShapelessRecipe;
|
||||
import net.minecraft.item.crafting.ShapelessRecipes;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraftforge.fml.common.registry.ForgeRegistries;
|
||||
@@ -49,7 +51,7 @@ public class PageCraftingRecipe extends PageRecipe {
|
||||
int ticksElapsed = 0;
|
||||
int recipeAt = 0;
|
||||
|
||||
boolean oreDictRecipe, shapelessRecipe;
|
||||
boolean shapelessRecipe;
|
||||
|
||||
public PageCraftingRecipe(String unlocalizedName, List<ResourceLocation> recipes) {
|
||||
super(unlocalizedName);
|
||||
@@ -77,17 +79,17 @@ public class PageCraftingRecipe extends PageRecipe {
|
||||
@Override
|
||||
@OnlyIn(Dist.CLIENT)
|
||||
public void renderRecipe(IGuiLexiconEntry gui, int mx, int my) {
|
||||
oreDictRecipe = shapelessRecipe = false;
|
||||
shapelessRecipe = false;
|
||||
|
||||
IRecipe recipe = ForgeRegistries.RECIPES.getValue(recipes.get(recipeAt));
|
||||
renderCraftingRecipe(gui, recipe);
|
||||
|
||||
TextureManager render = Minecraft.getMinecraft().renderEngine;
|
||||
TextureManager render = Minecraft.getInstance().textureManager;
|
||||
render.bindTexture(craftingOverlay);
|
||||
|
||||
GlStateManager.enableBlend();
|
||||
GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
|
||||
GlStateManager.color(1F, 1F, 1F, 1F);
|
||||
GlStateManager.color4f(1F, 1F, 1F, 1F);
|
||||
((GuiScreen) gui).drawTexturedModalRect(gui.getLeft(), gui.getTop(), 0, 0, gui.getWidth(), gui.getHeight());
|
||||
|
||||
int iconX = gui.getLeft() + 115;
|
||||
@@ -106,15 +108,6 @@ public class PageCraftingRecipe extends PageRecipe {
|
||||
}
|
||||
|
||||
render.bindTexture(craftingOverlay);
|
||||
GlStateManager.enableBlend();
|
||||
|
||||
if(oreDictRecipe) {
|
||||
((GuiScreen) gui).drawTexturedModalRect(iconX, iconY, 240, 16, 16, 16);
|
||||
|
||||
if(mx >= iconX && my >= iconY && mx < iconX + 16 && my < iconY + 16)
|
||||
RenderHelper.renderTooltip(mx, my, Collections.singletonList(I18n.format("botaniamisc.oredict")));
|
||||
}
|
||||
GlStateManager.disableBlend();
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -137,27 +130,21 @@ public class PageCraftingRecipe extends PageRecipe {
|
||||
if(recipe == null)
|
||||
return;
|
||||
|
||||
if(recipe instanceof ShapedRecipes || recipe instanceof ShapedOreRecipe) {
|
||||
oreDictRecipe = recipe instanceof ShapedOreRecipe;
|
||||
if(recipe instanceof ShapedRecipe) {
|
||||
|
||||
int width = oreDictRecipe
|
||||
? ReflectionHelper.getPrivateValue(ShapedOreRecipe.class, (ShapedOreRecipe) recipe, "width")
|
||||
: ((ShapedRecipes) recipe).getWidth();
|
||||
int height = oreDictRecipe
|
||||
? ReflectionHelper.getPrivateValue(ShapedOreRecipe.class, (ShapedOreRecipe) recipe, "height")
|
||||
: ((ShapedRecipes) recipe).getHeight();
|
||||
int width = ((ShapedRecipe) recipe).getWidth();
|
||||
int height = ((ShapedRecipe) recipe).getHeight();
|
||||
|
||||
for(int y = 0; y < height; y++)
|
||||
for(int x = 0; x < width; x++) {
|
||||
Ingredient input = recipe.getIngredients().get(y * width + x);
|
||||
ItemStack[] stacks = input.getMatchingStacks();
|
||||
if(stacks.length > 0) {
|
||||
renderItemAtGridPos(gui, 1 + x, 1 + y, stacks[(ticksElapsed / 40) % stacks.length], true);
|
||||
}
|
||||
}
|
||||
} else if(recipe instanceof ShapelessRecipes || recipe instanceof ShapelessOreRecipe) {
|
||||
for(int y = 0; y < height; y++)
|
||||
for(int x = 0; x < width; x++) {
|
||||
Ingredient input = recipe.getIngredients().get(y * width + x);
|
||||
ItemStack[] stacks = input.getMatchingStacks();
|
||||
if(stacks.length > 0) {
|
||||
renderItemAtGridPos(gui, 1 + x, 1 + y, stacks[(ticksElapsed / 40) % stacks.length], true);
|
||||
}
|
||||
}
|
||||
} else if(recipe instanceof ShapelessRecipe) {
|
||||
shapelessRecipe = true;
|
||||
oreDictRecipe = recipe instanceof ShapelessOreRecipe;
|
||||
|
||||
drawGrid : {
|
||||
for(int y = 0; y < 3; y++)
|
||||
|
||||
@@ -27,9 +27,9 @@ public class PageElvenRecipe extends PageRecipe {
|
||||
|
||||
private static final ResourceLocation elvenTradeOverlay = new ResourceLocation(LibResources.GUI_ELVEN_TRADE_OVERLAY);
|
||||
|
||||
final List<RecipeElvenTrade> recipes;
|
||||
int ticksElapsed = 0;
|
||||
int recipeAt = 0;
|
||||
private final List<RecipeElvenTrade> recipes;
|
||||
private int ticksElapsed = 0;
|
||||
private int recipeAt = 0;
|
||||
|
||||
public PageElvenRecipe(String unlocalizedName, List<RecipeElvenTrade> recipes) {
|
||||
super(unlocalizedName);
|
||||
@@ -51,11 +51,11 @@ public class PageElvenRecipe extends PageRecipe {
|
||||
@OnlyIn(Dist.CLIENT)
|
||||
public void renderRecipe(IGuiLexiconEntry gui, int mx, int my) {
|
||||
RecipeElvenTrade recipe = recipes.get(recipeAt);
|
||||
TextureManager render = Minecraft.getMinecraft().renderEngine;
|
||||
TextureManager render = Minecraft.getInstance().textureManager;
|
||||
render.bindTexture(elvenTradeOverlay);
|
||||
GlStateManager.enableBlend();
|
||||
GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
|
||||
GlStateManager.color(1F, 1F, 1F, 1F);
|
||||
GlStateManager.color4f(1F, 1F, 1F, 1F);
|
||||
((GuiScreen) gui).drawTexturedModalRect(gui.getLeft(), gui.getTop(), 0, 0, gui.getWidth(), gui.getHeight());
|
||||
GlStateManager.disableBlend();
|
||||
|
||||
@@ -76,7 +76,7 @@ public class PageElvenRecipe extends PageRecipe {
|
||||
}
|
||||
|
||||
TextureAtlasSprite portalIcon = MiscellaneousIcons.INSTANCE.alfPortalTex;
|
||||
Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
|
||||
Minecraft.getInstance().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
|
||||
((GuiScreen) gui).drawTexturedModalRect(gui.getLeft() + 22, gui.getTop() + 36, portalIcon, 48, 48);
|
||||
}
|
||||
|
||||
@@ -84,38 +84,22 @@ public class PageElvenRecipe extends PageRecipe {
|
||||
public void renderItemAtInputPos(IGuiLexiconEntry gui, int x, ItemStack stack) {
|
||||
if(stack.isEmpty())
|
||||
return;
|
||||
stack = stack.copy();
|
||||
|
||||
if(stack.getItemDamage() == Short.MAX_VALUE)
|
||||
stack.setItemDamage(0);
|
||||
|
||||
int xPos = gui.getLeft() + x * 20 + 45;
|
||||
int yPos = gui.getTop() + 14;
|
||||
ItemStack stack1 = stack.copy();
|
||||
if(stack1.getItemDamage() == -1)
|
||||
stack1.setItemDamage(0);
|
||||
|
||||
renderItem(gui, xPos, yPos, stack1, false);
|
||||
renderItem(gui, xPos, yPos, stack, false);
|
||||
}
|
||||
|
||||
@OnlyIn(Dist.CLIENT)
|
||||
public void renderItemAtOutputPos(IGuiLexiconEntry gui, int x, int y, ItemStack stack) {
|
||||
if(stack.isEmpty())
|
||||
return;
|
||||
stack = stack.copy();
|
||||
|
||||
if(stack.getItemDamage() == Short.MAX_VALUE)
|
||||
stack.setItemDamage(0);
|
||||
|
||||
int xPos = gui.getLeft() + x * 20 + 94;
|
||||
int yPos = gui.getTop() + y * 20 + 52;
|
||||
|
||||
ItemStack stack1 = stack.copy();
|
||||
if (stack1.getItemDamage() == -1) {
|
||||
stack1.setItemDamage(0);
|
||||
}
|
||||
|
||||
renderItem(gui, xPos, yPos, stack1, false);
|
||||
renderItem(gui, xPos, yPos, stack, false);
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -15,10 +15,10 @@ import net.minecraft.client.renderer.GlStateManager;
|
||||
import net.minecraft.client.renderer.OpenGlHelper;
|
||||
import net.minecraft.client.renderer.RenderHelper;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.EntityType;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraft.util.math.MathHelper;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.fml.common.registry.ForgeRegistries;
|
||||
import net.minecraftforge.api.distmarker.Dist;
|
||||
import net.minecraftforge.api.distmarker.OnlyIn;
|
||||
import vazkii.botania.api.internal.IGuiLexiconEntry;
|
||||
@@ -32,17 +32,12 @@ public class PageEntity extends LexiconPage{
|
||||
int relativeMouseX, relativeMouseY;
|
||||
boolean tooltipEntity;
|
||||
final int size;
|
||||
Constructor entityConstructor;
|
||||
private final EntityType<?> type;
|
||||
|
||||
public PageEntity(String unlocalizedName, String entity, int size) {
|
||||
public PageEntity(String unlocalizedName, EntityType<?> type, int size) {
|
||||
super(unlocalizedName);
|
||||
Class EntityClass = ForgeRegistries.ENTITIES.getValue(new ResourceLocation(entity)).getEntityClass();
|
||||
this.type = type;
|
||||
this.size = size;
|
||||
try {
|
||||
entityConstructor = EntityClass.getConstructor(World.class);
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -79,32 +74,32 @@ public class PageEntity extends LexiconPage{
|
||||
|
||||
@OnlyIn(Dist.CLIENT)
|
||||
public void renderEntity(IGuiLexiconEntry gui, Entity entity, int x, int y, int scale, float rotation) {
|
||||
dummyEntity.world = Minecraft.getMinecraft() != null ? Minecraft.getMinecraft().world : null;
|
||||
dummyEntity.world = Minecraft.getInstance() != null ? Minecraft.getInstance().world : null;
|
||||
|
||||
GlStateManager.enableColorMaterial();
|
||||
GlStateManager.pushMatrix();
|
||||
GlStateManager.translate(x, y, 50.0F);
|
||||
GlStateManager.scale(-scale, scale, scale);
|
||||
GlStateManager.rotate(180.0F, 0.0F, 0.0F, 1.0F);
|
||||
GlStateManager.rotate(rotation, 0.0F, 1.0F, 0.0F);
|
||||
GlStateManager.translatef(x, y, 50.0F);
|
||||
GlStateManager.scalef(-scale, scale, scale);
|
||||
GlStateManager.rotatef(180.0F, 0.0F, 0.0F, 1.0F);
|
||||
GlStateManager.rotatef(rotation, 0.0F, 1.0F, 0.0F);
|
||||
RenderHelper.enableStandardItemLighting();
|
||||
Minecraft.getMinecraft().getRenderManager().playerViewY = 180.0F;
|
||||
Minecraft.getMinecraft().getRenderManager().renderEntity(entity, 0.0D, 0.0D, 0.0D, 0.0F, 1.0F, false);
|
||||
Minecraft.getInstance().getRenderManager().playerViewY = 180.0F;
|
||||
Minecraft.getInstance().getRenderManager().renderEntity(entity, 0.0D, 0.0D, 0.0D, 0.0F, 1.0F, false);
|
||||
GlStateManager.popMatrix();
|
||||
RenderHelper.disableStandardItemLighting();
|
||||
GlStateManager.disableRescaleNormal();
|
||||
OpenGlHelper.setActiveTexture(OpenGlHelper.lightmapTexUnit);
|
||||
OpenGlHelper.glActiveTexture(OpenGlHelper.GL_TEXTURE1);
|
||||
GlStateManager.disableTexture2D();
|
||||
OpenGlHelper.setActiveTexture(OpenGlHelper.defaultTexUnit);
|
||||
OpenGlHelper.glActiveTexture(OpenGlHelper.GL_TEXTURE0);
|
||||
|
||||
if(relativeMouseX >= x - dummyEntity.width * scale / 2 - 10 && relativeMouseY >= y - dummyEntity.height * scale - 20 && relativeMouseX <= x + dummyEntity.width * scale / 2 + 10 && relativeMouseY <= y + 20)
|
||||
tooltipEntity = true;
|
||||
}
|
||||
|
||||
public void prepDummy() {
|
||||
if(dummyEntity == null || dummyEntity.isDead) {
|
||||
if(dummyEntity == null || !dummyEntity.isAlive()) {
|
||||
try {
|
||||
dummyEntity = (Entity) entityConstructor.newInstance(Minecraft.getMinecraft().world);
|
||||
dummyEntity = type.create(Minecraft.getInstance().world);
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
package vazkii.botania.common.lexicon.page;
|
||||
|
||||
import net.minecraft.client.gui.GuiButton;
|
||||
import net.minecraft.util.text.translation.I18n;
|
||||
import net.minecraft.client.resources.I18n;
|
||||
import vazkii.botania.api.internal.IGuiLexiconEntry;
|
||||
|
||||
import java.awt.Desktop;
|
||||
@@ -21,7 +21,7 @@ import java.net.URISyntaxException;
|
||||
|
||||
public class PageGuide extends PageText {
|
||||
|
||||
GuiButton button;
|
||||
private GuiButton button;
|
||||
|
||||
public PageGuide(String unlocalizedName) {
|
||||
super(unlocalizedName);
|
||||
@@ -29,7 +29,7 @@ public class PageGuide extends PageText {
|
||||
|
||||
@Override
|
||||
public void onOpened(IGuiLexiconEntry gui) {
|
||||
button = new GuiButton(101, gui.getLeft() + 30, gui.getTop() + gui.getHeight() - 50, gui.getWidth() - 60, 20, I18n.translateToLocal("botaniamisc.playVideo"));
|
||||
button = new GuiButton(101, gui.getLeft() + 30, gui.getTop() + gui.getHeight() - 50, gui.getWidth() - 60, 20, I18n.format("botaniamisc.playVideo"));
|
||||
gui.getButtonList().add(button);
|
||||
}
|
||||
|
||||
|
||||
@@ -33,12 +33,12 @@ public class PageImage extends LexiconPage {
|
||||
@Override
|
||||
@OnlyIn(Dist.CLIENT)
|
||||
public void renderScreen(IGuiLexiconEntry gui, int mx, int my) {
|
||||
TextureManager render = Minecraft.getMinecraft().renderEngine;
|
||||
TextureManager render = Minecraft.getInstance().textureManager;
|
||||
render.bindTexture(resource);
|
||||
|
||||
GlStateManager.enableBlend();
|
||||
GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
|
||||
GlStateManager.color(1F, 1F, 1F, 1F);
|
||||
GlStateManager.color4f(1F, 1F, 1F, 1F);
|
||||
((GuiScreen) gui).drawTexturedModalRect(gui.getLeft(), gui.getTop(), 0, 0, gui.getWidth(), gui.getHeight());
|
||||
GlStateManager.disableBlend();
|
||||
|
||||
|
||||
@@ -28,11 +28,11 @@ public class PageLoreText extends PageText {
|
||||
|
||||
@Override
|
||||
public void renderScreen(IGuiLexiconEntry gui, int mx, int my) {
|
||||
Minecraft.getMinecraft().renderEngine.bindTexture(paperOverlay);
|
||||
Minecraft.getInstance().textureManager.bindTexture(paperOverlay);
|
||||
|
||||
GlStateManager.enableBlend();
|
||||
GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
|
||||
GlStateManager.color(1F, 1F, 1F, 1F);
|
||||
GlStateManager.color4f(1F, 1F, 1F, 1F);
|
||||
((GuiScreen) gui).drawTexturedModalRect(gui.getLeft(), gui.getTop(), 0, 0, gui.getWidth(), gui.getHeight());
|
||||
GlStateManager.disableBlend();
|
||||
super.renderScreen(gui, mx, my);
|
||||
|
||||
@@ -72,8 +72,8 @@ public class PageManaInfusionRecipe extends PageRecipe {
|
||||
@OnlyIn(Dist.CLIENT)
|
||||
public void renderRecipe(IGuiLexiconEntry gui, int mx, int my) {
|
||||
RecipeManaInfusion recipe = recipes.get(recipeAt);
|
||||
TextureManager render = Minecraft.getMinecraft().renderEngine;
|
||||
FontRenderer font = Minecraft.getMinecraft().fontRenderer;
|
||||
TextureManager render = Minecraft.getInstance().textureManager;
|
||||
FontRenderer font = Minecraft.getInstance().fontRenderer;
|
||||
|
||||
Object input = recipe.getInput();
|
||||
if(input instanceof String)
|
||||
@@ -87,8 +87,8 @@ public class PageManaInfusionRecipe extends PageRecipe {
|
||||
|
||||
if(recipe.getCatalyst() != null) {
|
||||
Block block = recipe.getCatalyst().getBlock();
|
||||
if (Item.getItemFromBlock(block) != Items.AIR) {
|
||||
renderItemAtGridPos(gui, 1, 2, new ItemStack(block, 1, block.getMetaFromState(recipe.getCatalyst())), false);
|
||||
if (block.asItem() != Items.AIR) {
|
||||
renderItemAtGridPos(gui, 1, 2, new ItemStack(block), false);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -111,8 +111,6 @@ public class PageManaInfusionRecipe extends PageRecipe {
|
||||
|
||||
boolean hoveringOverDrop = false;
|
||||
|
||||
boolean unicode = font.getUnicodeFlag();
|
||||
font.setUnicodeFlag(true);
|
||||
int dw = font.getStringWidth(dropString);
|
||||
int dx = x + 35 - dw / 2;
|
||||
int dy = gui.getTop() + 30;
|
||||
@@ -122,7 +120,6 @@ public class PageManaInfusionRecipe extends PageRecipe {
|
||||
|
||||
font.drawString(dropString, dx, dy, 0x77000000);
|
||||
font.drawString(ratioString, x + 50 - font.getStringWidth(ratioString) / 2, y + 5, 0x99000000);
|
||||
font.setUnicodeFlag(unicode);
|
||||
|
||||
GlStateManager.disableBlend();
|
||||
|
||||
@@ -130,7 +127,7 @@ public class PageManaInfusionRecipe extends PageRecipe {
|
||||
|
||||
GlStateManager.enableBlend();
|
||||
GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
|
||||
GlStateManager.color(1F, 1F, 1F, 1F);
|
||||
GlStateManager.color4f(1F, 1F, 1F, 1F);
|
||||
((GuiScreen) gui).drawTexturedModalRect(gui.getLeft(), gui.getTop(), 0, 0, gui.getWidth(), gui.getHeight());
|
||||
GlStateManager.disableBlend();
|
||||
|
||||
|
||||
@@ -40,10 +40,10 @@ public class PageMultiblock extends LexiconPage {
|
||||
|
||||
private static final ResourceLocation multiblockOverlay = new ResourceLocation(LibResources.GUI_MULTIBLOCK_OVERLAY);
|
||||
|
||||
GuiButton button;
|
||||
final MultiblockSet set;
|
||||
final Multiblock mb;
|
||||
int ticksElapsed;
|
||||
private GuiButton button;
|
||||
private final MultiblockSet set;
|
||||
private final Multiblock mb;
|
||||
private int ticksElapsed;
|
||||
|
||||
public PageMultiblock(String unlocalizedName, MultiblockSet set) {
|
||||
super(unlocalizedName);
|
||||
@@ -54,52 +54,49 @@ public class PageMultiblock extends LexiconPage {
|
||||
@Override
|
||||
@OnlyIn(Dist.CLIENT)
|
||||
public void renderScreen(IGuiLexiconEntry gui, int mx, int my) {
|
||||
TextureManager render = Minecraft.getMinecraft().renderEngine;
|
||||
TextureManager render = Minecraft.getInstance().textureManager;
|
||||
render.bindTexture(multiblockOverlay);
|
||||
|
||||
GlStateManager.enableBlend();
|
||||
GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
|
||||
GlStateManager.disableAlpha();
|
||||
GlStateManager.color(1F, 1F, 1F, 1F);
|
||||
GlStateManager.disableAlphaTest();
|
||||
GlStateManager.color4f(1F, 1F, 1F, 1F);
|
||||
((GuiScreen) gui).drawTexturedModalRect(gui.getLeft(), gui.getTop(), 0, 0, gui.getWidth(), gui.getHeight());
|
||||
GlStateManager.disableBlend();
|
||||
GlStateManager.enableAlpha();
|
||||
GlStateManager.enableAlphaTest();
|
||||
|
||||
final float maxX = 90, maxY = 60;
|
||||
GlStateManager.pushMatrix();
|
||||
GlStateManager.translate(gui.getLeft() + gui.getWidth() / 2, gui.getTop() + 90, gui.getZLevel() + 100F);
|
||||
GlStateManager.translatef(gui.getLeft() + gui.getWidth() / 2, gui.getTop() + 90, gui.getZLevel() + 100F);
|
||||
|
||||
float diag = (float) Math.sqrt(mb.getXSize() * mb.getXSize() + mb.getZSize() * mb.getZSize());
|
||||
float height = mb.getYSize();
|
||||
float scaleX = maxX / diag;
|
||||
float scaleY = maxY / height;
|
||||
float scale = -Math.min(scaleY, scaleX);
|
||||
GlStateManager.scale(scale, scale, scale);
|
||||
GlStateManager.scalef(scale, scale, scale);
|
||||
|
||||
GlStateManager.rotate(-20F, 1, 0, 0);
|
||||
GlStateManager.rotate(gui.getElapsedTicks(), 0, 1, 0);
|
||||
GlStateManager.rotatef(-20F, 1, 0, 0);
|
||||
GlStateManager.rotatef(gui.getElapsedTicks(), 0, 1, 0);
|
||||
|
||||
MultiblockRenderHandler.renderMultiblockOnPage(mb);
|
||||
|
||||
GlStateManager.popMatrix();
|
||||
|
||||
FontRenderer font = Minecraft.getMinecraft().fontRenderer;
|
||||
boolean unicode = font.getUnicodeFlag();
|
||||
FontRenderer font = Minecraft.getInstance().fontRenderer;
|
||||
String s = TextFormatting.BOLD + I18n.format(getUnlocalizedName());
|
||||
font.setUnicodeFlag(true);
|
||||
font.drawString(s, gui.getLeft() + gui.getWidth() / 2 - font.getStringWidth(s) / 2, gui.getTop() + 16, 0x000000);
|
||||
font.setUnicodeFlag(unicode);
|
||||
|
||||
GlStateManager.enableRescaleNormal();
|
||||
RenderHelper.enableGUIStandardItemLighting();
|
||||
int x = gui.getLeft() + 15;
|
||||
int y = gui.getTop() + 25;
|
||||
Minecraft.getMinecraft().getRenderItem().renderItemIntoGUI(new ItemStack(Blocks.STONEBRICK), x, y);
|
||||
Minecraft.getInstance().getItemRenderer().renderItemIntoGUI(new ItemStack(Blocks.STONE_BRICKS), x, y);
|
||||
RenderHelper.disableStandardItemLighting();
|
||||
GlStateManager.disableRescaleNormal();
|
||||
|
||||
GlStateManager.pushMatrix();
|
||||
GlStateManager.translate(0F, 0F, 200F);
|
||||
GlStateManager.translatef(0F, 0F, 200F);
|
||||
if(mx >= x && mx < x + 16 && my >= y && my < y + 16) {
|
||||
List<String> mats = new ArrayList<>();
|
||||
mats.add(I18n.format("botaniamisc.materialsRequired"));
|
||||
|
||||
@@ -41,9 +41,9 @@ public class PagePetalRecipe<T extends RecipePetals> extends PageRecipe {
|
||||
|
||||
private static final ResourceLocation petalOverlay = new ResourceLocation(LibResources.GUI_PETAL_OVERLAY);
|
||||
|
||||
final List<T> recipes;
|
||||
int ticksElapsed = 0;
|
||||
int recipeAt = 0;
|
||||
private final List<T> recipes;
|
||||
private int ticksElapsed = 0;
|
||||
private int recipeAt = 0;
|
||||
|
||||
public PagePetalRecipe(String unlocalizedName, List<T> recipes) {
|
||||
super(unlocalizedName);
|
||||
@@ -64,7 +64,7 @@ public class PagePetalRecipe<T extends RecipePetals> extends PageRecipe {
|
||||
@OnlyIn(Dist.CLIENT)
|
||||
public void renderRecipe(IGuiLexiconEntry gui, int mx, int my) {
|
||||
T recipe = recipes.get(recipeAt);
|
||||
TextureManager render = Minecraft.getMinecraft().renderEngine;
|
||||
TextureManager render = Minecraft.getInstance().textureManager;
|
||||
|
||||
renderItemAtGridPos(gui, 3, 0, recipe.getOutput(), false);
|
||||
renderItemAtGridPos(gui, 2, 1, getMiddleStack(), false);
|
||||
@@ -93,7 +93,7 @@ public class PagePetalRecipe<T extends RecipePetals> extends PageRecipe {
|
||||
|
||||
GlStateManager.enableBlend();
|
||||
GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
|
||||
GlStateManager.color(1F, 1F, 1F, 1F);
|
||||
GlStateManager.color4f(1F, 1F, 1F, 1F);
|
||||
((GuiScreen) gui).drawTexturedModalRect(gui.getLeft(), gui.getTop(), 0, 0, gui.getWidth(), gui.getHeight());
|
||||
GlStateManager.disableBlend();
|
||||
}
|
||||
@@ -104,18 +104,15 @@ public class PagePetalRecipe<T extends RecipePetals> extends PageRecipe {
|
||||
|
||||
@OnlyIn(Dist.CLIENT)
|
||||
public void renderManaBar(IGuiLexiconEntry gui, T recipe, int mx, int my) {
|
||||
FontRenderer font = Minecraft.getMinecraft().fontRenderer;
|
||||
FontRenderer font = Minecraft.getInstance().fontRenderer;
|
||||
GlStateManager.enableBlend();
|
||||
GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
|
||||
|
||||
int x = gui.getLeft() + gui.getWidth() / 2 - 50;
|
||||
int y = gui.getTop() + 120;
|
||||
|
||||
boolean unicode = font.getUnicodeFlag();
|
||||
font.setUnicodeFlag(true);
|
||||
String stopStr = I18n.format("botaniamisc.shiftToStopSpin");
|
||||
font.drawString(stopStr, x + 50 - font.getStringWidth(stopStr) / 2, y + 15, 0x99000000);
|
||||
font.setUnicodeFlag(unicode);
|
||||
|
||||
GlStateManager.disableBlend();
|
||||
}
|
||||
|
||||
@@ -14,11 +14,13 @@ import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.gui.FontRenderer;
|
||||
import net.minecraft.client.gui.GuiScreen;
|
||||
import net.minecraft.client.renderer.GlStateManager;
|
||||
import net.minecraft.client.renderer.ItemRenderer;
|
||||
import net.minecraft.client.renderer.RenderHelper;
|
||||
import net.minecraft.client.renderer.RenderItem;
|
||||
import net.minecraft.client.resources.I18n;
|
||||
import net.minecraft.client.util.ITooltipFlag;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.text.ITextComponent;
|
||||
import net.minecraft.util.text.TextFormatting;
|
||||
import net.minecraftforge.client.ForgeHooksClient;
|
||||
import net.minecraftforge.client.event.RenderTooltipEvent;
|
||||
@@ -39,6 +41,7 @@ import java.awt.font.FontRenderContext;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.Collections;
|
||||
import java.util.Comparator;
|
||||
import java.util.List;
|
||||
import java.util.stream.Collectors;
|
||||
import java.util.stream.Stream;
|
||||
@@ -70,7 +73,7 @@ public class PageRecipe extends LexiconPage {
|
||||
PageText.renderText(x, y, width, height, getUnlocalizedName());
|
||||
|
||||
if(!tooltipStack.isEmpty()) {
|
||||
List<String> tooltipData = tooltipStack.getTooltip(Minecraft.getMinecraft().player, ITooltipFlag.TooltipFlags.NORMAL);
|
||||
List<ITextComponent> tooltipData = tooltipStack.getTooltip(Minecraft.getInstance().player, ITooltipFlag.TooltipFlags.NORMAL);
|
||||
List<String> parsedTooltip = new ArrayList<>();
|
||||
boolean first = true;
|
||||
|
||||
@@ -82,17 +85,17 @@ public class PageRecipe extends LexiconPage {
|
||||
first = false;
|
||||
}
|
||||
|
||||
FontRenderer font = Minecraft.getMinecraft().fontRenderer;
|
||||
FontRenderer font = Minecraft.getInstance().fontRenderer;
|
||||
int tooltipHeight = tooltipData.size() * 10 + 2;
|
||||
int tooltipWidth = parsedTooltip.stream().map(font::getStringWidth).max((a, b) -> a - b).orElse(0);
|
||||
int tooltipWidth = parsedTooltip.stream().map(font::getStringWidth).max(Comparator.comparingInt(a -> a)).orElse(0);
|
||||
int rmx = mx + 12;
|
||||
int rmy = my - 12;
|
||||
|
||||
vazkii.botania.client.core.helper.RenderHelper.renderTooltip(mx, my, parsedTooltip);
|
||||
GlStateManager.disableDepth();
|
||||
GlStateManager.disableDepthTest();
|
||||
MinecraftForge.EVENT_BUS.post(new RenderTooltipEvent.PostBackground(tooltipStack, parsedTooltip, rmx, rmy, font, tooltipWidth, tooltipHeight));
|
||||
MinecraftForge.EVENT_BUS.post(new RenderTooltipEvent.PostText(tooltipStack, parsedTooltip, rmx, rmy, font, tooltipWidth, tooltipHeight));
|
||||
GlStateManager.enableDepth();
|
||||
GlStateManager.enableDepthTest();
|
||||
|
||||
int tooltipY = 8 + tooltipData.size() * 11;
|
||||
|
||||
@@ -119,40 +122,28 @@ public class PageRecipe extends LexiconPage {
|
||||
if(stack.isEmpty())
|
||||
return;
|
||||
|
||||
ItemStack workStack = stack.copy();
|
||||
|
||||
if(workStack.getItemDamage() == Short.MAX_VALUE || workStack.getItemDamage() == -1)
|
||||
workStack.setItemDamage(0);
|
||||
|
||||
angle -= 90;
|
||||
int radius = 32;
|
||||
double xPos = gui.getLeft() + Math.cos(angle * Math.PI / 180D) * radius + gui.getWidth() / 2 - 8;
|
||||
double yPos = gui.getTop() + Math.sin(angle * Math.PI / 180D) * radius + 53;
|
||||
|
||||
renderItem(gui, xPos, yPos, workStack, false);
|
||||
renderItem(gui, xPos, yPos, stack, false);
|
||||
}
|
||||
|
||||
@OnlyIn(Dist.CLIENT)
|
||||
public void renderItemAtGridPos(IGuiLexiconEntry gui, int x, int y, ItemStack stack, boolean accountForContainer) {
|
||||
if(stack.isEmpty())
|
||||
return;
|
||||
stack = stack.copy();
|
||||
|
||||
if(stack.getItemDamage() == Short.MAX_VALUE)
|
||||
stack.setItemDamage(0);
|
||||
|
||||
int xPos = gui.getLeft() + x * 29 + 7 + (y == 0 && x == 3 ? 10 : 0);
|
||||
int yPos = gui.getTop() + y * 29 + 24 - (y == 0 ? 7 : 0);
|
||||
ItemStack stack1 = stack.copy();
|
||||
if(stack1.getItemDamage() == -1)
|
||||
stack1.setItemDamage(0);
|
||||
|
||||
renderItem(gui, xPos, yPos, stack1, accountForContainer);
|
||||
renderItem(gui, xPos, yPos, stack, accountForContainer);
|
||||
}
|
||||
|
||||
@OnlyIn(Dist.CLIENT)
|
||||
public void renderItem(IGuiLexiconEntry gui, double xPos, double yPos, ItemStack stack, boolean accountForContainer) {
|
||||
RenderItem render = Minecraft.getMinecraft().getRenderItem();
|
||||
ItemRenderer render = Minecraft.getInstance().getItemRenderer();
|
||||
boolean mouseDown = Mouse.isButtonDown(0);
|
||||
|
||||
GlStateManager.pushMatrix();
|
||||
@@ -160,11 +151,11 @@ public class PageRecipe extends LexiconPage {
|
||||
GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
|
||||
RenderHelper.enableGUIStandardItemLighting();
|
||||
GlStateManager.enableRescaleNormal();
|
||||
GlStateManager.enableDepth();
|
||||
GlStateManager.enableDepthTest();
|
||||
GlStateManager.pushMatrix();
|
||||
GlStateManager.translate(xPos, yPos, 0);
|
||||
GlStateManager.translated(xPos, yPos, 0);
|
||||
render.renderItemAndEffectIntoGUI(stack, 0, 0);
|
||||
render.renderItemOverlays(Minecraft.getMinecraft().fontRenderer, stack, 0, 0);
|
||||
render.renderItemOverlays(Minecraft.getInstance().fontRenderer, stack, 0, 0);
|
||||
GlStateManager.popMatrix();
|
||||
RenderHelper.disableStandardItemLighting();
|
||||
GlStateManager.popMatrix();
|
||||
@@ -175,7 +166,7 @@ public class PageRecipe extends LexiconPage {
|
||||
tooltipStack = stack;
|
||||
|
||||
EntryData data = LexiconRecipeMappings.getDataForStack(tooltipStack);
|
||||
ItemStack book = PlayerHelper.getFirstHeldItemClass(Minecraft.getMinecraft().player, ILexicon.class);
|
||||
ItemStack book = PlayerHelper.getFirstHeldItemClass(Minecraft.getInstance().player, ILexicon.class);
|
||||
|
||||
if(data != null && (data.entry != gui.getEntry() || data.page != gui.getPageOn()) && book != null && ((ILexicon) book.getItem()).isKnowledgeUnlocked(book, data.entry.getKnowledgeType())) {
|
||||
tooltipEntry = true;
|
||||
@@ -183,7 +174,7 @@ public class PageRecipe extends LexiconPage {
|
||||
if(!mouseDownLastTick && mouseDown && GuiScreen.isShiftKeyDown()) {
|
||||
GuiLexiconEntry newGui = new GuiLexiconEntry(data.entry, (GuiScreen) gui);
|
||||
newGui.page = data.page;
|
||||
Minecraft.getMinecraft().displayGuiScreen(newGui);
|
||||
Minecraft.getInstance().displayGuiScreen(newGui);
|
||||
}
|
||||
} else tooltipEntry = false;
|
||||
|
||||
|
||||
@@ -44,7 +44,7 @@ public class PageRuneRecipe extends PagePetalRecipe<RecipeRuneAltar> {
|
||||
@Override
|
||||
@OnlyIn(Dist.CLIENT)
|
||||
public void renderManaBar(IGuiLexiconEntry gui, RecipeRuneAltar recipe, int mx, int my) {
|
||||
FontRenderer font = Minecraft.getMinecraft().fontRenderer;
|
||||
FontRenderer font = Minecraft.getInstance().fontRenderer;
|
||||
GlStateManager.enableBlend();
|
||||
GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
|
||||
String manaUsage = I18n.format("botaniamisc.manaUsage");
|
||||
@@ -62,11 +62,8 @@ public class PageRuneRecipe extends PagePetalRecipe<RecipeRuneAltar> {
|
||||
String ratioString = I18n.format("botaniamisc.ratio", ratio);
|
||||
String stopStr = I18n.format("botaniamisc.shiftToStopSpin");
|
||||
|
||||
boolean unicode = font.getUnicodeFlag();
|
||||
font.setUnicodeFlag(true);
|
||||
font.drawString(stopStr, x + 50 - font.getStringWidth(stopStr) / 2, y + 15, 0x99000000);
|
||||
font.drawString(ratioString, x + 50 - font.getStringWidth(ratioString) / 2, y + 5, 0x99000000);
|
||||
font.setUnicodeFlag(unicode);
|
||||
GlStateManager.disableBlend();
|
||||
}
|
||||
|
||||
|
||||
@@ -13,15 +13,18 @@ package vazkii.botania.common.lexicon.page;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.gui.GuiScreen;
|
||||
import net.minecraft.client.renderer.GlStateManager;
|
||||
import net.minecraft.client.renderer.ItemRenderer;
|
||||
import net.minecraft.client.renderer.RenderHelper;
|
||||
import net.minecraft.client.renderer.RenderItem;
|
||||
import net.minecraft.client.renderer.texture.TextureManager;
|
||||
import net.minecraft.client.resources.I18n;
|
||||
import net.minecraft.client.util.ITooltipFlag;
|
||||
import net.minecraft.entity.EntityList;
|
||||
import net.minecraft.entity.EntityType;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraft.util.math.MathHelper;
|
||||
import net.minecraft.util.text.ITextComponent;
|
||||
import net.minecraft.util.text.TextFormatting;
|
||||
import net.minecraftforge.api.distmarker.Dist;
|
||||
import net.minecraftforge.api.distmarker.OnlyIn;
|
||||
@@ -41,14 +44,14 @@ public class PageShedding extends PageEntity {
|
||||
|
||||
private static final ResourceLocation sheddingOverlay = new ResourceLocation(LibResources.GUI_SHEDDING_OVERLAY);
|
||||
|
||||
final ItemStack shedStack;
|
||||
ItemStack tooltipStack;
|
||||
boolean tooltipEntry;
|
||||
private final ItemStack shedStack;
|
||||
private ItemStack tooltipStack;
|
||||
private boolean tooltipEntry;
|
||||
|
||||
static boolean mouseDownLastTick = false;
|
||||
private static boolean mouseDownLastTick = false;
|
||||
|
||||
public PageShedding(String unlocalizedName, String entity, int size, ItemStack shedStack) {
|
||||
super(unlocalizedName, entity, size);
|
||||
public PageShedding(String unlocalizedName, EntityType<?> type, int size, ItemStack shedStack) {
|
||||
super(unlocalizedName, type, size);
|
||||
this.shedStack = shedStack;
|
||||
}
|
||||
|
||||
@@ -68,16 +71,16 @@ public class PageShedding extends PageEntity {
|
||||
|
||||
renderItem(gui, stack_x, stack_y, shedStack);
|
||||
|
||||
TextureManager render = Minecraft.getMinecraft().renderEngine;
|
||||
TextureManager render = Minecraft.getInstance().textureManager;
|
||||
render.bindTexture(sheddingOverlay);
|
||||
|
||||
GlStateManager.enableBlend();
|
||||
GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
|
||||
GlStateManager.color(1F, 1F, 1F, 1F);
|
||||
GlStateManager.color4f(1F, 1F, 1F, 1F);
|
||||
((GuiScreen) gui).drawTexturedModalRect(gui.getLeft(), gui.getTop(), 0, 0, gui.getWidth(), gui.getHeight());
|
||||
|
||||
if(!tooltipStack.isEmpty()) {
|
||||
List<String> tooltipData = tooltipStack.getTooltip(Minecraft.getMinecraft().player, ITooltipFlag.TooltipFlags.NORMAL);
|
||||
List<ITextComponent> tooltipData = tooltipStack.getTooltip(Minecraft.getInstance().player, ITooltipFlag.TooltipFlags.NORMAL);
|
||||
List<String> parsedTooltip = new ArrayList<>();
|
||||
boolean first = true;
|
||||
|
||||
@@ -111,7 +114,7 @@ public class PageShedding extends PageEntity {
|
||||
|
||||
@OnlyIn(Dist.CLIENT)
|
||||
public void renderItem(IGuiLexiconEntry gui, int xPos, int yPos, ItemStack stack) {
|
||||
RenderItem render = Minecraft.getMinecraft().getRenderItem();
|
||||
ItemRenderer render = Minecraft.getInstance().getItemRenderer();
|
||||
boolean mouseDown = Mouse.isButtonDown(0);
|
||||
|
||||
GlStateManager.pushMatrix();
|
||||
@@ -119,9 +122,9 @@ public class PageShedding extends PageEntity {
|
||||
GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
|
||||
RenderHelper.enableGUIStandardItemLighting();
|
||||
GlStateManager.enableRescaleNormal();
|
||||
GlStateManager.enableDepth();
|
||||
GlStateManager.enableDepthTest();
|
||||
render.renderItemAndEffectIntoGUI(stack, xPos, yPos);
|
||||
render.renderItemOverlays(Minecraft.getMinecraft().fontRenderer, stack, xPos, yPos);
|
||||
render.renderItemOverlays(Minecraft.getInstance().fontRenderer, stack, xPos, yPos);
|
||||
RenderHelper.disableStandardItemLighting();
|
||||
GlStateManager.popMatrix();
|
||||
|
||||
@@ -135,7 +138,7 @@ public class PageShedding extends PageEntity {
|
||||
if(!mouseDownLastTick && mouseDown && GuiScreen.isShiftKeyDown()) {
|
||||
GuiLexiconEntry newGui = new GuiLexiconEntry(data.entry, (GuiScreen) gui);
|
||||
newGui.page = data.page;
|
||||
Minecraft.getMinecraft().displayGuiScreen(newGui);
|
||||
Minecraft.getInstance().displayGuiScreen(newGui);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -45,39 +45,39 @@ public class PageTerrasteel extends PageRecipe {
|
||||
Block block2 = Blocks.LAPIS_BLOCK;
|
||||
Block block3 = ModBlocks.terraPlate;
|
||||
|
||||
GlStateManager.translate(0F, 0F, -10F);
|
||||
GlStateManager.translatef(0F, 0F, -10F);
|
||||
renderItem(gui, gui.getLeft() + gui.getWidth() / 2 - 8, gui.getTop() + 103, new ItemStack(block1), false);
|
||||
|
||||
GlStateManager.translate(0F, 0F, 5F);
|
||||
GlStateManager.translatef(0F, 0F, 5F);
|
||||
renderItem(gui, gui.getLeft() + gui.getWidth() / 2 - 8 + 7, gui.getTop() + 106, new ItemStack(block2), false);
|
||||
renderItem(gui, gui.getLeft() + gui.getWidth() / 2 - 8 - 6, gui.getTop() + 106, new ItemStack(block2), false);
|
||||
|
||||
GlStateManager.translate(0F, 0F, 5F);
|
||||
GlStateManager.translatef(0F, 0F, 5F);
|
||||
renderItem(gui, gui.getLeft() + gui.getWidth() / 2 - 8, gui.getTop() + 110, new ItemStack(block1), false);
|
||||
renderItem(gui, gui.getLeft() + gui.getWidth() / 2 - 8 + 14, gui.getTop() + 110, new ItemStack(block1), false);
|
||||
renderItem(gui, gui.getLeft() + gui.getWidth() / 2 - 8 - 13, gui.getTop() + 110, new ItemStack(block1), false);
|
||||
|
||||
GlStateManager.translate(0F, 0F, 5F);
|
||||
GlStateManager.translatef(0F, 0F, 5F);
|
||||
renderItem(gui, gui.getLeft() + gui.getWidth() / 2 - 8 - 6, gui.getTop() + 114, new ItemStack(block2), false);
|
||||
renderItem(gui, gui.getLeft() + gui.getWidth() / 2 - 8 + 7, gui.getTop() + 114, new ItemStack(block2), false);
|
||||
|
||||
GlStateManager.translate(0F, 0F, 5F);
|
||||
GlStateManager.translatef(0F, 0F, 5F);
|
||||
renderItem(gui, gui.getLeft() + gui.getWidth() / 2 - 8 + 1, gui.getTop() + 117, new ItemStack(block1), false);
|
||||
|
||||
GlStateManager.translate(0F, 0F, 5F);
|
||||
GlStateManager.translatef(0F, 0F, 5F);
|
||||
renderItem(gui, gui.getLeft() + gui.getWidth() / 2 - 8, gui.getTop() + 102, new ItemStack(block3), false);
|
||||
GlStateManager.translate(0F, 0F, -10F);
|
||||
GlStateManager.translatef(0F, 0F, -10F);
|
||||
|
||||
renderItem(gui, gui.getLeft() + gui.getWidth() / 2 - 8, gui.getTop() + 30, new ItemStack(ModItems.terrasteel), false);
|
||||
renderItem(gui, gui.getLeft() + gui.getWidth() / 2 - 8, gui.getTop() + 80, new ItemStack(ModItems.manaSteel), false);
|
||||
renderItem(gui, gui.getLeft() + gui.getWidth() / 2 - 8 - 20, gui.getTop() + 86, new ItemStack(ModItems.manaPearl), false);
|
||||
renderItem(gui, gui.getLeft() + gui.getWidth() / 2 - 8 + 19, gui.getTop() + 86, new ItemStack(ModItems.manaDiamond), false);
|
||||
|
||||
Minecraft.getMinecraft().renderEngine.bindTexture(terrasteelOverlay);
|
||||
Minecraft.getInstance().textureManager.bindTexture(terrasteelOverlay);
|
||||
|
||||
GlStateManager.enableBlend();
|
||||
GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
|
||||
GlStateManager.color(1F, 1F, 1F, 1F);
|
||||
GlStateManager.color4f(1F, 1F, 1F, 1F);
|
||||
((GuiScreen) gui).drawTexturedModalRect(gui.getLeft(), gui.getTop(), 0, 0, gui.getWidth(), gui.getHeight());
|
||||
GlStateManager.disableBlend();
|
||||
}
|
||||
|
||||
@@ -49,10 +49,7 @@ public class PageText extends LexiconPage {
|
||||
y += 10;
|
||||
width -= 4;
|
||||
|
||||
FontRenderer font = Minecraft.getMinecraft().fontRenderer;
|
||||
boolean unicode = font.getUnicodeFlag();
|
||||
if(useUnicode)
|
||||
font.setUnicodeFlag(true);
|
||||
FontRenderer font = Minecraft.getInstance().fontRenderer;
|
||||
String text = I18n.format(unlocalizedText).replaceAll("&", "\u00a7");
|
||||
String[] textEntries = text.split("<br>");
|
||||
|
||||
@@ -114,8 +111,6 @@ public class PageText extends LexiconPage {
|
||||
y += words.isEmpty() ? paragraphSize : 10;
|
||||
i++;
|
||||
}
|
||||
|
||||
font.setUnicodeFlag(unicode);
|
||||
}
|
||||
|
||||
private static String getControlCodes(String s) {
|
||||
|
||||
@@ -66,8 +66,8 @@ public class PageTutorial extends PageText {
|
||||
public void onActionPerformed(IGuiLexiconEntry gui, GuiButton button) {
|
||||
if(button == buttonText) {
|
||||
GuiLexicon.startTutorial();
|
||||
Minecraft.getMinecraft().displayGuiScreen(new GuiLexicon());
|
||||
Minecraft.getMinecraft().player.sendMessage(new TextComponentTranslation("botaniamisc.tutorialStarted").setStyle(new Style().setColor(TextFormatting.GREEN)));
|
||||
Minecraft.getInstance().displayGuiScreen(new GuiLexicon());
|
||||
Minecraft.getInstance().player.sendMessage(new TextComponentTranslation("botaniamisc.tutorialStarted").setStyle(new Style().setColor(TextFormatting.GREEN)));
|
||||
} else if(button == buttonVideo && Desktop.isDesktopSupported()) {
|
||||
try {
|
||||
Desktop.getDesktop().browse(new URI("https://www.youtube.com/watch?v=D75Aad-5QgQ"));
|
||||
|
||||
@@ -112,7 +112,7 @@ public class PacketBotaniaEffect {
|
||||
double d1 = item.world.rand.nextGaussian() * m;
|
||||
double d2 = item.world.rand.nextGaussian() * m;
|
||||
double d3 = 10.0D;
|
||||
item.world.spawnParticle(Particles.POOF,
|
||||
item.world.addParticle(Particles.POOF,
|
||||
message.x + item.world.rand.nextFloat() * item.width * 2.0F - item.width - d0 * d3, message.y + item.world.rand.nextFloat() * item.height - d1 * d3,
|
||||
message.z + item.world.rand.nextFloat() * item.width * 2.0F - item.width - d2 * d3, d0, d1, d2);
|
||||
}
|
||||
|
||||
@@ -24,10 +24,12 @@ import net.minecraft.util.SoundCategory;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.util.math.RayTraceResult;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraft.world.dimension.DimensionType;
|
||||
import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent;
|
||||
import net.minecraftforge.event.entity.player.PlayerInteractEvent;
|
||||
import net.minecraftforge.event.world.BlockEvent;
|
||||
import net.minecraftforge.eventbus.api.SubscribeEvent;
|
||||
import net.minecraftforge.fml.server.ServerLifecycleHooks;
|
||||
import net.minecraftforge.items.ItemHandlerHelper;
|
||||
import vazkii.botania.common.Botania;
|
||||
import vazkii.botania.common.block.ModBlocks;
|
||||
@@ -52,20 +54,21 @@ public final class SkyblockWorldEvents {
|
||||
if(event.getEntityLiving() instanceof EntityPlayer && !event.getEntityLiving().world.isRemote) {
|
||||
EntityPlayer player = (EntityPlayer) event.getEntityLiving();
|
||||
NBTTagCompound data = player.getEntityData();
|
||||
if(!data.hasKey(EntityPlayer.PERSISTED_NBT_TAG))
|
||||
data.setTag(EntityPlayer.PERSISTED_NBT_TAG, new NBTTagCompound());
|
||||
if(!data.contains(EntityPlayer.PERSISTED_NBT_TAG))
|
||||
data.put(EntityPlayer.PERSISTED_NBT_TAG, new NBTTagCompound());
|
||||
|
||||
NBTTagCompound persist = data.getCompoundTag(EntityPlayer.PERSISTED_NBT_TAG);
|
||||
NBTTagCompound persist = data.getCompound(EntityPlayer.PERSISTED_NBT_TAG);
|
||||
if(player.ticksExisted > 3 && !persist.getBoolean(TAG_MADE_ISLAND)) {
|
||||
World overworld = ServerLifecycleHooks.getCurrentServer().getWorld(DimensionType.OVERWORLD);
|
||||
World world = player.world;
|
||||
if(WorldTypeSkyblock.isWorldSkyblock(world)) {
|
||||
BlockPos coords = world.getSpawnPoint();
|
||||
if(world.getBlockState(coords.down(4)).getBlock() != Blocks.BEDROCK && world.provider.getDimension() == 0)
|
||||
if(world.getBlockState(coords.down(4)).getBlock() != Blocks.BEDROCK && world == overworld)
|
||||
spawnPlayer(player, coords, false);
|
||||
}
|
||||
|
||||
|
||||
persist.setBoolean(TAG_MADE_ISLAND, true);
|
||||
persist.putBoolean(TAG_MADE_ISLAND, true);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -131,9 +134,9 @@ public final class SkyblockWorldEvents {
|
||||
|
||||
public static void spawnPlayer(EntityPlayer player, BlockPos pos, boolean fabricated) {
|
||||
NBTTagCompound data = player.getEntityData();
|
||||
if(!data.hasKey(EntityPlayer.PERSISTED_NBT_TAG))
|
||||
data.setTag(EntityPlayer.PERSISTED_NBT_TAG, new NBTTagCompound());
|
||||
NBTTagCompound persist = data.getCompoundTag(EntityPlayer.PERSISTED_NBT_TAG);
|
||||
if(!data.contains(EntityPlayer.PERSISTED_NBT_TAG))
|
||||
data.put(EntityPlayer.PERSISTED_NBT_TAG, new NBTTagCompound());
|
||||
NBTTagCompound persist = data.getCompound(EntityPlayer.PERSISTED_NBT_TAG);
|
||||
|
||||
final boolean test = false;
|
||||
|
||||
@@ -148,10 +151,10 @@ public final class SkyblockWorldEvents {
|
||||
}
|
||||
|
||||
if(fabricated) {
|
||||
persist.setBoolean(TAG_HAS_OWN_ISLAND, true);
|
||||
persist.setDouble(TAG_ISLAND_X, player.posX);
|
||||
persist.setDouble(TAG_ISLAND_Y, player.posY);
|
||||
persist.setDouble(TAG_ISLAND_Z, player.posZ);
|
||||
persist.putBoolean(TAG_HAS_OWN_ISLAND, true);
|
||||
persist.putDouble(TAG_ISLAND_X, player.posX);
|
||||
persist.putDouble(TAG_ISLAND_Y, player.posY);
|
||||
persist.putDouble(TAG_ISLAND_Z, player.posZ);
|
||||
}
|
||||
} else {
|
||||
double posX = persist.getDouble(TAG_ISLAND_X);
|
||||
|
||||
@@ -29,7 +29,7 @@ public class WorldTypeSkyblock extends WorldType {
|
||||
}
|
||||
|
||||
public static boolean isWorldSkyblock(World world) {
|
||||
return world.getWorldInfo().getTerrainType() instanceof WorldTypeSkyblock;
|
||||
return world.getWorldInfo().getGenerator() instanceof WorldTypeSkyblock;
|
||||
}
|
||||
|
||||
@OnlyIn(Dist.CLIENT)
|
||||
|
||||
Reference in new issue
Block a user