MrSphay/WorldHandler
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Update to 1.14.3

Browse Source
This commit is contained in:
Marcel Konrad
2019-06-25 13:57:07 +02:00
parent 7732f02e4e
commit d990f8512b
10 changed files with 34 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/exopandora/worldhandler/gui/button/GuiButtonTooltip.java
View File

@@ -29,8 +29,8 @@ public class GuiButtonTooltip extends GuiButtonBase
if(!list.isEmpty())
{
int tooltipWidth = Minecraft.getInstance().fontRenderer.getStringWidth(this.tooltip) + 9;
int width = Minecraft.getInstance().field_71462_r.width;
int height = Minecraft.getInstance().field_71462_r.height;
int width = Minecraft.getInstance().currentScreen.width;
int height = Minecraft.getInstance().currentScreen.height;
GuiUtils.drawHoveringText(list, mouseX, mouseY, width, height, tooltipWidth, Minecraft.getInstance().fontRenderer);
}

24
src/main/java/exopandora/worldhandler/gui/content/impl/ContentGamerules.java
View File

@@ -1,8 +1,12 @@
package exopandora.worldhandler.gui.content.impl;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
import com.google.common.base.Predicates;
import com.mojang.brigadier.arguments.ArgumentType;
import com.mojang.brigadier.arguments.BoolArgumentType;
import exopandora.worldhandler.builder.ICommandBuilder;
import exopandora.worldhandler.builder.impl.BuilderGamerule;
@@ -21,7 +25,10 @@ import exopandora.worldhandler.helper.CommandHelper;
import exopandora.worldhandler.util.ActionHandler;
import net.minecraft.client.resources.I18n;
import net.minecraft.world.GameRules;
import net.minecraft.world.GameRules.ValueType;
import net.minecraft.world.GameRules.IRuleEntryVisitor;
import net.minecraft.world.GameRules.RuleKey;
import net.minecraft.world.GameRules.RuleType;
import net.minecraft.world.GameRules.RuleValue;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
@@ -54,7 +61,18 @@ public class ContentGamerules extends Content
this.builderGamerule.setValue(this.value);
});
ElementPageList<String> rules = new ElementPageList<String>(x, y, new ArrayList<String>(GameRules.getDefinitions().keySet()), 114, 20, 3, container, new ILogicPageList<String>()
Map<String, ArgumentType<?>> map = new HashMap<String, ArgumentType<?>>();
GameRules.func_223590_a(new IRuleEntryVisitor()
{
@Override
public <T extends RuleValue<T>> void func_223481_a(RuleKey<T> rule, RuleType<T> type)
{
map.put(rule.func_223576_a(), type.func_223581_a(null).getType());
}
});
ElementPageList<String> rules = new ElementPageList<String>(x, y, new ArrayList<String>(map.keySet()), 114, 20, 3, container, new ILogicPageList<String>()
{
@Override
public String translate(String item)
@@ -72,7 +90,7 @@ public class ContentGamerules extends Content
public void onClick(String item)
{
ContentGamerules.this.builderGamerule.setRule(item);
ContentGamerules.this.booleanValue = GameRules.getDefinitions().get(item).getType().equals(ValueType.BOOLEAN_VALUE);
ContentGamerules.this.booleanValue = map.get(item) instanceof BoolArgumentType;
if(ContentGamerules.this.booleanValue)
{

2
src/main/java/exopandora/worldhandler/gui/content/impl/ContentSignEditor.java
View File

@@ -185,7 +185,7 @@ public class ContentSignEditor extends Content
GlStateManager.translatef(container.width / 2 - 8.5F * scale, container.height / 2 - 15 - 8.5F * scale, 0);
GlStateManager.scalef(scale, scale, scale);
Minecraft.getInstance().getItemRenderer().renderItemIntoGUI(new ItemStack(Items.field_222071_kr), 0, 0);
Minecraft.getInstance().getItemRenderer().renderItemIntoGUI(new ItemStack(Items.OAK_SIGN), 0, 0);
RenderHelper.disableStandardItemLighting();
GlStateManager.popMatrix();

2
src/main/java/exopandora/worldhandler/gui/content/impl/ContentSummon.java
View File

@@ -271,7 +271,7 @@ public class ContentSummon extends Content
{
Effect potion = ForgeRegistries.POTIONS.getValue(location);
if(!potion.equals(Effects.field_76432_h) && !potion.equals(Effects.field_76433_i))
if(!potion.equals(Effects.INSTANT_DAMAGE) && !potion.equals(Effects.INSTANT_HEALTH))
{
if(this.potionPage == 0)
{

2
src/main/java/exopandora/worldhandler/gui/content/impl/ContentWorldInfo.java
View File

@@ -169,7 +169,7 @@ public class ContentWorldInfo extends Content
{
if(Minecraft.getInstance().getIntegratedServer() != null)
{
return Minecraft.getInstance().getIntegratedServer().getWorld(DimensionType.OVERWORLD);
return Minecraft.getInstance().getIntegratedServer().getWorld(DimensionType.field_223227_a_);
}
return Minecraft.getInstance().world;