From de4423f18b1d17da5d31daabdbd03ba7cc11ca00 Mon Sep 17 00:00:00 2001 From: alexbegt Date: Wed, 24 Apr 2019 22:39:28 -0400 Subject: [PATCH] More work on updating Mantle to 1.13.2. Pulsar now functions! --- build.gradle | 99 ++++++++++------ gradle.properties | 23 +++- gradle/wrapper/gradle-wrapper.jar | Bin 52928 -> 54708 bytes gradle/wrapper/gradle-wrapper.properties | 3 +- gradlew | 23 ++-- .../mantle/block/BlockConnectedTexture.java | 14 +-- .../mantle/client/ClientProxy.java | 8 +- .../mantle/client/CreativeTab.java | 16 +-- .../client/ExtraHeartRenderHandler.java | 44 ++++--- .../mantle/client/ModelHelper.java | 8 +- .../mantle/client/book/BookHelper.java | 22 ++-- .../mantle/client/book/BookLoader.java | 20 ++-- .../client/book/StructureBlockAccess.java | 77 ++++++++++++- .../mantle/client/book/StructureInfo.java | 16 ++- .../client/book/data/AppearanceData.java | 6 +- .../mantle/client/book/data/BookData.java | 12 +- .../mantle/client/book/data/IDataItem.java | 6 +- .../mantle/client/book/data/PageData.java | 8 +- .../mantle/client/book/data/SectionData.java | 8 +- .../book/data/content/ContentBlank.java | 6 +- .../book/data/content/ContentDummy.java | 7 +- .../book/data/content/ContentError.java | 7 +- .../book/data/content/ContentImage.java | 7 +- .../book/data/content/ContentImageText.java | 7 +- .../book/data/content/ContentSmelting.java | 43 ++++--- .../data/content/ContentTableOfContents.java | 4 +- .../client/book/data/content/ContentText.java | 6 +- .../book/data/content/ContentTextImage.java | 6 +- .../data/content/ContentTextLeftImage.java | 6 +- .../data/content/ContentTextRightImage.java | 6 +- .../client/book/data/content/PageContent.java | 7 +- .../client/book/data/element/ImageData.java | 6 +- .../book/data/element/ItemStackData.java | 35 +++--- .../client/book/data/element/TextData.java | 7 +- .../book/repository/BookRepository.java | 2 +- .../book/repository/DummyRepository.java | 2 +- .../book/repository/FileRepository.java | 10 +- .../mantle/client/gui/GuiElement.java | 6 +- .../mantle/client/gui/GuiElementScalable.java | 6 +- .../mantle/client/gui/GuiModule.java | 16 +-- .../mantle/client/gui/GuiMultiModule.java | 107 ++++-------------- .../mantle/client/gui/GuiWidget.java | 6 +- .../mantle/client/gui/GuiWidgetSlider.java | 10 +- .../mantle/client/gui/GuiWidgetTabs.java | 18 ++- .../mantle/client/gui/book/GuiBook.java | 22 ++-- .../mantle/client/gui/book/GuiBookmark.java | 11 +- .../client/gui/book/TextDataRenderer.java | 34 ++++-- .../client/gui/book/element/BookElement.java | 27 +++-- .../client/gui/book/element/ElementImage.java | 12 +- .../client/gui/book/element/ElementItem.java | 12 +- .../gui/book/element/ElementSection.java | 10 +- .../gui/book/element/ElementStructure.java | 21 ++-- .../client/gui/book/element/ElementText.java | 6 +- .../gui/book/element/SizedBookElement.java | 6 +- .../client/model/BakedCompositeModel.java | 12 +- .../mantle/client/model/BakedSimple.java | 12 +- .../mantle/client/model/BakedWrapper.java | 12 +- .../client/model/BlockItemModelWrapper.java | 18 +-- .../mantle/client/model/TRSRBakedModel.java | 24 ++-- .../mantle/common/IInventoryGui.java | 6 +- .../mantle/inventory/BaseContainer.java | 18 +-- .../inventory/ContainerMultiModule.java | 2 +- .../inventory/ContainerSimpleChest.java | 2 +- .../mantle/inventory/SlotCraftingCustom.java | 2 +- .../mantle/inventory/SlotWrapper.java | 8 +- .../mantle/item/ItemArmorTooltip.java | 16 ++- .../mantle/multiblock/MultiServantLogic.java | 35 +++--- .../property/PropertyUnlistedDirection.java | 4 +- .../mantle/pulsar/control/PulseManager.java | 41 ++++--- .../mantle/pulsar/debug/EventSpy.java | 18 ++- .../mantle/pulsar/internal/Configuration.java | 5 +- .../mantle/tileentity/MantleTileEntity.java | 5 + .../mantle/tileentity/TileInventory.java | 62 +++++----- .../slimeknights/mantle/util/TagHelper.java | 12 +- .../{mantle_at.cfg => accesstransformer.cfg} | 18 ++- src/main/resources/META-INF/mods.toml | 20 ++++ 76 files changed, 694 insertions(+), 575 deletions(-) rename src/main/resources/META-INF/{mantle_at.cfg => accesstransformer.cfg} (50%) create mode 100644 src/main/resources/META-INF/mods.toml diff --git a/build.gradle b/build.gradle index 53f3f82..4294542 100644 --- a/build.gradle +++ b/build.gradle @@ -8,49 +8,40 @@ buildscript { repositories { - mavenCentral() mavenLocal() + maven { url = 'https://files.minecraftforge.net/maven' } jcenter() - maven { - name = "forge" - url = "http://files.minecraftforge.net/maven" - } + mavenCentral() maven { name = "sonatype" url = "https://oss.sonatype.org/content/repositories/snapshots/" } } dependencies { - classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT' + classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '3.+', changing: true classpath 'com.github.jengelman.gradle.plugins:shadow:1.2.3' } } -apply plugin: 'net.minecraftforge.gradle.forge' +apply plugin: 'net.minecraftforge.gradle' apply plugin: 'com.github.johnrengelman.shadow' apply plugin: 'maven' +apply plugin: 'eclipse' apply plugin: 'maven-publish' repositories { mavenLocal() maven { name 'ForgeFS' - url 'http://files.minecraftforge.net/maven' - } - maven { - name 'CB Maven FS' - url "http://chickenbones.net/maven/" + url 'https://files.minecraftforge.net/maven' } maven { name 'DVS1 Maven FS' - url 'http://dvs1.progwml6.com/files/maven' + url 'https://dvs1.progwml6.com/files/maven' } } group = 'slimeknights.mantle' -sourceCompatibility = 1.8 -targetCompatibility = 1.8 - // sets version to the slimeKnights version format task buildInfo { @@ -80,11 +71,43 @@ if (System.getenv().ARTIFACT_VERSION != null) { version = "${minecraft_version}-${artifact_version}" minecraft { - version = minecraft_version + "-" + forge_version - mappings = mappings_version - runDir = 'run' - useDepAts = true - replace '${version}', project.version + mappings channel: 'snapshot', version: mappings_version + + accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg') + + runs { + client { + workingDirectory project.file('run') + + // Recommended logging data for a userdev environment + property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP,CORE' + + // Recommended logging level for the console + property 'forge.logging.console.level', 'debug' + + mods { + mantle { + source sourceSets.main + } + } + } + + server { + workingDirectory project.file('run') + + // Recommended logging data for a userdev environment + property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP' + + // Recommended logging level for the console + property 'forge.logging.console.level', 'debug' + + mods { + mantle { + source sourceSets.main + } + } + } + } } configurations { @@ -93,10 +116,15 @@ configurations { } dependencies { + minecraft 'net.minecraftforge:forge:' + minecraft_version + '-' + forge_version + //compile "codechicken:CodeChickenLib:${minecraft_version}-${CCLIB_version}:dev" //compile "codechicken:CodeChickenCore:${minecraft_version}-${ccc_version}:dev" //compile "codechicken:NotEnoughItems:${minecraft_version}-${NEI_version}:dev" - deobfCompile "mezz.jei:jei_${minecraft_version}:${jei_version}" + //deobfCompile "mezz.jei:jei_${minecraft_version}:${jei_version}" + + compileOnly fg.deobf("mezz.jei:jei-${minecraft_version}:${jei_version}") + // Configuration shadow "ninja.leaping.configurate:configurate-hocon:${configurate_version}" //shade "ninja.leaping.configurate:configurate-gson:${configurate_version}" @@ -106,26 +134,34 @@ processResources { inputs.property "version", artifact_version inputs.property "MCversion", minecraft_version - // replace stuff in text files, not binary ones. + from(sourceSets.main.resources.srcDirs) { - include '**/*.info' - // replace version and MCVersion - expand 'version':artifact_version,'MCversion':minecraft_version + include 'META-INF/mods.toml' + + expand 'version':artifact_version, 'MCversion':minecraft_version, 'forge_version':forge_version_toml } - // copy everything else, thats not text + from(sourceSets.main.resources.srcDirs) { - exclude '**/*.info' + exclude 'META-INF/mods.toml' } } + jar { manifest { - attributes 'FMLAT': 'mantle_at.cfg' + attributes([ + "Specification-Title" : "Mantle", + "Specification-Vendor" : "Slime Knights", + "Specification-Version" : "1", // We are version 1 of ourselves + "Implementation-Title" : project.name, + "Implementation-Version" : "${version}", + "Implementation-Vendor" : "Slime Knights", + "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ") + ]) } dependsOn shadowJar enabled = false - finalizedBy reobfJar } shadowJar { @@ -142,9 +178,6 @@ shadowJar { task deobfJar(type: Jar) { from sourceSets.main.output classifier = 'deobf' - manifest { - attributes 'FMLAT': 'mantle_deobf_at.cfg' - } } task sourcesJar(type: Jar) { diff --git a/gradle.properties b/gradle.properties index e9542d6..1a82f4a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,20 @@ -mod_version=1.3.3 -minecraft_version=1.12 -forge_version=14.21.1.2395 -mappings_version=snapshot_20170628 +# Sets default memory used for gradle commands. Can be overridden by user or command line properties. +# This is required to provide enough memory for the Minecraft decompilation process. +org.gradle.jvmargs=-Xmx3G +org.gradle.daemon=false -jei_version=4.7.+ +mod_version=1.4 + +# Minecraft Version Information +minecraft_version=1.13.2 +minecraft_version_toml=13 + +# Forge Version Information +forge_version=25.0.175 +forge_version_toml=25 + +# Mappings Information +mappings_version=20190423-1.13.2 + +jei_version=5.0.+ configurate_version=3.3 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 6ffa237849ef3607e39c3b334a92a65367962071..7a3265ee94c0ab25cf079ac8ccdf87f41d455d42 100644 GIT binary patch delta 24211 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 VITCO{VAF#Xj1~cdCDmbn{U5DGJyQSx diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index f70f671..949819d 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ -#Sat Nov 19 15:30:25 EST 2016 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip diff --git a/gradlew b/gradlew index 9aa616c..cccdd3d 100755 --- a/gradlew +++ b/gradlew @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/env sh ############################################################################## ## @@ -33,11 +33,11 @@ DEFAULT_JVM_OPTS="" # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD="maximum" -warn ( ) { +warn () { echo "$*" } -die ( ) { +die () { echo echo "$*" echo @@ -154,16 +154,19 @@ if $cygwin ; then esac fi -# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules -function splitJvmOpts() { - JVM_OPTS=("$@") +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " } -eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS -JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" +APP_ARGS=$(save "$@") + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" # by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong -if [[ "$(uname)" == "Darwin" ]] && [[ "$HOME" == "$PWD" ]]; then +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then cd "$(dirname "$0")" fi -exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" +exec "$JAVACMD" "$@" diff --git a/src/main/java/slimeknights/mantle/block/BlockConnectedTexture.java b/src/main/java/slimeknights/mantle/block/BlockConnectedTexture.java index 69d982a..094a266 100644 --- a/src/main/java/slimeknights/mantle/block/BlockConnectedTexture.java +++ b/src/main/java/slimeknights/mantle/block/BlockConnectedTexture.java @@ -5,7 +5,7 @@ import javax.annotation.Nonnull; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; -import net.minecraft.block.properties.PropertyBool; +import net.minecraft.state.BooleanProperty; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.util.EnumFacing; @@ -21,12 +21,12 @@ public class BlockConnectedTexture extends Block { // These are the properties used for determining whether or not a side is connected. They // do NOT take up block IDs, they are unlisted properties - public static final PropertyBool CONNECTED_DOWN = PropertyBool.create("connected_down"); - public static final PropertyBool CONNECTED_UP = PropertyBool.create("connected_up"); - public static final PropertyBool CONNECTED_NORTH = PropertyBool.create("connected_north"); - public static final PropertyBool CONNECTED_SOUTH = PropertyBool.create("connected_south"); - public static final PropertyBool CONNECTED_WEST = PropertyBool.create("connected_west"); - public static final PropertyBool CONNECTED_EAST = PropertyBool.create("connected_east"); + public static final BooleanProperty CONNECTED_DOWN = BooleanProperty.create("connected_down"); + public static final BooleanProperty CONNECTED_UP = BooleanProperty.create("connected_up"); + public static final BooleanProperty CONNECTED_NORTH = BooleanProperty.create("connected_north"); + public static final BooleanProperty CONNECTED_SOUTH = BooleanProperty.create("connected_south"); + public static final BooleanProperty CONNECTED_WEST = BooleanProperty.create("connected_west"); + public static final BooleanProperty CONNECTED_EAST = BooleanProperty.create("connected_east"); public BlockConnectedTexture(Material material) { diff --git a/src/main/java/slimeknights/mantle/client/ClientProxy.java b/src/main/java/slimeknights/mantle/client/ClientProxy.java index f31693a..0b42c2a 100644 --- a/src/main/java/slimeknights/mantle/client/ClientProxy.java +++ b/src/main/java/slimeknights/mantle/client/ClientProxy.java @@ -1,11 +1,9 @@ package slimeknights.mantle.client; import net.minecraft.client.Minecraft; -import net.minecraft.client.resources.IReloadableResourceManager; +import net.minecraft.resources.IReloadableResourceManager; import net.minecraftforge.common.MinecraftForge; -import java.awt.print.Book; - import slimeknights.mantle.client.book.BookLoader; import slimeknights.mantle.common.CommonProxy; @@ -20,12 +18,12 @@ public class ClientProxy extends CommonProxy { @Override public void init() { - bookLoader.onResourceManagerReload(Minecraft.getMinecraft().getResourceManager()); + bookLoader.onResourceManagerReload(Minecraft.getInstance().getResourceManager()); } @Override public void postInit() { - ((IReloadableResourceManager) Minecraft.getMinecraft().getResourceManager()).registerReloadListener(bookLoader); + ((IReloadableResourceManager) Minecraft.getInstance().getResourceManager()).addReloadListener(bookLoader); MinecraftForge.EVENT_BUS.register(new ExtraHeartRenderHandler()); } } diff --git a/src/main/java/slimeknights/mantle/client/CreativeTab.java b/src/main/java/slimeknights/mantle/client/CreativeTab.java index 5f9e300..73b0566 100644 --- a/src/main/java/slimeknights/mantle/client/CreativeTab.java +++ b/src/main/java/slimeknights/mantle/client/CreativeTab.java @@ -1,13 +1,13 @@ package slimeknights.mantle.client; -import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import javax.annotation.Nonnull; -public class CreativeTab extends CreativeTabs { +public class CreativeTab extends ItemGroup { private ItemStack icon; @@ -25,16 +25,16 @@ public class CreativeTab extends CreativeTabs { } @Nonnull - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @Override - public ItemStack getIconItemStack() { + public ItemStack getIcon() { return icon; } @Nonnull - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @Override - public ItemStack getTabIconItem() { + public ItemStack createIcon() { return icon; } } diff --git a/src/main/java/slimeknights/mantle/client/ExtraHeartRenderHandler.java b/src/main/java/slimeknights/mantle/client/ExtraHeartRenderHandler.java index 5f3f780..94c7206 100644 --- a/src/main/java/slimeknights/mantle/client/ExtraHeartRenderHandler.java +++ b/src/main/java/slimeknights/mantle/client/ExtraHeartRenderHandler.java @@ -2,35 +2,34 @@ package slimeknights.mantle.client; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Gui; -import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.Entity; import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.ai.attributes.IAttributeInstance; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.init.MobEffects; import net.minecraft.potion.PotionEffect; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.Util; import net.minecraft.util.math.MathHelper; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.client.GuiIngameForge; import net.minecraftforge.client.event.RenderGameOverlayEvent; -import net.minecraftforge.fml.common.eventhandler.EventPriority; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import java.util.Random; +import net.minecraftforge.eventbus.api.EventPriority; +import net.minecraftforge.eventbus.api.SubscribeEvent; import slimeknights.mantle.Mantle; -@SideOnly(Side.CLIENT) +@OnlyIn(Dist.CLIENT) public class ExtraHeartRenderHandler { private static final ResourceLocation ICON_HEARTS = new ResourceLocation(Mantle.modId, "textures/gui/hearts.png"); private static final ResourceLocation ICON_ABSORB = new ResourceLocation(Mantle.modId, "textures/gui/absorb.png"); private static final ResourceLocation ICON_VANILLA = Gui.ICONS; - private final Minecraft mc = Minecraft.getMinecraft(); + private final Minecraft mc = Minecraft.getInstance(); private int updateCounter = 0; private int playerHealth = 0; @@ -46,7 +45,7 @@ public class ExtraHeartRenderHandler { private static int left_height = 39; public void drawTexturedModalRect(int x, int y, int textureX, int textureY, int width, int height) { - Minecraft.getMinecraft().ingameGUI.drawTexturedModalRect(x, y, textureX, textureY, width, height); + Minecraft.getInstance().ingameGUI.drawTexturedModalRect(x, y, textureX, textureY, width, height); } /* HUD */ @@ -62,15 +61,14 @@ public class ExtraHeartRenderHandler { // extra setup stuff from us left_height = GuiIngameForge.left_height; - ScaledResolution resolution = event.getResolution(); - width = resolution.getScaledWidth(); - height = resolution.getScaledHeight(); + width = mc.mainWindow.getScaledWidth(); + height = mc.mainWindow.getScaledHeight(); event.setCanceled(true); - updateCounter = mc.ingameGUI.getUpdateCounter(); + updateCounter = mc.ingameGUI.getTicks(); // start default forge/mc rendering // changes are indicated by comment - mc.mcProfiler.startSection("health"); + mc.profiler.startSection("health"); GlStateManager.enableBlend(); int health = MathHelper.ceil(player.getHealth()); @@ -78,27 +76,27 @@ public class ExtraHeartRenderHandler { if (health < this.playerHealth && player.hurtResistantTime > 0) { - this.lastSystemTime = Minecraft.getSystemTime(); + this.lastSystemTime = Util.milliTime(); this.healthUpdateCounter = (long)(this.updateCounter + 20); } else if (health > this.playerHealth && player.hurtResistantTime > 0) { - this.lastSystemTime = Minecraft.getSystemTime(); + this.lastSystemTime = Util.milliTime(); this.healthUpdateCounter = (long)(this.updateCounter + 10); } - if (Minecraft.getSystemTime() - this.lastSystemTime > 1000L) + if (Util.milliTime() - this.lastSystemTime > 1000L) { this.playerHealth = health; this.lastPlayerHealth = health; - this.lastSystemTime = Minecraft.getSystemTime(); + this.lastSystemTime = Util.milliTime(); } this.playerHealth = health; int healthLast = this.lastPlayerHealth; - IAttributeInstance attrMaxHealth = player.getEntityAttribute(SharedMonsterAttributes.MAX_HEALTH); - float healthMax = (float)attrMaxHealth.getAttributeValue(); + IAttributeInstance attrMaxHealth = player.getAttribute(SharedMonsterAttributes.MAX_HEALTH); + float healthMax = (float)attrMaxHealth.getValue(); float absorb = MathHelper.ceil(player.getAbsorptionAmount()); // CHANGE: simulate 10 hearts max if there's more, so vanilla only renders one row max @@ -122,7 +120,7 @@ public class ExtraHeartRenderHandler { regen = updateCounter % 25; } - final int TOP = 9 * (mc.world.getWorldInfo().isHardcoreModeEnabled() ? 5 : 0); + final int TOP = 9 * (mc.world.getWorldInfo().isHardcore() ? 5 : 0); final int BACKGROUND = (highlight ? 25 : 16); int MARGIN = 16; if (player.isPotionActive(MobEffects.POISON)) MARGIN += 36; @@ -185,7 +183,7 @@ public class ExtraHeartRenderHandler { event.setCanceled(true); GlStateManager.disableBlend(); - mc.mcProfiler.endSection(); + mc.profiler.endSection(); } private void renderExtraHearts(int xBasePos, int yBasePos, EntityPlayer player) { @@ -237,7 +235,7 @@ public class ExtraHeartRenderHandler { if(potion != null) { potionOffset = 9; } - if(mc.world.getWorldInfo().isHardcoreModeEnabled()) { + if(mc.world.getWorldInfo().isHardcore()) { potionOffset += 27; } return potionOffset; diff --git a/src/main/java/slimeknights/mantle/client/ModelHelper.java b/src/main/java/slimeknights/mantle/client/ModelHelper.java index d6fbbb7..dbd2665 100644 --- a/src/main/java/slimeknights/mantle/client/ModelHelper.java +++ b/src/main/java/slimeknights/mantle/client/ModelHelper.java @@ -5,8 +5,8 @@ import com.google.common.collect.ImmutableMap; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.block.model.BakedQuad; -import net.minecraft.client.renderer.block.model.ItemCameraTransforms; +import net.minecraft.client.renderer.model.BakedQuad; +import net.minecraft.client.renderer.model.ItemCameraTransforms; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.vertex.VertexFormat; import net.minecraft.client.renderer.vertex.VertexFormatElement; @@ -28,11 +28,11 @@ public class ModelHelper { public static TextureAtlasSprite getTextureFromBlock(Block block, int meta) { IBlockState state = block.getStateFromMeta(meta); - return Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getTexture(state); + return Minecraft.getInstance().getBlockRendererDispatcher().getBlockModelShapes().getTexture(state); } public static TextureAtlasSprite getTextureFromBlockstate(IBlockState state) { - return Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getTexture(state); + return Minecraft.getInstance().getBlockRendererDispatcher().getBlockModelShapes().getTexture(state); } public static BakedQuad colorQuad(int color, BakedQuad quad) { diff --git a/src/main/java/slimeknights/mantle/client/book/BookHelper.java b/src/main/java/slimeknights/mantle/client/book/BookHelper.java index f933daf..084c03f 100644 --- a/src/main/java/slimeknights/mantle/client/book/BookHelper.java +++ b/src/main/java/slimeknights/mantle/client/book/BookHelper.java @@ -1,7 +1,7 @@ package slimeknights.mantle.client.book; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTBase; +import net.minecraft.nbt.INBTBase; import net.minecraft.nbt.NBTTagCompound; import java.util.Arrays; @@ -9,10 +9,10 @@ import java.util.Arrays; public class BookHelper { public static String getSavedPage(ItemStack item) { - if(!item.isEmpty() && item.hasTagCompound()) { - NBTTagCompound mantleBook = item.getTagCompound().getCompoundTag("mantle").getCompoundTag("book"); + if(!item.isEmpty() && item.hasTag()) { + NBTTagCompound mantleBook = item.getTag().getCompound("mantle").getCompound("book"); - if(mantleBook.hasKey("page", Arrays.asList(NBTBase.NBT_TYPES).indexOf("STRING"))) { + if(mantleBook.contains("page", Arrays.asList(INBTBase.NBT_TYPES).indexOf("STRING"))) { return mantleBook.getString("page"); } } @@ -21,20 +21,20 @@ public class BookHelper { } public static void writeSavedPage(ItemStack item, String page) { - NBTTagCompound compound = item.getTagCompound(); + NBTTagCompound compound = item.getTag(); if(compound == null) { compound = new NBTTagCompound(); } - NBTTagCompound mantle = compound.getCompoundTag("mantle"); - NBTTagCompound book = mantle.getCompoundTag("book"); + NBTTagCompound mantle = compound.getCompound("mantle"); + NBTTagCompound book = mantle.getCompound("book"); - book.setString("page", page); + book.putString("page", page); - mantle.setTag("book", book); - compound.setTag("mantle", mantle); - item.setTagCompound(compound); + mantle.put("book", book); + compound.put("mantle", mantle); + item.setTag(compound); } } diff --git a/src/main/java/slimeknights/mantle/client/book/BookLoader.java b/src/main/java/slimeknights/mantle/client/book/BookLoader.java index 623ec91..14d9afe 100644 --- a/src/main/java/slimeknights/mantle/client/book/BookLoader.java +++ b/src/main/java/slimeknights/mantle/client/book/BookLoader.java @@ -3,31 +3,25 @@ package slimeknights.mantle.client.book; import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import net.minecraft.client.Minecraft; -import net.minecraft.client.resources.IReloadableResourceManager; -import net.minecraft.client.resources.IResourceManager; -import net.minecraft.client.resources.IResourceManagerReloadListener; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.resources.IResourceManager; +import net.minecraft.resources.IResourceManagerReloadListener; import net.minecraft.util.EnumHand; -import net.minecraftforge.fml.common.Loader; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; +import net.minecraftforge.fml.ModLoadingContext; import java.util.HashMap; import javax.annotation.Nonnull; -import slimeknights.mantle.Mantle; import slimeknights.mantle.client.book.action.StringActionProcessor; import slimeknights.mantle.client.book.action.protocol.ProtocolGoToPage; import slimeknights.mantle.client.book.data.BookData; -import slimeknights.mantle.client.book.data.PageData; -import slimeknights.mantle.client.book.data.SectionData; import slimeknights.mantle.client.book.data.content.ContentBlank; import slimeknights.mantle.client.book.data.content.ContentBlockInteraction; import slimeknights.mantle.client.book.data.content.ContentCrafting; -import slimeknights.mantle.client.book.data.content.ContentError; import slimeknights.mantle.client.book.data.content.ContentImage; import slimeknights.mantle.client.book.data.content.ContentImageText; import slimeknights.mantle.client.book.data.content.ContentSmelting; @@ -43,7 +37,7 @@ import slimeknights.mantle.client.book.repository.BookRepository; import slimeknights.mantle.network.NetworkWrapper; import slimeknights.mantle.network.book.PacketUpdateSavedPage; -@SideOnly(Side.CLIENT) +@OnlyIn(Dist.CLIENT) public class BookLoader implements IResourceManagerReloadListener { /** GSON object to be used for book loading purposes */ @@ -130,7 +124,7 @@ public class BookLoader implements IResourceManagerReloadListener { public static BookData registerBook(String name, boolean appendIndex, boolean appendContentTable, BookRepository... repositories) { BookData info = new BookData(repositories); - books.put(name.contains(":") ? name : Loader.instance().activeModContainer().getModId() + ":" + name, info); + books.put(name.contains(":") ? name : ModLoadingContext.get().getActiveContainer().getNamespace() + ":" + name, info); if(appendIndex) { info.addTransformer(BookTransformer.IndexTranformer()); diff --git a/src/main/java/slimeknights/mantle/client/book/StructureBlockAccess.java b/src/main/java/slimeknights/mantle/client/book/StructureBlockAccess.java index 67efc42..f4f2b25 100644 --- a/src/main/java/slimeknights/mantle/client/book/StructureBlockAccess.java +++ b/src/main/java/slimeknights/mantle/client/book/StructureBlockAccess.java @@ -1,18 +1,28 @@ package slimeknights.mantle.client.book; import net.minecraft.block.state.IBlockState; +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.fluid.IFluidState; import net.minecraft.init.Blocks; +import net.minecraft.init.Fluids; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.WorldType; +import net.minecraft.util.math.shapes.VoxelShape; +import net.minecraft.world.EnumLightType; +import net.minecraft.world.IWorldReader; import net.minecraft.world.biome.Biome; +import net.minecraft.world.border.WorldBorder; +import net.minecraft.world.dimension.Dimension; +import net.minecraft.world.gen.Heightmap.Type; + +import java.util.function.Predicate; import javax.annotation.Nullable; -public class StructureBlockAccess implements IBlockAccess { - +public class StructureBlockAccess implements IWorldReader +{ private final StructureInfo data; private final IBlockState[][][] structure; @@ -33,6 +43,11 @@ public class StructureBlockAccess implements IBlockAccess { return 15 << 20 | 15 << 4; } + @Override + public int getLightFor(EnumLightType type, BlockPos pos) { + return 15 << 20 | 15 << 4; + } + @Override public IBlockState getBlockState(BlockPos pos) { int x = pos.getX(); @@ -68,12 +83,62 @@ public class StructureBlockAccess implements IBlockAccess { } @Override - public WorldType getWorldType() { + public int getLightSubtracted(BlockPos pos, int amount) { + return 0; + } + + @Override + public boolean isChunkLoaded(int x, int z, boolean allowEmpty) { + return false; + } + + @Override + public boolean canSeeSky(BlockPos pos) { + return true; + } + + @Override + public int getHeight(Type heightmapType, int x, int z) { + return 0; + } + + @Override + public EntityPlayer getClosestPlayer(double x, double y, double z, double distance, Predicate predicate) { return null; } @Override - public boolean isSideSolid(BlockPos pos, EnumFacing side, boolean _default) { + public int getSkylightSubtracted() { + return 0; + } + + @Override + public WorldBorder getWorldBorder() { + return null; + } + + @Override + public boolean checkNoEntityCollision(Entity entityIn, VoxelShape shape) { return false; } + + @Override + public boolean isRemote() { + return false; + } + + @Override + public int getSeaLevel() { + return 0; + } + + @Override + public Dimension getDimension() { + return null; + } + + @Override + public IFluidState getFluidState(BlockPos pos) { + return Fluids.EMPTY.getDefaultState(); + } } diff --git a/src/main/java/slimeknights/mantle/client/book/StructureInfo.java b/src/main/java/slimeknights/mantle/client/book/StructureInfo.java index 3039e70..979076c 100644 --- a/src/main/java/slimeknights/mantle/client/book/StructureInfo.java +++ b/src/main/java/slimeknights/mantle/client/book/StructureInfo.java @@ -1,17 +1,15 @@ package slimeknights.mantle.client.book; import net.minecraft.block.Block; -import net.minecraft.block.properties.IProperty; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; -import net.minecraftforge.common.property.IExtendedBlockState; -import net.minecraftforge.common.property.IUnlistedProperty; import java.util.Map; import java.util.Optional; -import java.util.stream.IntStream; +import net.minecraft.state.IProperty; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.registries.ForgeRegistries; import slimeknights.mantle.client.book.data.element.BlockData; public class StructureInfo { @@ -50,7 +48,7 @@ public class StructureInfo { } private IBlockState convert(BlockData data) { - Block block = Block.getBlockFromName(data.block); + Block block = ForgeRegistries.BLOCKS.getValue(new ResourceLocation(data.block)); if(block == null) { return Blocks.AIR.getDefaultState(); } @@ -62,7 +60,7 @@ public class StructureInfo { state = block.getDefaultState(); for(Map.Entry entry : data.state.entrySet()) { - Optional> property = state.getPropertyKeys().stream().filter(iProperty -> entry.getKey().equals(iProperty.getName())).findFirst(); + Optional> property = state.getProperties().stream().filter(iProperty -> entry.getKey().equals(iProperty.getName())).findFirst(); if(property.isPresent()) { state = setProperty(state, property.get(), entry.getValue()); @@ -73,9 +71,9 @@ public class StructureInfo { } private > IBlockState setProperty(IBlockState state, IProperty prop, String valueString) { - com.google.common.base.Optional value = prop.parseValue(valueString); + java.util.Optional value = prop.parseValue(valueString); if(value.isPresent()) { - state = state.withProperty(prop, value.get()); + state = state.with(prop, value.get()); } return state; } diff --git a/src/main/java/slimeknights/mantle/client/book/data/AppearanceData.java b/src/main/java/slimeknights/mantle/client/book/data/AppearanceData.java index 25664d2..77ed14d 100644 --- a/src/main/java/slimeknights/mantle/client/book/data/AppearanceData.java +++ b/src/main/java/slimeknights/mantle/client/book/data/AppearanceData.java @@ -1,9 +1,9 @@ package slimeknights.mantle.client.book.data; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; -@SideOnly(Side.CLIENT) +@OnlyIn(Dist.CLIENT) public class AppearanceData implements IDataItem { public int coverColor = 0x8B4631; diff --git a/src/main/java/slimeknights/mantle/client/book/data/BookData.java b/src/main/java/slimeknights/mantle/client/book/data/BookData.java index 9b9a941..74efd48 100644 --- a/src/main/java/slimeknights/mantle/client/book/data/BookData.java +++ b/src/main/java/slimeknights/mantle/client/book/data/BookData.java @@ -4,8 +4,8 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import slimeknights.mantle.Mantle; import slimeknights.mantle.client.book.BookLoader; import slimeknights.mantle.client.book.BookTransformer; @@ -23,7 +23,7 @@ import java.util.HashMap; import java.util.List; import java.util.stream.Collectors; -@SideOnly(Side.CLIENT) +@OnlyIn(Dist.CLIENT) public class BookData implements IDataItem { public transient int unnamedSectionCounter = 0; @@ -330,7 +330,7 @@ public class BookData implements IDataItem { public String getItemAction(ItemStackData item) { for(ItemStackData.ItemLink link : itemLinks) { - if(item.id.equals(link.item.id) && (!link.damageSensitive || item.damage == link.item.damage)) { + if(item.id.equals(link.item.id) && (!link.damageSensitive)) { return link.action; } } @@ -360,8 +360,8 @@ public class BookData implements IDataItem { if(!initialized) { load(); } - if(Minecraft.getMinecraft().player != null) { - Minecraft.getMinecraft().displayGuiScreen(new GuiBook(this, item)); + if(Minecraft.getInstance().player != null) { + Minecraft.getInstance().displayGuiScreen(new GuiBook(this, item)); } } diff --git a/src/main/java/slimeknights/mantle/client/book/data/IDataItem.java b/src/main/java/slimeknights/mantle/client/book/data/IDataItem.java index 9aeda20..38bbebb 100644 --- a/src/main/java/slimeknights/mantle/client/book/data/IDataItem.java +++ b/src/main/java/slimeknights/mantle/client/book/data/IDataItem.java @@ -1,9 +1,9 @@ package slimeknights.mantle.client.book.data; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; -@SideOnly(Side.CLIENT) +@OnlyIn(Dist.CLIENT) public interface IDataItem { void load(); diff --git a/src/main/java/slimeknights/mantle/client/book/data/PageData.java b/src/main/java/slimeknights/mantle/client/book/data/PageData.java index ddbe1ca..da8605f 100644 --- a/src/main/java/slimeknights/mantle/client/book/data/PageData.java +++ b/src/main/java/slimeknights/mantle/client/book/data/PageData.java @@ -1,14 +1,14 @@ package slimeknights.mantle.client.book.data; import net.minecraft.client.renderer.texture.TextureMap; -import net.minecraft.client.resources.IResource; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import java.lang.reflect.Field; import java.lang.reflect.Modifier; import java.util.ArrayList; +import net.minecraft.resources.IResource; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import slimeknights.mantle.client.book.BookLoader; import slimeknights.mantle.client.book.data.content.ContentError; import slimeknights.mantle.client.book.data.content.PageContent; @@ -17,7 +17,7 @@ import slimeknights.mantle.client.book.data.element.DataLocation; import slimeknights.mantle.client.book.data.element.ItemStackData; import slimeknights.mantle.client.book.repository.BookRepository; -@SideOnly(Side.CLIENT) +@OnlyIn(Dist.CLIENT) public class PageData implements IDataItem { private static final transient ArrayList hotswaps = new ArrayList<>(); diff --git a/src/main/java/slimeknights/mantle/client/book/data/SectionData.java b/src/main/java/slimeknights/mantle/client/book/data/SectionData.java index b7d7a89..7cfabea 100644 --- a/src/main/java/slimeknights/mantle/client/book/data/SectionData.java +++ b/src/main/java/slimeknights/mantle/client/book/data/SectionData.java @@ -2,9 +2,9 @@ package slimeknights.mantle.client.book.data; import com.google.common.collect.Sets; import net.minecraft.advancements.AdvancementProgress; -import net.minecraft.client.resources.IResource; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraft.resources.IResource; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import slimeknights.mantle.client.book.BookLoader; import slimeknights.mantle.client.book.data.content.ContentError; import slimeknights.mantle.client.book.data.element.ImageData; @@ -16,7 +16,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Set; -@SideOnly(Side.CLIENT) +@OnlyIn(Dist.CLIENT) public class SectionData implements IDataItem { public String name = null; diff --git a/src/main/java/slimeknights/mantle/client/book/data/content/ContentBlank.java b/src/main/java/slimeknights/mantle/client/book/data/content/ContentBlank.java index be15034..ddc55c1 100644 --- a/src/main/java/slimeknights/mantle/client/book/data/content/ContentBlank.java +++ b/src/main/java/slimeknights/mantle/client/book/data/content/ContentBlank.java @@ -1,14 +1,14 @@ package slimeknights.mantle.client.book.data.content; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import java.util.ArrayList; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import slimeknights.mantle.client.book.data.BookData; import slimeknights.mantle.client.gui.book.element.BookElement; -@SideOnly(Side.CLIENT) +@OnlyIn(Dist.CLIENT) public class ContentBlank extends PageContent { @Override diff --git a/src/main/java/slimeknights/mantle/client/book/data/content/ContentDummy.java b/src/main/java/slimeknights/mantle/client/book/data/content/ContentDummy.java index b92d0e3..ab75458 100644 --- a/src/main/java/slimeknights/mantle/client/book/data/content/ContentDummy.java +++ b/src/main/java/slimeknights/mantle/client/book/data/content/ContentDummy.java @@ -1,14 +1,13 @@ package slimeknights.mantle.client.book.data.content; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - import java.util.ArrayList; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import slimeknights.mantle.client.book.data.BookData; import slimeknights.mantle.client.gui.book.element.BookElement; -@SideOnly(Side.CLIENT) +@OnlyIn(Dist.CLIENT) public class ContentDummy extends PageContent { @Override diff --git a/src/main/java/slimeknights/mantle/client/book/data/content/ContentError.java b/src/main/java/slimeknights/mantle/client/book/data/content/ContentError.java index a83be52..8af41aa 100644 --- a/src/main/java/slimeknights/mantle/client/book/data/content/ContentError.java +++ b/src/main/java/slimeknights/mantle/client/book/data/content/ContentError.java @@ -1,17 +1,16 @@ package slimeknights.mantle.client.book.data.content; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - import java.util.ArrayList; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import slimeknights.mantle.client.book.data.BookData; import slimeknights.mantle.client.book.data.element.TextData; import slimeknights.mantle.client.gui.book.GuiBook; import slimeknights.mantle.client.gui.book.element.BookElement; import slimeknights.mantle.client.gui.book.element.ElementText; -@SideOnly(Side.CLIENT) +@OnlyIn(Dist.CLIENT) public class ContentError extends PageContent { private String errorStage; diff --git a/src/main/java/slimeknights/mantle/client/book/data/content/ContentImage.java b/src/main/java/slimeknights/mantle/client/book/data/content/ContentImage.java index 0b5fe47..a931f8d 100644 --- a/src/main/java/slimeknights/mantle/client/book/data/content/ContentImage.java +++ b/src/main/java/slimeknights/mantle/client/book/data/content/ContentImage.java @@ -1,17 +1,16 @@ package slimeknights.mantle.client.book.data.content; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - import java.util.ArrayList; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import slimeknights.mantle.client.book.data.BookData; import slimeknights.mantle.client.book.data.element.ImageData; import slimeknights.mantle.client.gui.book.GuiBook; import slimeknights.mantle.client.gui.book.element.BookElement; import slimeknights.mantle.client.gui.book.element.ElementImage; -@SideOnly(Side.CLIENT) +@OnlyIn(Dist.CLIENT) public class ContentImage extends PageContent { public String title = null; diff --git a/src/main/java/slimeknights/mantle/client/book/data/content/ContentImageText.java b/src/main/java/slimeknights/mantle/client/book/data/content/ContentImageText.java index 93ebe69..8b242a3 100644 --- a/src/main/java/slimeknights/mantle/client/book/data/content/ContentImageText.java +++ b/src/main/java/slimeknights/mantle/client/book/data/content/ContentImageText.java @@ -1,10 +1,9 @@ package slimeknights.mantle.client.book.data.content; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - import java.util.ArrayList; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import slimeknights.mantle.client.book.data.BookData; import slimeknights.mantle.client.book.data.element.ImageData; import slimeknights.mantle.client.book.data.element.TextData; @@ -13,7 +12,7 @@ import slimeknights.mantle.client.gui.book.element.BookElement; import slimeknights.mantle.client.gui.book.element.ElementImage; import slimeknights.mantle.client.gui.book.element.ElementText; -@SideOnly(Side.CLIENT) +@OnlyIn(Dist.CLIENT) public class ContentImageText extends PageContent { public String title = null; diff --git a/src/main/java/slimeknights/mantle/client/book/data/content/ContentSmelting.java b/src/main/java/slimeknights/mantle/client/book/data/content/ContentSmelting.java index b18709b..35b7496 100644 --- a/src/main/java/slimeknights/mantle/client/book/data/content/ContentSmelting.java +++ b/src/main/java/slimeknights/mantle/client/book/data/content/ContentSmelting.java @@ -66,20 +66,35 @@ public class ContentSmelting extends PageContent { public NonNullList getFuelsList() { //TODO ask JEI for fuel list if it is present - NonNullList fuels = NonNullList. withSize(13, ItemStack.EMPTY); - fuels.set(0, new ItemStack(Blocks.WOODEN_SLAB)); - fuels.set(1, new ItemStack(Blocks.PLANKS)); - fuels.set(2, new ItemStack(Blocks.COAL_BLOCK)); - fuels.set(3, new ItemStack(Items.WOODEN_PICKAXE)); - fuels.set(4, new ItemStack(Items.WOODEN_SWORD)); - fuels.set(5, new ItemStack(Items.WOODEN_HOE)); - fuels.set(6, new ItemStack(Items.STICK)); - fuels.set(7, new ItemStack(Items.COAL)); - fuels.set(8, new ItemStack(Items.LAVA_BUCKET)); - fuels.set(9, new ItemStack(Blocks.SAPLING)); - fuels.set(10, new ItemStack(Items.BLAZE_ROD)); - fuels.set(11, new ItemStack(Items.WOODEN_SHOVEL)); - fuels.set(12, new ItemStack(Items.WOODEN_AXE)); + NonNullList fuels = NonNullList. withSize(28, ItemStack.EMPTY); + fuels.set(0, new ItemStack(Blocks.OAK_SLAB)); + fuels.set(1, new ItemStack(Blocks.SPRUCE_SLAB)); + fuels.set(2, new ItemStack(Blocks.BIRCH_SLAB)); + fuels.set(3, new ItemStack(Blocks.JUNGLE_SLAB)); + fuels.set(4, new ItemStack(Blocks.ACACIA_SLAB)); + fuels.set(5, new ItemStack(Blocks.DARK_OAK_SLAB)); + fuels.set(6, new ItemStack(Blocks.OAK_PLANKS)); + fuels.set(7, new ItemStack(Blocks.SPRUCE_PLANKS)); + fuels.set(8, new ItemStack(Blocks.BIRCH_PLANKS)); + fuels.set(9, new ItemStack(Blocks.JUNGLE_PLANKS)); + fuels.set(10, new ItemStack(Blocks.ACACIA_PLANKS)); + fuels.set(11, new ItemStack(Blocks.DARK_OAK_PLANKS)); + fuels.set(12, new ItemStack(Blocks.COAL_BLOCK)); + fuels.set(13, new ItemStack(Items.WOODEN_PICKAXE)); + fuels.set(14, new ItemStack(Items.WOODEN_SWORD)); + fuels.set(15, new ItemStack(Items.WOODEN_HOE)); + fuels.set(16, new ItemStack(Items.STICK)); + fuels.set(17, new ItemStack(Items.COAL)); + fuels.set(18, new ItemStack(Items.LAVA_BUCKET)); + fuels.set(19, new ItemStack(Blocks.OAK_SAPLING)); + fuels.set(20, new ItemStack(Blocks.SPRUCE_SAPLING)); + fuels.set(21, new ItemStack(Blocks.BIRCH_SAPLING)); + fuels.set(22, new ItemStack(Blocks.JUNGLE_SAPLING)); + fuels.set(23, new ItemStack(Blocks.ACACIA_SAPLING)); + fuels.set(24, new ItemStack(Blocks.DARK_OAK_SAPLING)); + fuels.set(25, new ItemStack(Items.BLAZE_ROD)); + fuels.set(26, new ItemStack(Items.WOODEN_SHOVEL)); + fuels.set(27, new ItemStack(Items.WOODEN_AXE)); return fuels; } diff --git a/src/main/java/slimeknights/mantle/client/book/data/content/ContentTableOfContents.java b/src/main/java/slimeknights/mantle/client/book/data/content/ContentTableOfContents.java index 51ff055..a3df204 100644 --- a/src/main/java/slimeknights/mantle/client/book/data/content/ContentTableOfContents.java +++ b/src/main/java/slimeknights/mantle/client/book/data/content/ContentTableOfContents.java @@ -32,8 +32,8 @@ public class ContentTableOfContents extends PageContent { for(int i = 0; i < data.length; i++) { TextData text = data[i]; list.add(new ElementText(0, y + i * (int) (Minecraft - .getMinecraft().fontRenderer.FONT_HEIGHT * text.scale), GuiBook.PAGE_WIDTH, Minecraft - .getMinecraft().fontRenderer.FONT_HEIGHT, new TextData[]{text})); + .getInstance().fontRenderer.FONT_HEIGHT * text.scale), GuiBook.PAGE_WIDTH, Minecraft + .getInstance().fontRenderer.FONT_HEIGHT, new TextData[]{text})); } } } diff --git a/src/main/java/slimeknights/mantle/client/book/data/content/ContentText.java b/src/main/java/slimeknights/mantle/client/book/data/content/ContentText.java index 21e4a7b..c858012 100644 --- a/src/main/java/slimeknights/mantle/client/book/data/content/ContentText.java +++ b/src/main/java/slimeknights/mantle/client/book/data/content/ContentText.java @@ -1,7 +1,7 @@ package slimeknights.mantle.client.book.data.content; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import java.util.ArrayList; @@ -11,7 +11,7 @@ import slimeknights.mantle.client.gui.book.GuiBook; import slimeknights.mantle.client.gui.book.element.BookElement; import slimeknights.mantle.client.gui.book.element.ElementText; -@SideOnly(Side.CLIENT) +@OnlyIn(Dist.CLIENT) public class ContentText extends PageContent { public String title = null; diff --git a/src/main/java/slimeknights/mantle/client/book/data/content/ContentTextImage.java b/src/main/java/slimeknights/mantle/client/book/data/content/ContentTextImage.java index 5dfe008..6ce57d7 100644 --- a/src/main/java/slimeknights/mantle/client/book/data/content/ContentTextImage.java +++ b/src/main/java/slimeknights/mantle/client/book/data/content/ContentTextImage.java @@ -1,7 +1,7 @@ package slimeknights.mantle.client.book.data.content; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import java.util.ArrayList; @@ -13,7 +13,7 @@ import slimeknights.mantle.client.gui.book.element.BookElement; import slimeknights.mantle.client.gui.book.element.ElementImage; import slimeknights.mantle.client.gui.book.element.ElementText; -@SideOnly(Side.CLIENT) +@OnlyIn(Dist.CLIENT) public class ContentTextImage extends PageContent { public String title = null; diff --git a/src/main/java/slimeknights/mantle/client/book/data/content/ContentTextLeftImage.java b/src/main/java/slimeknights/mantle/client/book/data/content/ContentTextLeftImage.java index 4125d6a..5c7984a 100644 --- a/src/main/java/slimeknights/mantle/client/book/data/content/ContentTextLeftImage.java +++ b/src/main/java/slimeknights/mantle/client/book/data/content/ContentTextLeftImage.java @@ -1,7 +1,7 @@ package slimeknights.mantle.client.book.data.content; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import java.util.ArrayList; @@ -13,7 +13,7 @@ import slimeknights.mantle.client.gui.book.element.BookElement; import slimeknights.mantle.client.gui.book.element.ElementImage; import slimeknights.mantle.client.gui.book.element.ElementText; -@SideOnly(Side.CLIENT) +@OnlyIn(Dist.CLIENT) public class ContentTextLeftImage extends PageContent { public String title = null; diff --git a/src/main/java/slimeknights/mantle/client/book/data/content/ContentTextRightImage.java b/src/main/java/slimeknights/mantle/client/book/data/content/ContentTextRightImage.java index 790b573..4f6c2f1 100644 --- a/src/main/java/slimeknights/mantle/client/book/data/content/ContentTextRightImage.java +++ b/src/main/java/slimeknights/mantle/client/book/data/content/ContentTextRightImage.java @@ -1,7 +1,7 @@ package slimeknights.mantle.client.book.data.content; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import java.util.ArrayList; @@ -13,7 +13,7 @@ import slimeknights.mantle.client.gui.book.element.BookElement; import slimeknights.mantle.client.gui.book.element.ElementImage; import slimeknights.mantle.client.gui.book.element.ElementText; -@SideOnly(Side.CLIENT) +@OnlyIn(Dist.CLIENT) public class ContentTextRightImage extends PageContent { public String title; diff --git a/src/main/java/slimeknights/mantle/client/book/data/content/PageContent.java b/src/main/java/slimeknights/mantle/client/book/data/content/PageContent.java index f34f321..fff49df 100644 --- a/src/main/java/slimeknights/mantle/client/book/data/content/PageContent.java +++ b/src/main/java/slimeknights/mantle/client/book/data/content/PageContent.java @@ -1,10 +1,9 @@ package slimeknights.mantle.client.book.data.content; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - import java.util.ArrayList; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import slimeknights.mantle.client.book.data.BookData; import slimeknights.mantle.client.book.data.PageData; import slimeknights.mantle.client.book.data.element.TextData; @@ -13,7 +12,7 @@ import slimeknights.mantle.client.gui.book.GuiBook; import slimeknights.mantle.client.gui.book.element.BookElement; import slimeknights.mantle.client.gui.book.element.ElementText; -@SideOnly(Side.CLIENT) +@OnlyIn(Dist.CLIENT) public abstract class PageContent { public static final transient int TITLE_HEIGHT = 16; diff --git a/src/main/java/slimeknights/mantle/client/book/data/element/ImageData.java b/src/main/java/slimeknights/mantle/client/book/data/element/ImageData.java index 1e10561..c1c7c71 100644 --- a/src/main/java/slimeknights/mantle/client/book/data/element/ImageData.java +++ b/src/main/java/slimeknights/mantle/client/book/data/element/ImageData.java @@ -1,10 +1,10 @@ package slimeknights.mantle.client.book.data.element; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; -@SideOnly(Side.CLIENT) +@OnlyIn(Dist.CLIENT) public class ImageData extends DataLocation { public static final ImageData MISSING = new ImageData(); diff --git a/src/main/java/slimeknights/mantle/client/book/data/element/ItemStackData.java b/src/main/java/slimeknights/mantle/client/book/data/element/ItemStackData.java index 36d716d..1d77b49 100644 --- a/src/main/java/slimeknights/mantle/client/book/data/element/ItemStackData.java +++ b/src/main/java/slimeknights/mantle/client/book/data/element/ItemStackData.java @@ -2,20 +2,21 @@ package slimeknights.mantle.client.book.data.element; import com.google.gson.JsonObject; -import net.minecraft.command.CommandGive; -import net.minecraft.command.NumberInvalidException; +import com.mojang.brigadier.exceptions.CommandSyntaxException; +import net.minecraft.command.arguments.ItemArgument; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.JsonToNBT; -import net.minecraft.nbt.NBTException; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.nbt.NBTTagString; import net.minecraft.util.NonNullList; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.registry.IRegistry; +import net.minecraftforge.registries.ForgeRegistries; import slimeknights.mantle.client.book.BookLoader; import slimeknights.mantle.client.book.repository.BookRepository; @@ -28,7 +29,6 @@ public class ItemStackData { public String id = ""; public byte amount = 1; - public short damage = 0; public JsonObject nbt; public NonNullList getItems() { @@ -56,8 +56,8 @@ public class ItemStackData { Item item; boolean isMissingItem = false; try { - item = CommandGive.getItemByText(null, id); - } catch(NumberInvalidException e) { + item = ItemArgument.getItem(null, id).getItem(); + } catch(Exception e) { item = Item.getItemFromBlock(Blocks.BARRIER); isMissingItem = true; } @@ -67,22 +67,22 @@ public class ItemStackData { isMissingItem = true; } - ItemStack itemStack = new ItemStack(item, amount, damage); + ItemStack itemStack = new ItemStack(item, amount); if(nbt != null) { try { - itemStack.setTagCompound(JsonToNBT.getTagFromJson(filterJsonQuotes(nbt.toString()))); - } catch(NBTException ignored) { + itemStack.setTag(JsonToNBT.getTagFromJson(filterJsonQuotes(nbt.toString()))); + } catch(CommandSyntaxException ignored) { } } if(isMissingItem) { - NBTTagCompound display = itemStack.getOrCreateSubCompound("display"); - display.setString("Name", "\u00A7rUnknown Item"); + NBTTagCompound display = itemStack.getOrCreateChildTag("display"); + display.putString("Name", "\u00A7rUnknown Item"); NBTTagList lore = new NBTTagList(); - lore.appendTag(new NBTTagString("\u00A7r\u00A7eItem Name:")); - lore.appendTag(new NBTTagString("\u00A7r\u00A7e" + id)); - display.setTag("Lore", lore); + lore.add(new NBTTagString("\u00A7r\u00A7eItem Name:")); + lore.add(new NBTTagString("\u00A7r\u00A7e" + id)); + display.put("Lore", lore); } return itemStack; @@ -94,11 +94,10 @@ public class ItemStackData { public static ItemStackData getItemStackData(ItemStack stack, boolean ignoreNbt) { ItemStackData data = new ItemStackData(); - data.id = Item.REGISTRY.getNameForObject(stack.getItem()).toString(); + data.id = ForgeRegistries.ITEMS.getKey(stack.getItem()).toString(); data.amount = (byte) stack.getCount(); - data.damage = (short) stack.getItemDamage(); - if(!ignoreNbt && stack.getTagCompound() != null) { - data.nbt = BookLoader.GSON.toJsonTree(stack.getTagCompound(), NBTTagCompound.class).getAsJsonObject(); + if(!ignoreNbt && stack.getTag() != null) { + data.nbt = BookLoader.GSON.toJsonTree(stack.getTag(), NBTTagCompound.class).getAsJsonObject(); } return data; diff --git a/src/main/java/slimeknights/mantle/client/book/data/element/TextData.java b/src/main/java/slimeknights/mantle/client/book/data/element/TextData.java index 759d071..3836ff7 100644 --- a/src/main/java/slimeknights/mantle/client/book/data/element/TextData.java +++ b/src/main/java/slimeknights/mantle/client/book/data/element/TextData.java @@ -1,10 +1,9 @@ package slimeknights.mantle.client.book.data.element; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; - -@SideOnly(Side.CLIENT) +@OnlyIn(Dist.CLIENT) public class TextData { public static final TextData LINEBREAK = new TextData("\n"); diff --git a/src/main/java/slimeknights/mantle/client/book/repository/BookRepository.java b/src/main/java/slimeknights/mantle/client/book/repository/BookRepository.java index aa73f62..7b05ed5 100644 --- a/src/main/java/slimeknights/mantle/client/book/repository/BookRepository.java +++ b/src/main/java/slimeknights/mantle/client/book/repository/BookRepository.java @@ -1,6 +1,6 @@ package slimeknights.mantle.client.book.repository; -import net.minecraft.client.resources.IResource; +import net.minecraft.resources.IResource; import net.minecraft.util.ResourceLocation; import java.util.List; diff --git a/src/main/java/slimeknights/mantle/client/book/repository/DummyRepository.java b/src/main/java/slimeknights/mantle/client/book/repository/DummyRepository.java index e919f55..262a816 100644 --- a/src/main/java/slimeknights/mantle/client/book/repository/DummyRepository.java +++ b/src/main/java/slimeknights/mantle/client/book/repository/DummyRepository.java @@ -1,6 +1,6 @@ package slimeknights.mantle.client.book.repository; -import net.minecraft.client.resources.IResource; +import net.minecraft.resources.IResource; import net.minecraft.util.ResourceLocation; import java.util.List; diff --git a/src/main/java/slimeknights/mantle/client/book/repository/FileRepository.java b/src/main/java/slimeknights/mantle/client/book/repository/FileRepository.java index 06f63b4..1e1c06e 100644 --- a/src/main/java/slimeknights/mantle/client/book/repository/FileRepository.java +++ b/src/main/java/slimeknights/mantle/client/book/repository/FileRepository.java @@ -1,7 +1,7 @@ package slimeknights.mantle.client.book.repository; import net.minecraft.client.Minecraft; -import net.minecraft.client.resources.IResource; +import net.minecraft.resources.IResource; import net.minecraft.util.ResourceLocation; import org.apache.commons.io.Charsets; @@ -38,9 +38,9 @@ public class FileRepository extends BookRepository { if(!path.contains(":")) { String langPath = null; - if(Minecraft.getMinecraft().getLanguageManager() != null && Minecraft.getMinecraft().getLanguageManager().getCurrentLanguage() != null) + if(Minecraft.getInstance().getLanguageManager() != null && Minecraft.getInstance().getLanguageManager().getCurrentLanguage() != null) { - langPath = Minecraft.getMinecraft().getLanguageManager().getCurrentLanguage().getLanguageCode(); + langPath = Minecraft.getInstance().getLanguageManager().getCurrentLanguage().getLanguageCode(); } String defaultLangPath = "en_US"; @@ -77,7 +77,7 @@ public class FileRepository extends BookRepository { return null; } try { - return Minecraft.getMinecraft().getResourceManager().getResource(loc); + return Minecraft.getInstance().getResourceManager().getResource(loc); } catch(IOException e) { return null; } @@ -89,7 +89,7 @@ public class FileRepository extends BookRepository { return false; } try { - Minecraft.getMinecraft().getResourceManager().getResource(location); + Minecraft.getInstance().getResourceManager().getResource(location); return true; } catch(IOException e) { return false; diff --git a/src/main/java/slimeknights/mantle/client/gui/GuiElement.java b/src/main/java/slimeknights/mantle/client/gui/GuiElement.java index 908aee9..19de7e3 100644 --- a/src/main/java/slimeknights/mantle/client/gui/GuiElement.java +++ b/src/main/java/slimeknights/mantle/client/gui/GuiElement.java @@ -1,14 +1,14 @@ package slimeknights.mantle.client.gui; import net.minecraft.client.gui.GuiScreen; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; /** * Represents a GUI element INSIDE the graphics file. * The coordinates all refer to the coordinates inside the graphics! */ -@SideOnly(Side.CLIENT) +@OnlyIn(Dist.CLIENT) public class GuiElement { // this is totally completely ugly but it's a simple solution that doesn't clutter everything too much >_> diff --git a/src/main/java/slimeknights/mantle/client/gui/GuiElementScalable.java b/src/main/java/slimeknights/mantle/client/gui/GuiElementScalable.java index 1a71255..a21beb4 100644 --- a/src/main/java/slimeknights/mantle/client/gui/GuiElementScalable.java +++ b/src/main/java/slimeknights/mantle/client/gui/GuiElementScalable.java @@ -1,10 +1,10 @@ package slimeknights.mantle.client.gui; import net.minecraft.client.gui.GuiScreen; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; -@SideOnly(Side.CLIENT) +@OnlyIn(Dist.CLIENT) public class GuiElementScalable extends GuiElement { public GuiElementScalable(int x, int y, int w, int h, int texW, int texH) { diff --git a/src/main/java/slimeknights/mantle/client/gui/GuiModule.java b/src/main/java/slimeknights/mantle/client/gui/GuiModule.java index 8774dca..5064735 100644 --- a/src/main/java/slimeknights/mantle/client/gui/GuiModule.java +++ b/src/main/java/slimeknights/mantle/client/gui/GuiModule.java @@ -3,14 +3,14 @@ package slimeknights.mantle.client.gui; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import java.awt.*; import java.io.IOException; // a sub-gui. Mostly the same as a separate GuiContainer, but doesn't do the calls that affect the game as if this were the only gui -@SideOnly(Side.CLIENT) +@OnlyIn(Dist.CLIENT) public abstract class GuiModule extends GuiContainer { protected final GuiMultiModule parent; @@ -77,9 +77,9 @@ public abstract class GuiModule extends GuiContainer { mouseY >= this.guiTop && mouseY < this.guiBottom(); } - public boolean isMouseOverFullSlot(int mouseX, int mouseY) { + public boolean isMouseOverFullSlot(double mouseX, double mouseY) { for(Slot slot : inventorySlots.inventorySlots) { - if(parent.isMouseOverSlot(slot, mouseX, mouseY) && slot.getHasStack()) { + if(parent.isSlotSelected(slot, mouseX, mouseY) && slot.getHasStack()) { return true; } } @@ -112,7 +112,7 @@ public abstract class GuiModule extends GuiContainer { * * @return True to prevent the main container handling the mouseclick */ - public boolean handleMouseClicked(int mouseX, int mouseY, int mouseButton) throws IOException { + public boolean handleMouseClicked(double mouseX, double mouseY, int mouseButton) { return false; } @@ -121,7 +121,7 @@ public abstract class GuiModule extends GuiContainer { * * @return True to prevent the main container handling the mouseclick */ - public boolean handleMouseClickMove(int mouseX, int mouseY, int clickedMouseButton, long timeSinceLastClick) { + public boolean handleMouseClickMove(double mouseX, double mouseY, int clickedMouseButton, double timeSinceLastClick) { return false; } @@ -130,7 +130,7 @@ public abstract class GuiModule extends GuiContainer { * * @return True to prevent the main container handling the mouseclick */ - public boolean handleMouseReleased(int mouseX, int mouseY, int state) { + public boolean handleMouseReleased(double mouseX, double mouseY, int state) { return false; } diff --git a/src/main/java/slimeknights/mantle/client/gui/GuiMultiModule.java b/src/main/java/slimeknights/mantle/client/gui/GuiMultiModule.java index 385540a..aec07d5 100644 --- a/src/main/java/slimeknights/mantle/client/gui/GuiMultiModule.java +++ b/src/main/java/slimeknights/mantle/client/gui/GuiMultiModule.java @@ -8,9 +8,8 @@ import net.minecraft.client.renderer.GlStateManager; import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fml.common.Optional; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import java.awt.*; import java.io.IOException; @@ -24,10 +23,8 @@ import slimeknights.mantle.Mantle; import slimeknights.mantle.inventory.ContainerMultiModule; import slimeknights.mantle.inventory.SlotWrapper; -@SideOnly(Side.CLIENT) -@Optional.Interface(iface = "codechicken.nei.api.INEIGuiHandler", modid = "NotEnoughItems") -// todo: NEI -public class GuiMultiModule extends GuiContainer { //implements INEIGuiHandler { +@OnlyIn(Dist.CLIENT) +public class GuiMultiModule extends GuiContainer { // NEI-stuff >:( private static Field NEI_Manager; @@ -104,16 +101,16 @@ public class GuiMultiModule extends GuiContainer { //implements INEIGuiHandler { for(GuiModule module : modules) { // set correct state for the module GlStateManager.pushMatrix(); - GlStateManager.translate(-this.guiLeft, -this.guiTop, 0.0F); - GlStateManager.translate(module.guiLeft, module.guiTop, 0.0F); - GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); + GlStateManager.translatef(-this.guiLeft, -this.guiTop, 0.0F); + GlStateManager.translatef(module.guiLeft, module.guiTop, 0.0F); + GlStateManager.color4f(1.0F, 1.0F, 1.0F, 1.0F); module.handleDrawGuiContainerForegroundLayer(mouseX, mouseY); GlStateManager.popMatrix(); } } protected void drawBackground(ResourceLocation background) { - GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); + GlStateManager.color4f(1.0F, 1.0F, 1.0F, 1.0F); this.mc.getTextureManager().bindTexture(background); this.drawTexturedModalRect(cornerX, cornerY, 0, 0, realWidth, realHeight); } @@ -127,7 +124,7 @@ public class GuiMultiModule extends GuiContainer { //implements INEIGuiHandler { } protected void drawPlayerInventoryName() { - String localizedName = Minecraft.getMinecraft().player.inventory.getDisplayName().getUnformattedText(); + String localizedName = Minecraft.getInstance().player.inventory.getDisplayName().getUnformattedComponentText(); this.fontRenderer.drawString(localizedName, 8, this.ySize - 96 + 2, 0x404040); } @@ -160,7 +157,7 @@ public class GuiMultiModule extends GuiContainer { //implements INEIGuiHandler { } @Override - public void drawScreen(int mouseX, int mouseY, float partialTicks) { + public void render(int mouseX, int mouseY, float partialTicks) { this.drawDefaultBackground(); int oldX = guiLeft; int oldY = guiTop; @@ -171,7 +168,7 @@ public class GuiMultiModule extends GuiContainer { //implements INEIGuiHandler { guiTop = cornerY; xSize = realWidth; ySize = realHeight; - super.drawScreen(mouseX, mouseY, partialTicks); + super.render(mouseX, mouseY, partialTicks); this.renderHoveredToolTip(mouseX, mouseY); guiLeft = oldX; guiTop = oldY; @@ -182,7 +179,7 @@ public class GuiMultiModule extends GuiContainer { //implements INEIGuiHandler { // needed to get the correct slot on clicking @Override - protected boolean isPointInRegion(int left, int top, int right, int bottom, int pointX, int pointY) { + protected boolean isPointInRegion(int left, int top, int right, int bottom, double pointX, double pointY) { pointX -= this.cornerX; pointY -= this.cornerY; return pointX >= left - 1 && pointX < left + right + 1 && pointY >= top - 1 && pointY < top + bottom + 1; @@ -232,7 +229,7 @@ public class GuiMultiModule extends GuiContainer { //implements INEIGuiHandler { } @Override - public boolean isMouseOverSlot(Slot slotIn, int mouseX, int mouseY) { + public boolean isSlotSelected(Slot slotIn, double mouseX, double mouseY) { GuiModule module = getModuleForSlot(slotIn.slotNumber); // mouse inside the module of the slot? @@ -247,46 +244,46 @@ public class GuiMultiModule extends GuiContainer { //implements INEIGuiHandler { } } - return super.isMouseOverSlot(slotIn, mouseX, mouseY); + return super.isSlotSelected(slotIn, mouseX, mouseY); } @Override - protected void mouseClicked(int mouseX, int mouseY, int mouseButton) throws IOException { + public boolean mouseClicked(double mouseX, double mouseY, int mouseButton) { GuiModule module = getModuleForPoint(mouseX, mouseY); if(module != null) { if(module.handleMouseClicked(mouseX, mouseY, mouseButton)) { - return; + return false; } } - super.mouseClicked(mouseX, mouseY, mouseButton); + return super.mouseClicked(mouseX, mouseY, mouseButton); } @Override - protected void mouseClickMove(int mouseX, int mouseY, int clickedMouseButton, long timeSinceLastClick) { + public boolean mouseDragged(double mouseX, double mouseY, int clickedMouseButton, double timeSinceLastClick, double unkowwn) { GuiModule module = getModuleForPoint(mouseX, mouseY); if(module != null) { if(module.handleMouseClickMove(mouseX, mouseY, clickedMouseButton, timeSinceLastClick)) { - return; + return false; } } - super.mouseClickMove(mouseX, mouseY, clickedMouseButton, timeSinceLastClick); + return super.mouseDragged(mouseX, mouseY, clickedMouseButton, timeSinceLastClick, unkowwn); } @Override - protected void mouseReleased(int mouseX, int mouseY, int state) { + public boolean mouseReleased(double mouseX, double mouseY, int state) { GuiModule module = getModuleForPoint(mouseX, mouseY); if(module != null) { if(module.handleMouseReleased(mouseX, mouseY, state)) { - return; + return false; } } - super.mouseReleased(mouseX, mouseY, state); + return super.mouseReleased(mouseX, mouseY, state); } - protected GuiModule getModuleForPoint(int x, int y) { + protected GuiModule getModuleForPoint(double x, double y) { for(GuiModule module : modules) { if(this.isPointInRegion(module.guiLeft, module.guiTop, module.guiRight(), module.guiBottom(), x + this.cornerX, y + this.cornerY)) { @@ -314,60 +311,4 @@ public class GuiMultiModule extends GuiContainer { //implements INEIGuiHandler { protected ContainerMultiModule getContainer() { return (ContainerMultiModule) inventorySlots; } - - /* NEI INTEGRATION */ - // todo: NEI -/* - @Override - @Optional.Method(modid = "NotEnoughItems") - public VisiblityData modifyVisiblity(GuiContainer guiContainer, VisiblityData visiblityData) { - int x = LayoutManager.stateButtons[0].x + LayoutManager.stateButtons[0].w; - int x2 = LayoutManager.timeButtons[3].x + LayoutManager.timeButtons[3].w; - int y2 = LayoutManager.heal.y + LayoutManager.heal.h; - - - for(GuiModule module : modules) { - if(x > module.guiLeft) { - visiblityData.showStateButtons = false; - } - if(x2 > module.guiLeft && y2 > module.guiTop) { - visiblityData.showUtilityButtons = false; - } - } - - return visiblityData; - } - - @Override - @Optional.Method(modid = "NotEnoughItems") - public Iterable getItemSpawnSlots(GuiContainer guiContainer, ItemStack itemStack) { - return null; - } - - @Override - @Optional.Method(modid = "NotEnoughItems") - public List getInventoryAreas(GuiContainer guiContainer) { - return Collections.EMPTY_LIST; - } - - @Override - @Optional.Method(modid = "NotEnoughItems") - public boolean handleDragNDrop(GuiContainer guiContainer, int x, int y, ItemStack itemStack, int k) { - return false; - } - - @Override - @Optional.Method(modid = "NotEnoughItems") - public boolean hideItemPanelSlot(GuiContainer guiContainer, int x, int y, int w, int h) { - for(GuiModule module : modules) { - // check if the panel overlaps the module (check totally not stolen from stackoverflow) - if(module.guiLeft < x + w && module.guiRight() > x && - module.guiTop < y + h && module.guiBottom() > y) { - return true; - } - } - - return false; - } - */ } diff --git a/src/main/java/slimeknights/mantle/client/gui/GuiWidget.java b/src/main/java/slimeknights/mantle/client/gui/GuiWidget.java index 7600d74..b26ec9f 100644 --- a/src/main/java/slimeknights/mantle/client/gui/GuiWidget.java +++ b/src/main/java/slimeknights/mantle/client/gui/GuiWidget.java @@ -1,9 +1,9 @@ package slimeknights.mantle.client.gui; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; -@SideOnly(Side.CLIENT) +@OnlyIn(Dist.CLIENT) public abstract class GuiWidget { public int xPos; diff --git a/src/main/java/slimeknights/mantle/client/gui/GuiWidgetSlider.java b/src/main/java/slimeknights/mantle/client/gui/GuiWidgetSlider.java index cc9f633..c45ca95 100644 --- a/src/main/java/slimeknights/mantle/client/gui/GuiWidgetSlider.java +++ b/src/main/java/slimeknights/mantle/client/gui/GuiWidgetSlider.java @@ -1,13 +1,13 @@ package slimeknights.mantle.client.gui; +import net.minecraft.client.Minecraft; import net.minecraft.util.math.MathHelper; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; -import org.lwjgl.input.Mouse; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; // a vertical slider! -@SideOnly(Side.CLIENT) +@OnlyIn(Dist.CLIENT) public class GuiWidgetSlider extends GuiWidget { // gui info @@ -149,7 +149,7 @@ public class GuiWidgetSlider extends GuiWidget { return; } - boolean mouseDown = Mouse.isButtonDown(0); // left mouse button + boolean mouseDown = Minecraft.getInstance().mouseHelper.isLeftDown(); // left mouse button int wheel = Mouse.getDWheel(); if(useMouseWheel) { diff --git a/src/main/java/slimeknights/mantle/client/gui/GuiWidgetTabs.java b/src/main/java/slimeknights/mantle/client/gui/GuiWidgetTabs.java index 6f28c9c..2d7320f 100644 --- a/src/main/java/slimeknights/mantle/client/gui/GuiWidgetTabs.java +++ b/src/main/java/slimeknights/mantle/client/gui/GuiWidgetTabs.java @@ -4,18 +4,16 @@ import com.google.common.collect.Lists; import net.minecraft.client.Minecraft; 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.item.ItemStack; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import org.lwjgl.input.Mouse; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import java.util.List; -@SideOnly(Side.CLIENT) +@OnlyIn(Dist.CLIENT) public class GuiWidgetTabs extends GuiWidget { private static final ResourceLocation @@ -61,7 +59,7 @@ public class GuiWidgetTabs extends GuiWidget { } public void update(int mouseX, int mouseY) { - boolean mouseDown = Mouse.isButtonDown(0); // left mouse button + boolean mouseDown = Minecraft.getInstance().mouseHelper.isLeftDown(); // left mouse button // did we click on a tab? mouseX -= this.xPos; @@ -142,7 +140,7 @@ public class GuiWidgetTabs extends GuiWidget { // todo: draw all the tabs first and then all the itemstacks so it doesn't have to switch texture in between all the time // rebind texture from drawing an itemstack - Minecraft.getMinecraft().getTextureManager().bindTexture(tabsResource); + Minecraft.getInstance().getTextureManager().bindTexture(tabsResource); actualTab.draw(x, y); @@ -158,8 +156,8 @@ public class GuiWidgetTabs extends GuiWidget { // guiContainer.drawItemStack private void drawItemStack(ItemStack stack, int x, int y) { - RenderItem itemRender = Minecraft.getMinecraft().getRenderItem(); - GlStateManager.translate(0.0F, 0.0F, 32.0F); + ItemRenderer itemRender = Minecraft.getInstance().getItemRenderer(); + GlStateManager.translatef(0.0F, 0.0F, 32.0F); itemRender.zLevel = 200; //FontRenderer font = stack.getItem().getFontRenderer(stack); diff --git a/src/main/java/slimeknights/mantle/client/gui/book/GuiBook.java b/src/main/java/slimeknights/mantle/client/gui/book/GuiBook.java index 4556eb1..c644324 100644 --- a/src/main/java/slimeknights/mantle/client/gui/book/GuiBook.java +++ b/src/main/java/slimeknights/mantle/client/gui/book/GuiBook.java @@ -19,9 +19,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.network.play.client.CPacketClientStatus; import net.minecraft.stats.StatisticsManager; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import org.lwjgl.input.Keyboard; import org.lwjgl.input.Mouse; @@ -43,7 +43,7 @@ import slimeknights.mantle.client.gui.book.element.BookElement; import static slimeknights.mantle.client.gui.book.Textures.TEX_BOOK; import static slimeknights.mantle.client.gui.book.Textures.TEX_BOOKFRONT; -@SideOnly(Side.CLIENT) +@OnlyIn(Dist.CLIENT) public class GuiBook extends GuiScreen { public static boolean debug = false; @@ -90,7 +90,7 @@ public class GuiBook extends GuiScreen { this.book = book; this.item = item; - this.mc = Minecraft.getMinecraft(); + this.mc = Minecraft.getInstance(); this.fontRenderer = mc.fontRenderer; init(); @@ -102,9 +102,9 @@ public class GuiBook extends GuiScreen { public void drawerTransform(boolean rightSide) { if(rightSide) { - GlStateManager.translate(width / 2 + PAGE_PADDING_RIGHT + PAGE_MARGIN, height / 2 - PAGE_HEIGHT_UNSCALED / 2 + PAGE_PADDING_TOP + PAGE_MARGIN, 0); + GlStateManager.translatef(width / 2 + PAGE_PADDING_RIGHT + PAGE_MARGIN, height / 2 - PAGE_HEIGHT_UNSCALED / 2 + PAGE_PADDING_TOP + PAGE_MARGIN, 0); } else { - GlStateManager.translate(width / 2 - PAGE_WIDTH_UNSCALED + PAGE_PADDING_LEFT + PAGE_MARGIN, height / 2 - PAGE_HEIGHT_UNSCALED / 2 + PAGE_PADDING_TOP + PAGE_MARGIN, 0); + GlStateManager.translatef(width / 2 - PAGE_WIDTH_UNSCALED + PAGE_PADDING_LEFT + PAGE_MARGIN, height / 2 - PAGE_HEIGHT_UNSCALED / 2 + PAGE_PADDING_TOP + PAGE_MARGIN, 0); } } @@ -145,7 +145,7 @@ public class GuiBook extends GuiScreen { fontRenderer.drawString("DEBUG", 2, 2, 0xFFFFFFFF); } - GlStateManager.enableAlpha(); + GlStateManager.enableAlphaTest(); GlStateManager.enableBlend(); // The books are unreadable at Gui Scale set to small, so we'll double the scale @@ -176,21 +176,21 @@ public class GuiBook extends GuiScreen { } */ GlStateManager.pushMatrix(); - GlStateManager.color(1F, 1F, 1F); + GlStateManager.color3f(1F, 1F, 1F); float coverR = ((book.appearance.coverColor >> 16) & 0xff) / 255.F; float coverG = ((book.appearance.coverColor >> 8) & 0xff) / 255.F; float coverB = (book.appearance.coverColor & 0xff) / 255.F; - TextureManager render = this.mc.renderEngine; + TextureManager render = this.mc.textureManager; if(page == -1) { render.bindTexture(TEX_BOOKFRONT); RenderHelper.disableStandardItemLighting(); - GlStateManager.color(coverR, coverG, coverB); + GlStateManager.color3f(coverR, coverG, coverB); drawModalRectWithCustomSizedTexture(width / 2 - PAGE_WIDTH_UNSCALED / 2, height / 2 - PAGE_HEIGHT_UNSCALED / 2, 0, 0, PAGE_WIDTH_UNSCALED, PAGE_HEIGHT_UNSCALED, TEX_SIZE, TEX_SIZE); - GlStateManager.color(1F, 1F, 1F); + GlStateManager.color3f(1F, 1F, 1F); if(!book.appearance.title.isEmpty()) { drawModalRectWithCustomSizedTexture(width / 2 - PAGE_WIDTH_UNSCALED / 2, height / 2 - PAGE_HEIGHT_UNSCALED / 2, 0, PAGE_HEIGHT_UNSCALED, PAGE_WIDTH_UNSCALED, PAGE_HEIGHT_UNSCALED, TEX_SIZE, TEX_SIZE); diff --git a/src/main/java/slimeknights/mantle/client/gui/book/GuiBookmark.java b/src/main/java/slimeknights/mantle/client/gui/book/GuiBookmark.java index 44d6f48..d817478 100644 --- a/src/main/java/slimeknights/mantle/client/gui/book/GuiBookmark.java +++ b/src/main/java/slimeknights/mantle/client/gui/book/GuiBookmark.java @@ -32,25 +32,26 @@ public class GuiBookmark extends GuiButton { } @Override - public void drawButton(@Nonnull Minecraft mc, int mouseX, int mouseY, float partialTicks) { + public void render(int mouseX, int mouseY, float partialTicks) { if(visible) { + Minecraft minecraft = Minecraft.getInstance(); int tex_y = TEX_Y + HEIGHT * type; - mc.renderEngine.bindTexture(TEX_BOOK); + minecraft.textureManager.bindTexture(TEX_BOOK); float r = ((data.color >> 16) & 0xff) / 255.F; float g = ((data.color >> 8) & 0xff) / 255.F; float b = (data.color & 0xff) / 255.F; - GlStateManager.color(r, g, b); + GlStateManager.color3f(r, g, b); Gui.drawScaledCustomSizeModalRect(x, y, TEX_X, tex_y, WIDTH, HEIGHT, width, height, 512, 512); if(data.text != null && !data.text.isEmpty()) { TextDataRenderer - .drawScaledString(mc.fontRenderer, data.text, x + 1, y + height / 2 - mc.fontRenderer.FONT_HEIGHT * TEXT_SCALE / 2 + 1, 0xFFFFFFFF, true, TEXT_SCALE); + .drawScaledString(minecraft.fontRenderer, data.text, x + 1, y + height / 2 - minecraft.fontRenderer.FONT_HEIGHT * TEXT_SCALE / 2 + 1, 0xFFFFFFFF, true, TEXT_SCALE); } - GlStateManager.color(1F, 1F, 1F); + GlStateManager.color3f(1F, 1F, 1F); if(data.page.equals("ADD")) { Gui.drawModalRectWithCustomSizedTexture(x + width / 2 - ADD_W / 2, y + height / 2 - ADD_H / 2, ADD_X, ADD_Y, ADD_W, ADD_H, 512, 512); diff --git a/src/main/java/slimeknights/mantle/client/gui/book/TextDataRenderer.java b/src/main/java/slimeknights/mantle/client/gui/book/TextDataRenderer.java index 03f4f2d..60a7749 100644 --- a/src/main/java/slimeknights/mantle/client/gui/book/TextDataRenderer.java +++ b/src/main/java/slimeknights/mantle/client/gui/book/TextDataRenderer.java @@ -8,9 +8,9 @@ import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.client.resources.I18n; import net.minecraft.util.text.TextFormatting; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.fml.client.config.GuiUtils; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import slimeknights.mantle.Mantle; import slimeknights.mantle.client.book.data.element.TextData; @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -@SideOnly(Side.CLIENT) +@OnlyIn(Dist.CLIENT) public class TextDataRenderer { /** * @deprecated Call drawText with tooltip param and then call drawTooltip separately on the tooltip layer to prevent overlap @@ -149,7 +149,14 @@ public class TextDataRenderer { } if(atY >= y + boxHeight) { - fr.drawString("...", atX, atY, 0, item.dropshadow); + if(item.dropshadow) + { + fr.drawStringWithShadow("...", atX, atY, 0); + } + else + { + fr.drawString("...", atX, atY, 0); + } break; } y = atY; @@ -222,9 +229,16 @@ public class TextDataRenderer { public static void drawScaledString(FontRenderer font, String text, float x, float y, int color, boolean dropShadow, float scale) { GlStateManager.pushMatrix(); - GlStateManager.translate(x, y, 0); - GlStateManager.scale(scale, scale, 1F); - font.drawString(text, 0, 0, color, dropShadow); + GlStateManager.translatef(x, y, 0); + GlStateManager.scalef(scale, scale, 1F); + if(dropShadow) + { + font.drawStringWithShadow(text, 0, 0, color); + } + else + { + font.drawString(text, 0, 0, color); + } GlStateManager.popMatrix(); } @@ -238,8 +252,8 @@ public class TextDataRenderer { float f6 = (float) (endColor >> 8 & 255) / 255.0F; float f7 = (float) (endColor & 255) / 255.0F; GlStateManager.disableTexture2D(); - GlStateManager.disableAlpha(); - GlStateManager.tryBlendFuncSeparate(770, 771, 1, 0); + GlStateManager.disableAlphaTest(); + GlStateManager.blendFuncSeparate(770, 771, 1, 0); GlStateManager.shadeModel(7425); Tessellator tessellator = Tessellator.getInstance(); BufferBuilder vertexBuffer = tessellator.getBuffer(); @@ -250,7 +264,7 @@ public class TextDataRenderer { vertexBuffer.pos((double) right, (double) bottom, 0D).color(f5, f6, f7, f4).endVertex(); tessellator.draw(); GlStateManager.shadeModel(7424); - GlStateManager.enableAlpha(); + GlStateManager.enableAlphaTest(); GlStateManager.enableTexture2D(); } //END METHODS FROM GUI diff --git a/src/main/java/slimeknights/mantle/client/gui/book/element/BookElement.java b/src/main/java/slimeknights/mantle/client/gui/book/element/BookElement.java index 5f3199d..a41a9fd 100644 --- a/src/main/java/slimeknights/mantle/client/gui/book/element/BookElement.java +++ b/src/main/java/slimeknights/mantle/client/gui/book/element/BookElement.java @@ -1,5 +1,6 @@ package slimeknights.mantle.client.gui.book.element; +import com.google.common.collect.Lists; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.Gui; @@ -8,22 +9,23 @@ import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.texture.TextureManager; 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.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.fml.client.config.GuiUtils; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import java.util.List; import slimeknights.mantle.client.gui.book.GuiBook; -@SideOnly(Side.CLIENT) +@OnlyIn(Dist.CLIENT) public abstract class BookElement extends Gui { public GuiBook parent; - protected Minecraft mc = Minecraft.getMinecraft(); - protected TextureManager renderEngine = mc.renderEngine; + protected Minecraft mc = Minecraft.getInstance(); + protected TextureManager renderEngine = mc.textureManager; public int x, y; @@ -55,13 +57,14 @@ public abstract class BookElement extends Gui { public void renderToolTip(FontRenderer fontRenderer, ItemStack stack, int x, int y) { if(stack != null) { - List list = stack.getTooltip(mc.player, mc.gameSettings.advancedItemTooltips ? ITooltipFlag.TooltipFlags.ADVANCED : ITooltipFlag.TooltipFlags.NORMAL); - + List list = stack.getTooltip(mc.player, mc.gameSettings.advancedItemTooltips ? ITooltipFlag.TooltipFlags.ADVANCED : ITooltipFlag.TooltipFlags.NORMAL); + List list1 = Lists.newArrayList(); + for(int i = 0; i < list.size(); ++i) { if(i == 0) { - list.set(i, stack.getRarity().rarityColor + list.get(i)); + list1.set(i, stack.getRarity().color + list.get(i).deepCopy().getFormattedText()); } else { - list.set(i, TextFormatting.GRAY + list.get(i)); + list1.set(i, TextFormatting.GRAY + list.get(i).deepCopy().getFormattedText()); } } @@ -69,7 +72,7 @@ public abstract class BookElement extends Gui { if(font == null) { font = fontRenderer; } - GuiUtils.drawHoveringText(list, x, y, GuiBook.PAGE_WIDTH, GuiBook.PAGE_HEIGHT, -1, font); + GuiUtils.drawHoveringText(list1, x, y, GuiBook.PAGE_WIDTH, GuiBook.PAGE_HEIGHT, -1, font); RenderHelper.disableStandardItemLighting(); } } @@ -77,7 +80,7 @@ public abstract class BookElement extends Gui { @Deprecated public void drawHoveringText(List textLines, int x, int y, FontRenderer font) { if(!textLines.isEmpty()) { - GlStateManager.disableDepth(); + GlStateManager.disableDepthTest(); int i = 0; for(String s : textLines) { @@ -128,7 +131,7 @@ public abstract class BookElement extends Gui { i2 += 10; } - GlStateManager.enableDepth(); + GlStateManager.enableDepthTest(); } } } diff --git a/src/main/java/slimeknights/mantle/client/gui/book/element/ElementImage.java b/src/main/java/slimeknights/mantle/client/gui/book/element/ElementImage.java index 3f2cdf4..69f8e2b 100644 --- a/src/main/java/slimeknights/mantle/client/gui/book/element/ElementImage.java +++ b/src/main/java/slimeknights/mantle/client/gui/book/element/ElementImage.java @@ -3,12 +3,12 @@ package slimeknights.mantle.client.gui.book.element; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.RenderHelper; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import slimeknights.mantle.client.book.data.element.ImageData; -@SideOnly(Side.CLIENT) +@OnlyIn(Dist.CLIENT) public class ElementImage extends SizedBookElement { public ImageData image; @@ -60,7 +60,7 @@ public class ElementImage extends SizedBookElement { float g = ((colorMultiplier >> 8) & 0xff) / 255.F; float b = (colorMultiplier & 0xff) / 255.F; - GlStateManager.color(r, g, b); + GlStateManager.color3f(r, g, b); if(image.item == null) { renderEngine.bindTexture(image.location); @@ -68,9 +68,9 @@ public class ElementImage extends SizedBookElement { drawScaledCustomSizeModalRect(x, y, image.u, image.v, image.uw, image.vh, width, height, image.texWidth, image.texHeight); } else { GlStateManager.pushMatrix(); - GlStateManager.scale(width, height, 1F); + GlStateManager.scalef(width, height, 1F); RenderHelper.enableGUIStandardItemLighting(); - mc.getRenderItem().renderItemAndEffectIntoGUI(image.item.getItems().get(0), x, y); + mc.getItemRenderer().renderItemAndEffectIntoGUI(image.item.getItems().get(0), x, y); RenderHelper.disableStandardItemLighting(); GlStateManager.popMatrix(); } diff --git a/src/main/java/slimeknights/mantle/client/gui/book/element/ElementItem.java b/src/main/java/slimeknights/mantle/client/gui/book/element/ElementItem.java index fea6fb1..7aca0f6 100644 --- a/src/main/java/slimeknights/mantle/client/gui/book/element/ElementItem.java +++ b/src/main/java/slimeknights/mantle/client/gui/book/element/ElementItem.java @@ -8,15 +8,15 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; import net.minecraft.util.math.MathHelper; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import java.util.Collection; import java.util.List; import slimeknights.mantle.client.book.action.StringActionProcessor; -@SideOnly(Side.CLIENT) +@OnlyIn(Dist.CLIENT) public class ElementItem extends SizedBookElement { public static final int ITEM_SIZE_HARDCODED = 16; @@ -84,11 +84,11 @@ public class ElementItem extends SizedBookElement { RenderHelper.enableGUIStandardItemLighting(); GlStateManager.pushMatrix(); - GlStateManager.translate(x, y, 0); - GlStateManager.scale(scale, scale, 1.0F); + GlStateManager.translatef(x, y, 0); + GlStateManager.scalef(scale, scale, 1.0F); if(currentItem < itemCycle.size()) { - mc.getRenderItem().renderItemAndEffectIntoGUI(itemCycle.get(currentItem), 0, 0); + mc.getItemRenderer().renderItemAndEffectIntoGUI(itemCycle.get(currentItem), 0, 0); } GlStateManager.popMatrix(); diff --git a/src/main/java/slimeknights/mantle/client/gui/book/element/ElementSection.java b/src/main/java/slimeknights/mantle/client/gui/book/element/ElementSection.java index 78bdb32..ee82d78 100644 --- a/src/main/java/slimeknights/mantle/client/gui/book/element/ElementSection.java +++ b/src/main/java/slimeknights/mantle/client/gui/book/element/ElementSection.java @@ -37,12 +37,12 @@ public class ElementSection extends SizedBookElement { drawRect(iconX, iconY, iconX + IMG_SIZE, iconY + IMG_SIZE, parent.book.appearance.hoverColor); } if(unlocked) { - GlStateManager.color(1F, 1F, 1F, hover ? 1F : 0.5F); + GlStateManager.color4f(1F, 1F, 1F, hover ? 1F : 0.5F); } else { float r = ((parent.book.appearance.lockedSectionColor >> 16) & 0xff) / 255.F; float g = ((parent.book.appearance.lockedSectionColor >> 8) & 0xff) / 255.F; float b = (parent.book.appearance.lockedSectionColor & 0xff) / 255.F; - GlStateManager.color(r, g, b, 0.75F); + GlStateManager.color4f(r, g, b, 0.75F); } if(section.icon.item == null) { @@ -53,10 +53,10 @@ public class ElementSection extends SizedBookElement { } } else { GlStateManager.pushMatrix(); - GlStateManager.translate(iconX, iconY, 0); - GlStateManager.scale(2F, 2F, 1F); + GlStateManager.translatef(iconX, iconY, 0); + GlStateManager.scalef(2F, 2F, 1F); RenderHelper.enableGUIStandardItemLighting(); - mc.getRenderItem().renderItemAndEffectIntoGUI(section.icon.item.getItems().get(0), 0, 0); + mc.getItemRenderer().renderItemAndEffectIntoGUI(section.icon.item.getItems().get(0), 0, 0); RenderHelper.disableStandardItemLighting(); GlStateManager.popMatrix(); } diff --git a/src/main/java/slimeknights/mantle/client/gui/book/element/ElementStructure.java b/src/main/java/slimeknights/mantle/client/gui/book/element/ElementStructure.java index cc20624..2fb5c8e 100644 --- a/src/main/java/slimeknights/mantle/client/gui/book/element/ElementStructure.java +++ b/src/main/java/slimeknights/mantle/client/gui/book/element/ElementStructure.java @@ -13,12 +13,10 @@ import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; -import org.lwjgl.input.Mouse; import org.lwjgl.opengl.GL11; -import java.util.List; +import java.util.Random; import java.util.stream.IntStream; -import java.util.stream.Stream; import slimeknights.mantle.client.book.StructureBlockAccess; import slimeknights.mantle.client.book.StructureInfo; @@ -150,7 +148,7 @@ public class ElementStructure extends SizedBookElement implements IButtonClickHa @Override public void draw(int mouseX, int mouseY, float partialTicks, FontRenderer fontRenderer) { if(lastClick != null) { - if(Mouse.isButtonDown(0) || Mouse.isButtonDown(1)) { + if(Minecraft.getInstance().mouseHelper.isLeftDown() || Minecraft.getInstance().mouseHelper.isRightDown()) { int dx = mouseX - lastClick[0]; int dy = mouseY - lastClick[1]; float maxSpeed = 10f; @@ -195,18 +193,18 @@ public class ElementStructure extends SizedBookElement implements IButtonClickHa int i = 0; ItemStack highlighted = null; - final BlockRendererDispatcher blockRender = Minecraft.getMinecraft().getBlockRendererDispatcher(); + final BlockRendererDispatcher blockRender = Minecraft.getInstance().getBlockRendererDispatcher(); float f = (float) Math.sqrt(structureHeight * structureHeight + structureWidth * structureWidth + structureLength * structureLength); yOffTotal = 10 + Math.max(10 + (structureHeight > 1 ? 36 : 0), (int) (f * scale)); //GlStateManager.translate(x + 60, y + 10 + f / 2 * scale, Math.max(structureHeight, Math.max(structureWidth, structureLength))); - GlStateManager.translate(xTranslate, yTranslate, Math.max(structureHeight, Math.max(structureWidth, structureLength))); + GlStateManager.translatef(xTranslate, yTranslate, Math.max(structureHeight, Math.max(structureWidth, structureLength))); // todo: translate where it actually needs to be and to counter z-layer of the book - GlStateManager.scale(scale, -scale, 1); - GlStateManager.rotate(rotX, 1, 0, 0); - GlStateManager.rotate(rotY, 0, 1, 0); + GlStateManager.scalef(scale, -scale, 1); + GlStateManager.rotatef(rotX, 1, 0, 0); + GlStateManager.rotatef(rotY, 0, 1, 0); - GlStateManager.translate((float)structureLength/-2f, (float)structureHeight/-2f, (float)structureWidth/-2f); + GlStateManager.translatef((float)structureLength/-2f, (float)structureHeight/-2f, (float)structureWidth/-2f); GlStateManager.disableLighting(); @@ -232,7 +230,8 @@ public class ElementStructure extends SizedBookElement implements IButtonClickHa Tessellator tessellator = Tessellator.getInstance(); BufferBuilder buffer = tessellator.getBuffer(); buffer.begin(GL11.GL_QUADS, DefaultVertexFormats.BLOCK); - blockRender.renderBlock(state, pos, blockAccess, buffer); + Random random = new Random(); + blockRender.renderBlock(state, pos, blockAccess, buffer, random); tessellator.draw(); } } diff --git a/src/main/java/slimeknights/mantle/client/gui/book/element/ElementText.java b/src/main/java/slimeknights/mantle/client/gui/book/element/ElementText.java index 6d9e27f..65a2b0b 100644 --- a/src/main/java/slimeknights/mantle/client/gui/book/element/ElementText.java +++ b/src/main/java/slimeknights/mantle/client/gui/book/element/ElementText.java @@ -1,18 +1,18 @@ package slimeknights.mantle.client.gui.book.element; import net.minecraft.client.gui.FontRenderer; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import java.util.ArrayList; import java.util.Collection; import java.util.List; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import slimeknights.mantle.client.book.action.StringActionProcessor; import slimeknights.mantle.client.book.data.element.TextData; import slimeknights.mantle.client.gui.book.TextDataRenderer; -@SideOnly(Side.CLIENT) +@OnlyIn(Dist.CLIENT) public class ElementText extends SizedBookElement { public TextData[] text; private List tooltip = new ArrayList(); diff --git a/src/main/java/slimeknights/mantle/client/gui/book/element/SizedBookElement.java b/src/main/java/slimeknights/mantle/client/gui/book/element/SizedBookElement.java index 279ca16..dcedced 100644 --- a/src/main/java/slimeknights/mantle/client/gui/book/element/SizedBookElement.java +++ b/src/main/java/slimeknights/mantle/client/gui/book/element/SizedBookElement.java @@ -1,9 +1,9 @@ package slimeknights.mantle.client.gui.book.element; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; -@SideOnly(Side.CLIENT) +@OnlyIn(Dist.CLIENT) public abstract class SizedBookElement extends BookElement { public int width, height; diff --git a/src/main/java/slimeknights/mantle/client/model/BakedCompositeModel.java b/src/main/java/slimeknights/mantle/client/model/BakedCompositeModel.java index a814ef5..0505d15 100644 --- a/src/main/java/slimeknights/mantle/client/model/BakedCompositeModel.java +++ b/src/main/java/slimeknights/mantle/client/model/BakedCompositeModel.java @@ -5,13 +5,15 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import net.minecraft.block.state.IBlockState; -import net.minecraft.client.renderer.block.model.BakedQuad; -import net.minecraft.client.renderer.block.model.IBakedModel; +import net.minecraft.client.renderer.model.BakedQuad; +import net.minecraft.client.renderer.model.IBakedModel; import net.minecraft.util.EnumFacing; import java.util.List; +import java.util.Random; import javax.annotation.Nonnull; +import javax.annotation.Nullable; /** * Groups multiple baked models into a single one. Does not respect state etc. when getting quads. @@ -29,7 +31,7 @@ public class BakedCompositeModel extends BakedWrapper { @Nonnull @Override - public List getQuads(IBlockState state, EnumFacing side, long rand) { + public List getQuads(@Nullable IBlockState state, @Nullable EnumFacing side, Random rand) { return parts.get(Optional.fromNullable(side)); } @@ -44,14 +46,14 @@ public class BakedCompositeModel extends BakedWrapper { } } - public void add(IBakedModel model, IBlockState state, long rand) { + public void add(IBakedModel model, IBlockState state, Random rand) { add(model, state, null, rand); for(EnumFacing side : EnumFacing.values()) { add(model, state, side, rand); } } - public void add(IBakedModel model, IBlockState state, EnumFacing side, long rand) { + public void add(IBakedModel model, IBlockState state, EnumFacing side, Random rand) { int index; if(side == null) { index = 6; diff --git a/src/main/java/slimeknights/mantle/client/model/BakedSimple.java b/src/main/java/slimeknights/mantle/client/model/BakedSimple.java index ec83898..bcbf0eb 100644 --- a/src/main/java/slimeknights/mantle/client/model/BakedSimple.java +++ b/src/main/java/slimeknights/mantle/client/model/BakedSimple.java @@ -4,10 +4,10 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import net.minecraft.block.state.IBlockState; -import net.minecraft.client.renderer.block.model.BakedQuad; -import net.minecraft.client.renderer.block.model.IBakedModel; -import net.minecraft.client.renderer.block.model.ItemCameraTransforms; -import net.minecraft.client.renderer.block.model.ItemOverrideList; +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.EnumFacing; import net.minecraftforge.client.model.PerspectiveMapWrapper; @@ -16,8 +16,10 @@ import net.minecraftforge.common.model.TRSRTransformation; import org.apache.commons.lang3.tuple.Pair; import java.util.List; +import java.util.Random; import javax.annotation.Nonnull; +import javax.annotation.Nullable; import javax.vecmath.Matrix4f; public class BakedSimple implements IBakedModel { @@ -62,7 +64,7 @@ public class BakedSimple implements IBakedModel { @Nonnull @Override - public List getQuads(IBlockState state, EnumFacing side, long rand) { + public List getQuads(@Nullable IBlockState state, @Nullable EnumFacing side, Random rand) { return quads; } diff --git a/src/main/java/slimeknights/mantle/client/model/BakedWrapper.java b/src/main/java/slimeknights/mantle/client/model/BakedWrapper.java index 53e5f2c..bb618ae 100644 --- a/src/main/java/slimeknights/mantle/client/model/BakedWrapper.java +++ b/src/main/java/slimeknights/mantle/client/model/BakedWrapper.java @@ -3,10 +3,10 @@ package slimeknights.mantle.client.model; import com.google.common.collect.ImmutableMap; import net.minecraft.block.state.IBlockState; -import net.minecraft.client.renderer.block.model.BakedQuad; -import net.minecraft.client.renderer.block.model.IBakedModel; -import net.minecraft.client.renderer.block.model.ItemCameraTransforms; -import net.minecraft.client.renderer.block.model.ItemOverrideList; +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.EnumFacing; import net.minecraftforge.client.model.PerspectiveMapWrapper; @@ -15,8 +15,10 @@ import net.minecraftforge.common.model.TRSRTransformation; import org.apache.commons.lang3.tuple.Pair; import java.util.List; +import java.util.Random; import javax.annotation.Nonnull; +import javax.annotation.Nullable; import javax.vecmath.Matrix4f; public class BakedWrapper implements IBakedModel { @@ -29,7 +31,7 @@ public class BakedWrapper implements IBakedModel { @Nonnull @Override - public List getQuads(IBlockState state, EnumFacing side, long rand) { + public List getQuads(@Nullable IBlockState state, @Nullable EnumFacing side, Random rand) { return parent.getQuads(state, side, rand); } diff --git a/src/main/java/slimeknights/mantle/client/model/BlockItemModelWrapper.java b/src/main/java/slimeknights/mantle/client/model/BlockItemModelWrapper.java index 718e457..e14029a 100644 --- a/src/main/java/slimeknights/mantle/client/model/BlockItemModelWrapper.java +++ b/src/main/java/slimeknights/mantle/client/model/BlockItemModelWrapper.java @@ -1,18 +1,20 @@ package slimeknights.mantle.client.model; import net.minecraft.block.state.IBlockState; -import net.minecraft.client.renderer.block.model.BakedQuad; -import net.minecraft.client.renderer.block.model.IBakedModel; -import net.minecraft.client.renderer.block.model.ItemCameraTransforms; -import net.minecraft.client.renderer.block.model.ItemOverrideList; +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.EnumFacing; import org.apache.commons.lang3.tuple.Pair; import java.util.List; +import java.util.Random; import javax.annotation.Nonnull; +import javax.annotation.Nullable; import javax.vecmath.Matrix4f; import slimeknights.mantle.client.ModelHelper; @@ -33,10 +35,10 @@ public class BlockItemModelWrapper implements IBakedModel { Matrix4f matrix = null; // fix transformation in hand if(cameraTransformType == ItemCameraTransforms.TransformType.THIRD_PERSON_RIGHT_HAND) { - matrix = ModelHelper.BLOCK_THIRD_PERSON_RIGHT.getMatrix(); + matrix = ModelHelper.BLOCK_THIRD_PERSON_RIGHT.getMatrixVec(); } else if(cameraTransformType == ItemCameraTransforms.TransformType.THIRD_PERSON_LEFT_HAND) { - matrix = ModelHelper.BLOCK_THIRD_PERSON_LEFT.getMatrix(); + matrix = ModelHelper.BLOCK_THIRD_PERSON_LEFT.getMatrixVec(); } return Pair.of(this, matrix); @@ -44,7 +46,7 @@ public class BlockItemModelWrapper implements IBakedModel { @Nonnull @Override - public List getQuads(IBlockState state, EnumFacing side, long rand) { + public List getQuads(@Nullable IBlockState state, @Nullable EnumFacing side, Random rand) { return parent.getQuads(state, side, rand); } @@ -78,6 +80,6 @@ public class BlockItemModelWrapper implements IBakedModel { @Nonnull @Override public ItemOverrideList getOverrides() { - return ItemOverrideList.NONE; + return ItemOverrideList.EMPTY; } } diff --git a/src/main/java/slimeknights/mantle/client/model/TRSRBakedModel.java b/src/main/java/slimeknights/mantle/client/model/TRSRBakedModel.java index c60213a..ae59854 100644 --- a/src/main/java/slimeknights/mantle/client/model/TRSRBakedModel.java +++ b/src/main/java/slimeknights/mantle/client/model/TRSRBakedModel.java @@ -1,13 +1,12 @@ package slimeknights.mantle.client.model; import com.google.common.collect.ImmutableList; - import net.minecraft.block.state.IBlockState; -import net.minecraft.client.renderer.block.model.BakedQuad; -import net.minecraft.client.renderer.block.model.IBakedModel; -import net.minecraft.client.renderer.block.model.ItemCameraTransforms; -import net.minecraft.client.renderer.block.model.ItemOverride; -import net.minecraft.client.renderer.block.model.ItemOverrideList; +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.ItemOverride; +import net.minecraft.client.renderer.model.ItemOverrideList; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.vertex.VertexFormat; import net.minecraft.client.renderer.vertex.VertexFormatElement; @@ -20,6 +19,7 @@ import net.minecraftforge.client.model.pipeline.VertexTransformer; import net.minecraftforge.common.model.TRSRTransformation; import java.util.List; +import java.util.Random; import javax.annotation.Nonnull; import javax.vecmath.Matrix3f; @@ -71,7 +71,7 @@ public class TRSRBakedModel implements IBakedModel { @Nonnull @Override - public List getQuads(IBlockState state, EnumFacing side, long rand) { + public List getQuads(IBlockState state, EnumFacing side, Random rand) { // transform quads obtained from parent ImmutableList.Builder builder = ImmutableList.builder(); @@ -80,7 +80,7 @@ public class TRSRBakedModel implements IBakedModel { try { // adjust side to facing-rotation if(side != null && side.getHorizontalIndex() > -1) { - side = EnumFacing.getHorizontal((side.getHorizontalIndex() + faceOffset) % 4); + side = EnumFacing.byHorizontalIndex((side.getHorizontalIndex() + faceOffset) % 4); } for(BakedQuad quad : original.getQuads(state, side, rand)) { Transformer transformer = new Transformer(transformation, quad.getFormat()); @@ -133,15 +133,15 @@ public class TRSRBakedModel implements IBakedModel { private final TRSRBakedModel model; public TRSROverride(TRSRBakedModel model) { - super(ImmutableList.of()); + super(null, null, null,ImmutableList.of()); this.model = model; } @Nonnull @Override - public IBakedModel handleItemState(@Nonnull IBakedModel originalModel, ItemStack stack, @Nonnull World world, @Nonnull EntityLivingBase entity) { - IBakedModel baked = model.original.getOverrides().handleItemState(originalModel, stack, world, entity); + public IBakedModel getModelWithOverrides(@Nonnull IBakedModel originalModel, ItemStack stack, @Nonnull World world, @Nonnull EntityLivingBase entity) { + IBakedModel baked = model.original.getOverrides().getModelWithOverrides(originalModel, stack, world, entity); return new TRSRBakedModel(baked, model.transformation); } @@ -155,7 +155,7 @@ public class TRSRBakedModel implements IBakedModel { public Transformer(TRSRTransformation transformation, VertexFormat format) { super(new UnpackedBakedQuad.Builder(format)); // position transform - this.transformation = transformation.getMatrix(); + this.transformation = transformation.getMatrixVec(); // normal transform this.normalTransformation = new Matrix3f(); this.transformation.getRotationScale(this.normalTransformation); diff --git a/src/main/java/slimeknights/mantle/common/IInventoryGui.java b/src/main/java/slimeknights/mantle/common/IInventoryGui.java index 822239d..919ec3e 100644 --- a/src/main/java/slimeknights/mantle/common/IInventoryGui.java +++ b/src/main/java/slimeknights/mantle/common/IInventoryGui.java @@ -5,8 +5,8 @@ import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; /** * Used in conjunction with GuiHandler. Implement in a TE to have it open its GUI/Container. @@ -15,6 +15,6 @@ public interface IInventoryGui { Container createContainer(InventoryPlayer inventoryplayer, World world, BlockPos pos); - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) GuiContainer createGui(InventoryPlayer inventoryplayer, World world, BlockPos pos); } diff --git a/src/main/java/slimeknights/mantle/inventory/BaseContainer.java b/src/main/java/slimeknights/mantle/inventory/BaseContainer.java index 43cce48..5ca4109 100644 --- a/src/main/java/slimeknights/mantle/inventory/BaseContainer.java +++ b/src/main/java/slimeknights/mantle/inventory/BaseContainer.java @@ -12,6 +12,7 @@ import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; +import net.minecraft.util.INameable; import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.ITextComponent; @@ -127,7 +128,7 @@ public abstract class BaseContainer extends Container { } public String getInventoryDisplayName() { - IWorldNameable nameable = null; + INameable nameable = null; if (itemHandler instanceof InvWrapper) { nameable = ((InvWrapper) itemHandler).getInv(); // if the inventory doesn't have a name fall back to checking the tileentity @@ -135,12 +136,12 @@ public abstract class BaseContainer extends Container { nameable = null; } } - if(nameable == null && tile instanceof IWorldNameable) { - nameable = (IWorldNameable) tile; + if(nameable == null && tile instanceof INameable) { + nameable = (INameable) tile; } if (nameable != null) { ITextComponent textName = nameable.getDisplayName(); - return textName != null ? textName.getFormattedText() : nameable.getName(); + return textName != null ? textName.getFormattedText() : nameable.getName().toString(); } return null; } @@ -164,14 +165,14 @@ public abstract class BaseContainer extends Container { for(int row = 0; row < 3; row++) { for(int col = 0; col < 9; col++) { - this.addSlotToContainer(new Slot(playerInventory, index, xCorner + col * 18, yCorner + row * 18)); + this.addSlot(new Slot(playerInventory, index, xCorner + col * 18, yCorner + row * 18)); index++; } } index = 0; for(int col = 0; col < 9; col++) { - this.addSlotToContainer(new Slot(playerInventory, index, xCorner + col * 18, yCorner + 58)); + this.addSlot(new Slot(playerInventory, index, xCorner + col * 18, yCorner + 58)); index++; } @@ -180,11 +181,11 @@ public abstract class BaseContainer extends Container { @Nonnull @Override - protected Slot addSlotToContainer(Slot slotIn) { + protected Slot addSlot(Slot slotIn) { if(playerInventoryStart >= 0) { throw new SlimeknightException("BaseContainer: Player inventory has to be last slots. Add all slots before adding the player inventory."); } - return super.addSlotToContainer(slotIn); + return super.addSlot(slotIn); } @Nonnull @@ -261,7 +262,6 @@ public abstract class BaseContainer extends Container { if(!itemstack1.isEmpty() && itemstack1.getItem() == stack.getItem() - && (!stack.getHasSubtypes() || stack.getMetadata() == itemstack1.getMetadata()) && ItemStack.areItemStackTagsEqual(stack, itemstack1) && this.canMergeSlot(stack, slot)) { int l = itemstack1.getCount() + stack.getCount(); diff --git a/src/main/java/slimeknights/mantle/inventory/ContainerMultiModule.java b/src/main/java/slimeknights/mantle/inventory/ContainerMultiModule.java index 353d9a7..fd0f221 100644 --- a/src/main/java/slimeknights/mantle/inventory/ContainerMultiModule.java +++ b/src/main/java/slimeknights/mantle/inventory/ContainerMultiModule.java @@ -55,7 +55,7 @@ public class ContainerMultiModule extends Bas int begin = inventorySlots.size(); for(Object slot : subcontainer.inventorySlots) { SlotWrapper wrapper = new SlotWrapper((Slot) slot); - addSlotToContainer(wrapper); + addSlot(wrapper); slotContainerMap.put(wrapper.slotNumber, subcontainer); } int end = inventorySlots.size(); diff --git a/src/main/java/slimeknights/mantle/inventory/ContainerSimpleChest.java b/src/main/java/slimeknights/mantle/inventory/ContainerSimpleChest.java index abaee40..c1b1bb1 100644 --- a/src/main/java/slimeknights/mantle/inventory/ContainerSimpleChest.java +++ b/src/main/java/slimeknights/mantle/inventory/ContainerSimpleChest.java @@ -21,7 +21,7 @@ public class ContainerSimpleChest extends BaseContainer { break; } - this.addSlotToContainer(createSlot(tile, index, 8 + j * 18, 18 + i * 18)); + this.addSlot(createSlot(tile, index, 8 + j * 18, 18 + i * 18)); index++; } } diff --git a/src/main/java/slimeknights/mantle/inventory/SlotCraftingCustom.java b/src/main/java/slimeknights/mantle/inventory/SlotCraftingCustom.java index f1aba5f..8031b9f 100644 --- a/src/main/java/slimeknights/mantle/inventory/SlotCraftingCustom.java +++ b/src/main/java/slimeknights/mantle/inventory/SlotCraftingCustom.java @@ -29,7 +29,7 @@ public class SlotCraftingCustom extends SlotCrafting { @Override @Nonnull public ItemStack onTake(EntityPlayer playerIn, @Nonnull ItemStack stack) { - net.minecraftforge.fml.common.FMLCommonHandler.instance().firePlayerCraftingEvent(playerIn, stack, craftMatrix); + net.minecraftforge.fml.hooks.BasicEventHooks.firePlayerCraftingEvent(playerIn, stack, craftMatrix); this.onCrafting(stack); callback.onCrafting(playerIn, stack, craftMatrix); diff --git a/src/main/java/slimeknights/mantle/inventory/SlotWrapper.java b/src/main/java/slimeknights/mantle/inventory/SlotWrapper.java index a016c6a..f4c69df 100644 --- a/src/main/java/slimeknights/mantle/inventory/SlotWrapper.java +++ b/src/main/java/slimeknights/mantle/inventory/SlotWrapper.java @@ -6,8 +6,8 @@ import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import javax.annotation.Nonnull; @@ -78,7 +78,7 @@ public class SlotWrapper extends Slot { } @Override - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public String getSlotTexture() { return parent.getSlotTexture(); } @@ -116,7 +116,7 @@ public class SlotWrapper extends Slot { parent.setBackgroundLocation(texture); } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @Override public boolean isEnabled() { return parent.isEnabled(); diff --git a/src/main/java/slimeknights/mantle/item/ItemArmorTooltip.java b/src/main/java/slimeknights/mantle/item/ItemArmorTooltip.java index 7a73654..d9e10c7 100644 --- a/src/main/java/slimeknights/mantle/item/ItemArmorTooltip.java +++ b/src/main/java/slimeknights/mantle/item/ItemArmorTooltip.java @@ -2,25 +2,29 @@ package slimeknights.mantle.item; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.inventory.EntityEquipmentSlot; +import net.minecraft.item.IArmorMaterial; +import net.minecraft.item.Item; import net.minecraft.item.ItemArmor; import net.minecraft.item.ItemStack; +import net.minecraft.util.text.ITextComponent; import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import java.util.List; import javax.annotation.Nullable; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; + public class ItemArmorTooltip extends ItemArmor { - public ItemArmorTooltip(ArmorMaterial armorMaterial, int renderIndex, EntityEquipmentSlot equipmentSlot) { - super(armorMaterial, renderIndex, equipmentSlot); + public ItemArmorTooltip(IArmorMaterial armorMaterial, EntityEquipmentSlot equipmentSlot, Item.Properties builder) { + super(armorMaterial, equipmentSlot, builder); } @Override - @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, @Nullable World worldIn, List tooltip, ITooltipFlag flagIn) { + @OnlyIn(Dist.CLIENT) + public void addInformation(ItemStack stack, @Nullable World worldIn, List tooltip, ITooltipFlag flagIn) { ItemTooltip.addOptionalTooltip(stack, tooltip); super.addInformation(stack, worldIn, tooltip, flagIn); } diff --git a/src/main/java/slimeknights/mantle/multiblock/MultiServantLogic.java b/src/main/java/slimeknights/mantle/multiblock/MultiServantLogic.java index 48630b9..99318dc 100644 --- a/src/main/java/slimeknights/mantle/multiblock/MultiServantLogic.java +++ b/src/main/java/slimeknights/mantle/multiblock/MultiServantLogic.java @@ -5,10 +5,11 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.NetworkManager; import net.minecraft.network.play.server.SPacketUpdateTileEntity; +import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import net.minecraftforge.fml.common.registry.ForgeRegistries; +import net.minecraftforge.registries.ForgeRegistries; import slimeknights.mantle.tileentity.MantleTileEntity; import javax.annotation.Nonnull; @@ -20,6 +21,10 @@ public class MultiServantLogic extends MantleTileEntity implements IServantLogic Block masterBlock; IBlockState state; + public MultiServantLogic(TileEntityType tileEntityTypeIn) { + super(tileEntityTypeIn); + } + public boolean canUpdate() { return false; } @@ -103,37 +108,37 @@ public class MultiServantLogic extends MantleTileEntity implements IServantLogic public void readCustomNBT(NBTTagCompound tags) { this.hasMaster = tags.getBoolean("hasMaster"); if(this.hasMaster) { - int xCenter = tags.getInteger("xCenter"); - int yCenter = tags.getInteger("yCenter"); - int zCenter = tags.getInteger("zCenter"); + int xCenter = tags.getInt("xCenter"); + int yCenter = tags.getInt("yCenter"); + int zCenter = tags.getInt("zCenter"); this.master = new BlockPos(xCenter, yCenter, zCenter); this.masterBlock = ForgeRegistries.BLOCKS.getValue(new ResourceLocation(tags.getString("MasterBlockName"))); - this.state = Block.getStateById(tags.getInteger("masterState")); + this.state = Block.getStateById(tags.getInt("masterState")); } } public NBTTagCompound writeCustomNBT(NBTTagCompound tags) { - tags.setBoolean("hasMaster", this.hasMaster); + tags.putBoolean("hasMaster", this.hasMaster); if(this.hasMaster) { - tags.setInteger("xCenter", this.master.getX()); - tags.setInteger("yCenter", this.master.getY()); - tags.setInteger("zCenter", this.master.getZ()); - tags.setString("MasterBlockName", ForgeRegistries.BLOCKS.getKey(this.masterBlock).toString()); - tags.setInteger("masterState", Block.getStateId(this.state)); + tags.putInt("xCenter", this.master.getX()); + tags.putInt("yCenter", this.master.getY()); + tags.putInt("zCenter", this.master.getZ()); + tags.putString("MasterBlockName", ForgeRegistries.BLOCKS.getKey(this.masterBlock).toString()); + tags.putInt("masterState", Block.getStateId(this.state)); } return tags; } @Override - public void readFromNBT(NBTTagCompound tags) { - super.readFromNBT(tags); + public void read(NBTTagCompound tags) { + super.read(tags); this.readCustomNBT(tags); } @Nonnull @Override - public NBTTagCompound writeToNBT(NBTTagCompound tags) { - tags = super.writeToNBT(tags); + public NBTTagCompound write(NBTTagCompound tags) { + tags = super.write(tags); return this.writeCustomNBT(tags); } diff --git a/src/main/java/slimeknights/mantle/property/PropertyUnlistedDirection.java b/src/main/java/slimeknights/mantle/property/PropertyUnlistedDirection.java index 8f4bd5a..4edfad9 100644 --- a/src/main/java/slimeknights/mantle/property/PropertyUnlistedDirection.java +++ b/src/main/java/slimeknights/mantle/property/PropertyUnlistedDirection.java @@ -4,13 +4,13 @@ import com.google.common.base.Predicate; import com.google.common.collect.Collections2; import com.google.common.collect.Lists; -import net.minecraft.block.properties.PropertyDirection; +import net.minecraft.state.DirectionProperty; import net.minecraft.util.EnumFacing; import net.minecraftforge.common.property.IUnlistedProperty; import java.util.Collection; -public class PropertyUnlistedDirection extends PropertyDirection implements IUnlistedProperty { +public class PropertyUnlistedDirection extends DirectionProperty implements IUnlistedProperty { public PropertyUnlistedDirection(String name, Collection values) { super(name, values); diff --git a/src/main/java/slimeknights/mantle/pulsar/control/PulseManager.java b/src/main/java/slimeknights/mantle/pulsar/control/PulseManager.java index a30f861..b7a9e98 100644 --- a/src/main/java/slimeknights/mantle/pulsar/control/PulseManager.java +++ b/src/main/java/slimeknights/mantle/pulsar/control/PulseManager.java @@ -1,16 +1,17 @@ package slimeknights.mantle.pulsar.control; -import com.google.common.eventbus.EventBus; -import com.google.common.eventbus.Subscribe; - import net.minecraft.util.ResourceLocation; import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.fml.common.FMLCommonHandler; -import net.minecraftforge.fml.common.FMLModContainer; -import net.minecraftforge.fml.common.Loader; -import net.minecraftforge.fml.common.ModContainer; -import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; +import net.minecraftforge.eventbus.EventBus; +import net.minecraftforge.eventbus.api.Event; +import net.minecraftforge.eventbus.api.SubscribeEvent; +import net.minecraftforge.fml.CrashReportExtender; +import net.minecraftforge.fml.ModContainer; +import net.minecraftforge.fml.ModList; +import net.minecraftforge.fml.ModLoadingContext; +import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; +import net.minecraftforge.fml.javafmlmod.FMLModContainer; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -53,7 +54,7 @@ public class PulseManager { private static final Map> ALL_PULSES = new HashMap<>(); private final Map pulses = new LinkedHashMap<>(); // Use the Google @Subscribe to avoid confusion/breaking changes. - private final Flightpath flightpath = new Flightpath(new AnnotationLocator(Subscribe.class)); + private final Flightpath flightpath = new Flightpath(new AnnotationLocator(SubscribeEvent.class)); private boolean blockNewRegistrations = false; private boolean configLoaded = false; @@ -91,11 +92,11 @@ public class PulseManager { * Shared initialiser code between all the constructors. */ private void init() { - String modId = Loader.instance().activeModContainer().getModId(); + String modId = ModLoadingContext.get().getActiveContainer().getNamespace(); this.id = modId; log = LogManager.getLogger("Pulsar-" + modId); flightpath.setExceptionHandler(new BusExceptionHandler(modId)); - FMLCommonHandler.instance().registerCrashCallable(new CrashHandler(modId, this)); + CrashReportExtender.registerCrashCallable(new CrashHandler(modId, this)); // regsister our pulse loader so it can be found by the static method ALL_PULSES.put(modId, pulses); // Attach us to the mods FML bus @@ -148,7 +149,7 @@ public class PulseManager { if (!deps.equals("")) { String[] parsedDeps = deps.split(";"); for (String s : parsedDeps) { - if (!Loader.isModLoaded(s)) { + if (!ModList.get().isLoaded(s)) { log.info("Skipping Pulse " + id + "; missing dependency: " + s); missingDeps = true; enabled = false; @@ -164,8 +165,6 @@ public class PulseManager { if (meta.isEnabled()) { pulses.put(pulse, meta); flightpath.register(pulse); - // Work around to catch the new registry events added from the registry rewrite. - MinecraftForge.EVENT_BUS.register(pulse); } } @@ -175,7 +174,7 @@ public class PulseManager { * @param obj Object to register. */ private void attachToContainerEventBus(Object obj) { - ModContainer cnt = Loader.instance().activeModContainer(); + ModContainer cnt = ModLoadingContext.get().getActiveContainer(); log.debug("Attaching [" + obj + "] to event bus for container [" + cnt + "]"); try { FMLModContainer mc = (FMLModContainer)cnt; @@ -203,9 +202,9 @@ public class PulseManager { * * @param evt An event object. */ - @Subscribe - public void propagateEvent(Object evt) { - if (evt instanceof FMLPreInitializationEvent) preInit((FMLPreInitializationEvent) evt); + @SubscribeEvent + public void propagateEvent(Event evt) { + if (evt instanceof FMLCommonSetupEvent) preInit((FMLCommonSetupEvent) evt); // We use individual buses due to the EventBus class using a Set rather than a List, thus losing the ordering. // This trick is shamelessly borrowed from FML. flightpath.post(evt); @@ -217,7 +216,7 @@ public class PulseManager { return conf.isModuleEnabled(meta); } - private void preInit(FMLPreInitializationEvent evt) { + private void preInit(FMLCommonSetupEvent evt) { if (!blockNewRegistrations) conf.flush(); // First init call, so flush config blockNewRegistrations = true; } @@ -257,9 +256,9 @@ public class PulseManager { */ public static boolean isPulseLoadedGlobal(String pulseId) { ResourceLocation loc = new ResourceLocation(pulseId); - Map pulses = ALL_PULSES.get(loc.getResourceDomain()); + Map pulses = ALL_PULSES.get(loc.getNamespace()); if(pulses != null) { - return isPulseLoaded(pulses, loc.getResourcePath()); + return isPulseLoaded(pulses, loc.getPath()); } return false; } diff --git a/src/main/java/slimeknights/mantle/pulsar/debug/EventSpy.java b/src/main/java/slimeknights/mantle/pulsar/debug/EventSpy.java index aa74275..58055dc 100644 --- a/src/main/java/slimeknights/mantle/pulsar/debug/EventSpy.java +++ b/src/main/java/slimeknights/mantle/pulsar/debug/EventSpy.java @@ -1,9 +1,10 @@ package slimeknights.mantle.pulsar.debug; -import com.google.common.eventbus.Subscribe; - -import net.minecraftforge.fml.common.Loader; +import net.minecraftforge.eventbus.api.Event; +import net.minecraftforge.eventbus.api.SubscribeEvent; +import net.minecraftforge.fml.ModLoadingContext; +import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -18,11 +19,16 @@ import slimeknights.mantle.pulsar.pulse.Pulse; @Pulse(id="EventSpy", description="we iz in ur buses, monitorin ur eventz", forced=true) public class EventSpy { - private final Logger log = LogManager.getLogger("EventSpy/" + Loader.instance().activeModContainer().getModId()); + private final Logger log = LogManager.getLogger("EventSpy/" + ModLoadingContext.get().getActiveContainer().getNamespace()); - @Subscribe - public void receive(Object evt) { + @SubscribeEvent + public void receive(Event evt) { log.info("Received event: " + evt); } + @SubscribeEvent + public void preInit(final FMLCommonSetupEvent evt) { + log.info("Example preInit hit"); + } + } diff --git a/src/main/java/slimeknights/mantle/pulsar/internal/Configuration.java b/src/main/java/slimeknights/mantle/pulsar/internal/Configuration.java index 0fb16d4..331446e 100644 --- a/src/main/java/slimeknights/mantle/pulsar/internal/Configuration.java +++ b/src/main/java/slimeknights/mantle/pulsar/internal/Configuration.java @@ -6,8 +6,6 @@ import com.google.gson.reflect.TypeToken; import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; -import net.minecraftforge.fml.common.Loader; - import org.apache.logging.log4j.Logger; import java.io.File; @@ -16,6 +14,7 @@ import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.InputStreamReader; import java.io.OutputStreamWriter; +import java.nio.file.Paths; import java.util.HashMap; import java.util.Map; @@ -50,7 +49,7 @@ public class Configuration implements IConfiguration { * @param logger The logger to send debug info to. */ public Configuration(String confName, Logger logger) { - this.confPath = Loader.instance().getConfigDir().toString() + File.separator + confName + ".json"; + this.confPath = Paths.get("config", confName+ ".json").toString(); this.logger = logger; } diff --git a/src/main/java/slimeknights/mantle/tileentity/MantleTileEntity.java b/src/main/java/slimeknights/mantle/tileentity/MantleTileEntity.java index 0f90d79..1a694ce 100644 --- a/src/main/java/slimeknights/mantle/tileentity/MantleTileEntity.java +++ b/src/main/java/slimeknights/mantle/tileentity/MantleTileEntity.java @@ -1,9 +1,14 @@ package slimeknights.mantle.tileentity; import net.minecraft.tileentity.TileEntity; +import net.minecraft.tileentity.TileEntityType; public class MantleTileEntity extends TileEntity { + public MantleTileEntity(TileEntityType tileEntityTypeIn) { + super(tileEntityTypeIn); + } + public boolean isClient() { return this.getWorld() != null && this.getWorld().isRemote; } diff --git a/src/main/java/slimeknights/mantle/tileentity/TileInventory.java b/src/main/java/slimeknights/mantle/tileentity/TileInventory.java index 3b08768..7567bbf 100644 --- a/src/main/java/slimeknights/mantle/tileentity/TileInventory.java +++ b/src/main/java/slimeknights/mantle/tileentity/TileInventory.java @@ -6,7 +6,9 @@ import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; +import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.EnumFacing; +import net.minecraft.util.INameable; import net.minecraft.util.NonNullList; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.TextComponentString; @@ -17,6 +19,7 @@ import net.minecraftforge.items.IItemHandlerModifiable; import net.minecraftforge.items.wrapper.InvWrapper; import javax.annotation.Nonnull; +import javax.annotation.Nullable; import slimeknights.mantle.util.ItemStackList; @@ -24,7 +27,7 @@ import slimeknights.mantle.util.ItemStackList; public class TileInventory extends MantleTileEntity implements IInventory { private NonNullList inventory; - protected String inventoryTitle; + protected ITextComponent inventoryTitle; protected boolean hasCustomName; protected int stackSizeLimit; protected IItemHandlerModifiable itemHandler; @@ -32,14 +35,15 @@ public class TileInventory extends MantleTileEntity implements IInventory { /** * @param name Localization String for the inventory title. Can be overridden through setCustomName */ - public TileInventory(String name, int inventorySize) { - this(name, inventorySize, 64); + public TileInventory(TileEntityType tileEntityTypeIn, ITextComponent name, int inventorySize) { + this(tileEntityTypeIn, name, inventorySize, 64); } /** * @param name Localization String for the inventory title. Can be overridden through setCustomName */ - public TileInventory(String name, int inventorySize, int maxStackSize) { + public TileInventory(TileEntityType tileEntityTypeIn, ITextComponent name, int inventorySize, int maxStackSize) { + super(tileEntityTypeIn); this.inventory = NonNullList. withSize(inventorySize, ItemStack.EMPTY); this.stackSizeLimit = maxStackSize; this.inventoryTitle = name; @@ -53,9 +57,9 @@ public class TileInventory extends MantleTileEntity implements IInventory { @SuppressWarnings("unchecked") @Override - public T getCapability(@Nonnull Capability capability, EnumFacing facing) { + public net.minecraftforge.common.util.LazyOptional getCapability(@Nonnull Capability capability, EnumFacing facing) { if(capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) { - return (T) itemHandler; + return itemHandler.cast(); } return super.getCapability(capability, facing); } @@ -185,7 +189,7 @@ public class TileInventory extends MantleTileEntity implements IInventory { @Nonnull @Override - public String getName() { + public ITextComponent getName() { return this.inventoryTitle; } @@ -194,19 +198,25 @@ public class TileInventory extends MantleTileEntity implements IInventory { return this.hasCustomName; } - public void setCustomName(String customName) { + public void setCustomName(ITextComponent customName) { this.hasCustomName = true; this.inventoryTitle = customName; } + @Nullable + @Override + public ITextComponent getCustomName() { + return this.inventoryTitle; + } + @Nonnull @Override public ITextComponent getDisplayName() { if(hasCustomName()) { - return new TextComponentString(getName()); + return new TextComponentString(getName().getFormattedText()); } - return new TextComponentTranslation(getName()); + return new TextComponentTranslation(getName().getFormattedText()); } @@ -235,28 +245,28 @@ public class TileInventory extends MantleTileEntity implements IInventory { /* NBT */ @Override - public void readFromNBT(NBTTagCompound tags) { - super.readFromNBT(tags); - this.resizeInternal(tags.getInteger("InventorySize")); + public void read(NBTTagCompound tags) { + super.read(tags); + this.resizeInternal(tags.getInt("InventorySize")); readInventoryFromNBT(tags); - if(tags.hasKey("CustomName", 8)) { + if(tags.contains("CustomName", 8)) { this.inventoryTitle = tags.getString("CustomName"); } } @Nonnull @Override - public NBTTagCompound writeToNBT(NBTTagCompound tags) { - super.writeToNBT(tags); + public NBTTagCompound write(NBTTagCompound tags) { + super.write(tags); - tags.setInteger("InventorySize", inventory.size()); + tags.putInt("InventorySize", inventory.size()); writeInventoryToNBT(tags); if(this.hasCustomName()) { - tags.setString("CustomName", this.inventoryTitle); + tags.putString("CustomName", this.inventoryTitle); } return tags; } @@ -269,27 +279,27 @@ public class TileInventory extends MantleTileEntity implements IInventory { for(int i = 0; i < inventory.getSizeInventory(); i++) { if(!inventory.getStackInSlot(i).isEmpty()) { NBTTagCompound itemTag = new NBTTagCompound(); - itemTag.setByte("Slot", (byte) i); - inventory.getStackInSlot(i).writeToNBT(itemTag); - nbttaglist.appendTag(itemTag); + itemTag.putByte("Slot", (byte) i); + inventory.getStackInSlot(i).write(itemTag); + nbttaglist.add(itemTag); } } - tag.setTag("Items", nbttaglist); + tag.put("Items", nbttaglist); } /** Reads a an inventory from the tag. Overwrites current content */ public void readInventoryFromNBT(NBTTagCompound tag) { - NBTTagList nbttaglist = tag.getTagList("Items", 10); + NBTTagList nbttaglist = tag.getList("Items", 10); int limit = getInventoryStackLimit(); ItemStack stack; - for(int i = 0; i < nbttaglist.tagCount(); ++i) { - NBTTagCompound itemTag = nbttaglist.getCompoundTagAt(i); + for(int i = 0; i < nbttaglist.size(); ++i) { + NBTTagCompound itemTag = nbttaglist.getCompound(i); int slot = itemTag.getByte("Slot") & 255; if(slot >= 0 && slot < inventory.size()) { - stack = new ItemStack(itemTag); + stack = ItemStack.read(itemTag); if(!stack.isEmpty() && stack.getCount() > limit) { stack.setCount(limit); } diff --git a/src/main/java/slimeknights/mantle/util/TagHelper.java b/src/main/java/slimeknights/mantle/util/TagHelper.java index 14d48fc..6fa8b5c 100644 --- a/src/main/java/slimeknights/mantle/util/TagHelper.java +++ b/src/main/java/slimeknights/mantle/util/TagHelper.java @@ -15,27 +15,27 @@ public class TagHelper { /* Generic Tag Operations */ public static NBTTagCompound getTagSafe(ItemStack stack) { - if(stack.isEmpty() || !stack.hasTagCompound()) { + if(stack.isEmpty() || !stack.hasTag()) { return new NBTTagCompound(); } - return stack.getTagCompound(); + return stack.getTag(); } public static NBTTagCompound getTagSafe(NBTTagCompound tag, String key) { - if(tag == null || !tag.hasKey(key)) { + if(tag == null || !tag.contains(key)) { return new NBTTagCompound(); } - return tag.getCompoundTag(key); + return tag.getCompound(key); } public static NBTTagList getTagListSafe(NBTTagCompound tag, String key, int type) { - if(tag == null || !tag.hasKey(key)) { + if(tag == null || !tag.contains(key)) { return new NBTTagList(); } - return tag.getTagList(key, type); + return tag.getList(key, type); } } diff --git a/src/main/resources/META-INF/mantle_at.cfg b/src/main/resources/META-INF/accesstransformer.cfg similarity index 50% rename from src/main/resources/META-INF/mantle_at.cfg rename to src/main/resources/META-INF/accesstransformer.cfg index 4af4ae9..0f06ceb 100644 --- a/src/main/resources/META-INF/mantle_at.cfg +++ b/src/main/resources/META-INF/accesstransformer.cfg @@ -1,14 +1,12 @@ # Mantle -- Access Transformer # GuiContainer -public net.minecraft.client.gui.inventory.GuiContainer field_146999_f #xSize -public net.minecraft.client.gui.inventory.GuiContainer field_147000_g #ySize -public net.minecraft.client.gui.inventory.GuiContainer field_147009_r #guiTop -public net.minecraft.client.gui.inventory.GuiContainer field_147003_i #guiLeft -public net.minecraft.client.gui.inventory.GuiContainer func_146977_a(Lnet/minecraft/inventory/Slot;)V #renderSlot -public net.minecraft.client.gui.inventory.GuiContainer func_146981_a(Lnet/minecraft/inventory/Slot;II)Z #isMouseOverSlot -# GuiScreen -public net.minecraft.client.gui.GuiScreen field_146292_n #buttonList +public net.minecraft.client.gui.inventory.GuiContainer field_146999_f # xSize +public net.minecraft.client.gui.inventory.GuiContainer field_147000_g # ySize +public net.minecraft.client.gui.inventory.GuiContainer field_147009_r # guiTop +public net.minecraft.client.gui.inventory.GuiContainer field_147003_i # guiLeft +public net.minecraft.client.gui.inventory.GuiContainer func_146977_a(Lnet/minecraft/inventory/Slot;)V # drawSlot +public net.minecraft.client.gui.inventory.GuiContainer func_195362_a(Lnet/minecraft/inventory/Slot;DD)Z # isSlotSelected -# Block -public net.minecraft.block.Block field_149772_a # displayOnCreativeTab +# GuiScreen +public net.minecraft.client.gui.GuiScreen field_146292_n # buttons \ No newline at end of file diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml new file mode 100644 index 0000000..576db00 --- /dev/null +++ b/src/main/resources/META-INF/mods.toml @@ -0,0 +1,20 @@ +modLoader="javafml" +loaderVersion="[24,)" +issueTrackerURL="https://github.com/SlimeKnights/Mantle/issues" +logoFile="Mantle.png" + +[[mods]] + modId="mantle" + version="${version}" + displayName="Mantle" + authors="Slime Knights" + description=''' +Shared code for Slime Knights mods and others. + ''' + displayURL="https://minecraft.curseforge.com/projects/mantle" + [[dependencies.mantle]] + modId="forge" + mandatory=true + versionRange="[${forge_version},)" + ordering="NONE" + side="BOTH" \ No newline at end of file