From cc275b0965714e674ff115da5e8ac5206700965f Mon Sep 17 00:00:00 2001 From: maxanier Date: Thu, 5 Mar 2020 00:43:54 +0100 Subject: [PATCH 01/28] gradle and mapping updates --- build.gradle | 117 ++++++++++++++---- gradle.properties | 12 +- gradle/wrapper/gradle-wrapper.properties | 2 +- .../amerifrance/guideapi/api/BookEvent.java | 18 +-- .../amerifrance/guideapi/api/GuideAPI.java | 11 +- .../amerifrance/guideapi/api/GuideBook.java | 3 +- .../amerifrance/guideapi/api/IGuideBook.java | 7 +- .../amerifrance/guideapi/api/IGuideItem.java | 0 .../guideapi/api/IGuideLinked.java | 4 +- .../guideapi/api/IInfoRenderer.java | 8 +- .../java/amerifrance/guideapi/api/IPage.java | 26 ++-- .../guideapi/api/IRecipeRenderer.java | 9 +- .../amerifrance/guideapi/api/SubTexture.java | 11 +- .../guideapi/api/button/ButtonGuideAPI.java | 4 +- .../amerifrance/guideapi/api/impl/Book.java | 0 .../guideapi/api/impl/BookBinder.java | 0 .../guideapi/api/impl/Category.java | 10 +- .../amerifrance/guideapi/api/impl/Entry.java | 10 +- .../amerifrance/guideapi/api/impl/Page.java | 10 +- .../impl/abstraction/CategoryAbstract.java | 10 +- .../api/impl/abstraction/EntryAbstract.java | 10 +- .../guideapi/api/package-info.java | 0 .../guideapi/api/util/BookHelper.java | 0 .../guideapi/api/util/GuiHelper.java | 0 .../guideapi/api/util/NBTBookTags.java | 0 .../guideapi/api/util/PageHelper.java | 0 .../guideapi/api/util/TextHelper.java | 2 +- .../amerifrance/guideapi/gui/GuiBase.java | 10 +- .../amerifrance/guideapi/gui/GuiCategory.java | 8 +- .../amerifrance/guideapi/gui/GuiEntry.java | 8 +- .../amerifrance/guideapi/gui/GuiHome.java | 10 +- .../amerifrance/guideapi/gui/GuiSearch.java | 20 +-- .../info/InfoRendererDescription.java | 6 +- .../guideapi/info/InfoRendererImage.java | 10 +- .../guideapi/item/ItemGuideBook.java | 22 ++-- .../guideapi/network/PacketSyncCategory.java | 4 +- .../guideapi/network/PacketSyncEntry.java | 4 +- .../guideapi/network/PacketSyncHome.java | 4 +- .../guideapi/page/PageBrewingRecipe.java | 2 +- .../guideapi/page/PageFurnaceRecipe.java | 2 +- .../guideapi/page/PageIRecipe.java | 4 +- .../guideapi/page/PageItemStack.java | 2 +- .../amerifrance/guideapi/page/PageSound.java | 8 +- .../guideapi/proxy/ClientProxy.java | 4 +- .../guideapi/proxy/CommonProxy.java | 16 +-- .../amerifrance/guideapi/test/TestBook.java | 4 +- .../amerifrance/guideapi/test/TestBook2.java | 10 +- .../amerifrance/guideapi/test/TestBook3.java | 14 +-- .../guideapi/util/EventHandler.java | 38 +++--- .../guideapi/wrapper/CategoryWrapper.java | 6 +- .../guideapi/wrapper/EntryWrapper.java | 6 +- .../guideapi/wrapper/PageWrapper.java | 6 +- 52 files changed, 293 insertions(+), 219 deletions(-) rename src/{main => api}/java/amerifrance/guideapi/api/BookEvent.java (75%) rename src/{main => api}/java/amerifrance/guideapi/api/GuideAPI.java (93%) rename src/{main => api}/java/amerifrance/guideapi/api/GuideBook.java (86%) rename src/{main => api}/java/amerifrance/guideapi/api/IGuideBook.java (91%) rename src/{main => api}/java/amerifrance/guideapi/api/IGuideItem.java (100%) rename src/{main => api}/java/amerifrance/guideapi/api/IGuideLinked.java (79%) rename src/{main => api}/java/amerifrance/guideapi/api/IInfoRenderer.java (87%) rename src/{main => api}/java/amerifrance/guideapi/api/IPage.java (61%) rename src/{main => api}/java/amerifrance/guideapi/api/IRecipeRenderer.java (87%) rename src/{main => api}/java/amerifrance/guideapi/api/SubTexture.java (93%) rename src/{main => api}/java/amerifrance/guideapi/api/button/ButtonGuideAPI.java (71%) rename src/{main => api}/java/amerifrance/guideapi/api/impl/Book.java (100%) rename src/{main => api}/java/amerifrance/guideapi/api/impl/BookBinder.java (100%) rename src/{main => api}/java/amerifrance/guideapi/api/impl/Category.java (86%) rename src/{main => api}/java/amerifrance/guideapi/api/impl/Entry.java (92%) rename src/{main => api}/java/amerifrance/guideapi/api/impl/Page.java (85%) rename src/{main => api}/java/amerifrance/guideapi/api/impl/abstraction/CategoryAbstract.java (94%) rename src/{main => api}/java/amerifrance/guideapi/api/impl/abstraction/EntryAbstract.java (90%) rename src/{main => api}/java/amerifrance/guideapi/api/package-info.java (100%) rename src/{main => api}/java/amerifrance/guideapi/api/util/BookHelper.java (100%) rename src/{main => api}/java/amerifrance/guideapi/api/util/GuiHelper.java (100%) rename src/{main => api}/java/amerifrance/guideapi/api/util/NBTBookTags.java (100%) rename src/{main => api}/java/amerifrance/guideapi/api/util/PageHelper.java (100%) rename src/{main => api}/java/amerifrance/guideapi/api/util/TextHelper.java (96%) diff --git a/build.gradle b/build.gradle index 320aa9b2..7739d720 100644 --- a/build.gradle +++ b/build.gradle @@ -1,19 +1,27 @@ buildscript { repositories { mavenCentral() - maven { url = "http://files.minecraftforge.net/maven" } - maven { url = "https://oss.sonatype.org/content/repositories/snapshots/" } + jcenter() + maven { + name = "forge" + url = "http://files.minecraftforge.net/maven" + } } + + dependencies { - classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT' + classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '3.+', changing: true } } + plugins { - id 'com.matthewprenger.cursegradle' version '1.1.2' - id "net.minecraftforge.gradle.forge" version "2.0.2" + id 'com.matthewprenger.cursegradle' version '1.2.0' } +apply plugin: 'net.minecraftforge.gradle' +apply plugin: 'idea' +apply plugin: 'eclipse' apply plugin: 'maven-publish' def build_number = 'CUSTOM' @@ -23,46 +31,98 @@ if (System.getenv('BUILD_NUMBER') != null) group = package_group archivesBaseName = mod_name -version = "${mc_version}-${mod_version}-${build_number}" +version = "${minecraft_version}-${mod_version}-${build_number}" repositories { maven { url = "http://dvs1.progwml6.com/files/maven" } } dependencies { - deobfCompile "mezz.jei:jei_${mc_version}:${jei_version}" + minecraft([ + group: "net.minecraftforge", + name: "forge", + version: "${project.minecraft_version}-${project.forge_version}" + ]) + compileOnly fg.deobf("mezz.jei:jei-${project.minecraft_version}:${project.jei_version}:api") //API for compile + runtimeOnly fg.deobf("mezz.jei:jei-${project.minecraft_version}:${project.jei_version}") //Full for runtime } +sourceSets { + api + main { + compileClasspath += sourceSets.api.output + runtimeClasspath += sourceSets.api.output + } +} + +configurations { + apiCompile.extendsFrom(compile) +} + + minecraft { - version = "${mc_version}-${forge_version}" - runDir = "run" + mappings channel: "${project.mcp_channel}".toString(), version: "${project.mcp_mappings}".toString() + accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg') + + runs { + client { + taskName 'runClient1' + main 'net.minecraftforge.userdev.LaunchTesting' + property 'forge.logging.console.level', 'debug' + property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP' + workingDirectory project.file('run/client1').canonicalPath + + mods { + vampirism { + source sourceSets.main + source sourceSets.api + } + } + + } + server = { + property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP' + property 'forge.logging.console.level', 'debug' + workingDirectory project.file('run/server').canonicalPath + + mods { + vampirism { + source sourceSets.main + source sourceSets.api + } - replace "@VERSION@", project.version - replaceIn "GuideMod.java" - replace "@API_VERSION@", "${api_version}" - replaceIn "package-info.java" - if (project.hasProperty('mappings_version')) - mappings = project.mappings_version + } + } + } + } + + processResources { - inputs.property "version", project.version - inputs.property "mcversion", project.minecraft.version + inputs.property "version", project.mod_version from(sourceSets.main.resources.srcDirs) { - include '**/*.info' - include '**/*.properties' + include 'META-INF/mods.toml' - expand 'version': project.version, 'mcversion': project.minecraft.version + expand 'version': project.mod_version, 'mcversion': minecraft_version, 'forge_version': forge_version } + from(sourceSets.main.resources.srcDirs) { - exclude '**/*.info' - exclude '**/*.properties' + exclude 'META-INF/mods.toml' } } jar { + //Keep the jar as clean as possible + includeEmptyDirs = false + + from sourceSets.main.output.classesDirs + from sourceSets.api.output.classesDirs + from sourceSets.main.output.resourcesDir + from sourceSets.api.output.resourcesDir + classifier = '' manifest.mainAttributes( "Built-By": System.getProperty('user.name'), @@ -92,7 +152,7 @@ publishing { publications { mavenJava(MavenPublication) { artifact jar - artifact sourceJar + artifact apiJar } } repositories { @@ -140,6 +200,15 @@ curseforge { changelog = getChangelogText() releaseType = 'beta' - addArtifact sourceJar + addArtifact apiJar + } +} + +idea { + module { + for (String excludeDirName in ["run", "out", "logs", "gradle"]) { + File excludeDir = new File(projectDir, excludeDirName) + excludeDirs.add(excludeDir) + } } } diff --git a/gradle.properties b/gradle.properties index 4993b1f2..cd2ce77f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,12 +1,16 @@ +org.gradle.daemon=false +org.gradle.jvmargs=-Xmx3G + mod_name=Guide-API package_group=info.amerifrance.guideapi -mc_version=1.12 -forge_version=14.21.1.2443 -mappings_version=snapshot_20170819 +minecraft_version=1.14.4 +forge_version=28.2.0 +mcp_mappings=58-1.14.4 +mcp_channel=stable mod_version=2.1.8 api_version=2.0.0 curse_id=228832 -jei_version=4.7.1.69 +jei_version=6.0.0.13 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 1e9b8635..f5095af5 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip diff --git a/src/main/java/amerifrance/guideapi/api/BookEvent.java b/src/api/java/amerifrance/guideapi/api/BookEvent.java similarity index 75% rename from src/main/java/amerifrance/guideapi/api/BookEvent.java rename to src/api/java/amerifrance/guideapi/api/BookEvent.java index afc73355..a92ad2ff 100644 --- a/src/main/java/amerifrance/guideapi/api/BookEvent.java +++ b/src/api/java/amerifrance/guideapi/api/BookEvent.java @@ -1,14 +1,14 @@ package amerifrance.guideapi.api; import amerifrance.guideapi.api.impl.Book; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.Style; -import net.minecraft.util.text.TextComponentTranslation; +import net.minecraft.util.text.TranslationTextComponent; import net.minecraft.util.text.TextFormatting; -import net.minecraftforge.fml.common.eventhandler.Cancelable; -import net.minecraftforge.fml.common.eventhandler.Event; +import net.minecraftforge.eventbus.api.Cancelable; +import net.minecraftforge.eventbus.api.Event; import javax.annotation.Nonnull; @@ -23,9 +23,9 @@ public class BookEvent extends Event { private final Book book; private final ItemStack stack; - private final EntityPlayer player; + private final PlayerEntity player; - protected BookEvent(Book book, ItemStack stack, EntityPlayer player) { + protected BookEvent(Book book, ItemStack stack, PlayerEntity player) { this.book = book; this.stack = stack; this.player = player; @@ -39,7 +39,7 @@ public ItemStack getStack() { return stack; } - public EntityPlayer getPlayer() { + public PlayerEntity getPlayer() { return player; } @@ -51,11 +51,11 @@ public EntityPlayer getPlayer() { @Cancelable public static class Open extends BookEvent { - private static final ITextComponent DEFAULT_CANCEL = new TextComponentTranslation("text.open.failed").setStyle(new Style().setColor(TextFormatting.RED)); + private static final ITextComponent DEFAULT_CANCEL = new TranslationTextComponent("text.open.failed").setStyle(new Style().setColor(TextFormatting.RED)); private ITextComponent canceledText = DEFAULT_CANCEL; - public Open(Book book, ItemStack stack, EntityPlayer player) { + public Open(Book book, ItemStack stack, PlayerEntity player) { super(book, stack, player); } diff --git a/src/main/java/amerifrance/guideapi/api/GuideAPI.java b/src/api/java/amerifrance/guideapi/api/GuideAPI.java similarity index 93% rename from src/main/java/amerifrance/guideapi/api/GuideAPI.java rename to src/api/java/amerifrance/guideapi/api/GuideAPI.java index 2022f87a..7eb5bf37 100644 --- a/src/main/java/amerifrance/guideapi/api/GuideAPI.java +++ b/src/api/java/amerifrance/guideapi/api/GuideAPI.java @@ -3,12 +3,13 @@ import amerifrance.guideapi.api.impl.Book; import com.google.common.collect.*; import net.minecraft.block.Block; -import net.minecraft.client.renderer.block.model.ModelResourceLocation; +import net.minecraft.client.renderer.model.ModelResourceLocation; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.client.model.ModelLoader; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; + import java.util.List; import java.util.Map; @@ -55,7 +56,7 @@ public static void registerInfoRenderer(Book book, IInfoRenderer infoRenderer, C * @param modelLoc - Location of the model file * @param variantName - Variant to use */ - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public static void setModel(Book book, ResourceLocation modelLoc, String variantName) { ModelResourceLocation mrl = new ModelResourceLocation(modelLoc, variantName); ModelLoader.setCustomModelResourceLocation( @@ -74,7 +75,7 @@ public static void setModel(Book book, ResourceLocation modelLoc, String variant * * @param book - Book to set model for */ - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public static void setModel(Book book) { setModel(book, new ResourceLocation("guideapi", "ItemGuideBook"), "inventory"); } diff --git a/src/main/java/amerifrance/guideapi/api/GuideBook.java b/src/api/java/amerifrance/guideapi/api/GuideBook.java similarity index 86% rename from src/main/java/amerifrance/guideapi/api/GuideBook.java rename to src/api/java/amerifrance/guideapi/api/GuideBook.java index a2a12c29..97890413 100644 --- a/src/main/java/amerifrance/guideapi/api/GuideBook.java +++ b/src/api/java/amerifrance/guideapi/api/GuideBook.java @@ -1,6 +1,7 @@ package amerifrance.guideapi.api; -import net.minecraftforge.fml.common.eventhandler.EventPriority; + +import net.minecraftforge.eventbus.api.EventPriority; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/amerifrance/guideapi/api/IGuideBook.java b/src/api/java/amerifrance/guideapi/api/IGuideBook.java similarity index 91% rename from src/main/java/amerifrance/guideapi/api/IGuideBook.java rename to src/api/java/amerifrance/guideapi/api/IGuideBook.java index 21c6da38..d4b8e11d 100644 --- a/src/main/java/amerifrance/guideapi/api/IGuideBook.java +++ b/src/api/java/amerifrance/guideapi/api/IGuideBook.java @@ -3,9 +3,8 @@ import amerifrance.guideapi.api.impl.Book; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; -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; import javax.annotation.Nullable; @@ -25,7 +24,7 @@ public interface IGuideBook { * * @param bookStack - The ItemStack assigned to your book. */ - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) default void handleModel(@Nonnull ItemStack bookStack) { GuideAPI.setModel(((IGuideItem) bookStack.getItem()).getBook(bookStack)); } diff --git a/src/main/java/amerifrance/guideapi/api/IGuideItem.java b/src/api/java/amerifrance/guideapi/api/IGuideItem.java similarity index 100% rename from src/main/java/amerifrance/guideapi/api/IGuideItem.java rename to src/api/java/amerifrance/guideapi/api/IGuideItem.java diff --git a/src/main/java/amerifrance/guideapi/api/IGuideLinked.java b/src/api/java/amerifrance/guideapi/api/IGuideLinked.java similarity index 79% rename from src/main/java/amerifrance/guideapi/api/IGuideLinked.java rename to src/api/java/amerifrance/guideapi/api/IGuideLinked.java index 3d94d0a4..f1a3a772 100644 --- a/src/main/java/amerifrance/guideapi/api/IGuideLinked.java +++ b/src/api/java/amerifrance/guideapi/api/IGuideLinked.java @@ -1,6 +1,6 @@ package amerifrance.guideapi.api; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; @@ -18,5 +18,5 @@ public interface IGuideLinked { * @return the key of the entry to open or null if no entry should be opened */ @Nullable - ResourceLocation getLinkedEntry(World world, BlockPos pos, EntityPlayer player, ItemStack stack); + ResourceLocation getLinkedEntry(World world, BlockPos pos, PlayerEntity player, ItemStack stack); } diff --git a/src/main/java/amerifrance/guideapi/api/IInfoRenderer.java b/src/api/java/amerifrance/guideapi/api/IInfoRenderer.java similarity index 87% rename from src/main/java/amerifrance/guideapi/api/IInfoRenderer.java rename to src/api/java/amerifrance/guideapi/api/IInfoRenderer.java index 401ad6ed..55af3ab8 100644 --- a/src/main/java/amerifrance/guideapi/api/IInfoRenderer.java +++ b/src/api/java/amerifrance/guideapi/api/IInfoRenderer.java @@ -1,8 +1,8 @@ package amerifrance.guideapi.api; import amerifrance.guideapi.api.impl.Book; -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.block.BlockState; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; @@ -33,7 +33,7 @@ public interface IInfoRenderer { * @param rayTrace - A RayTraceResult containing data about the block currently looked at * @param player - The player looking at the block */ - void drawInformation(Book book, World world, BlockPos pos, IBlockState state, RayTraceResult rayTrace, EntityPlayer player); + void drawInformation(Book book, World world, BlockPos pos, BlockState state, RayTraceResult rayTrace, PlayerEntity player); interface Block { @@ -49,7 +49,7 @@ interface Block { * @return an IInfoRenderer for this block. If no IInfoRenderer is needed, return null. */ @Nullable - IInfoRenderer getInfoRenderer(Book book, World world, BlockPos pos, IBlockState state, RayTraceResult rayTrace, EntityPlayer player); + IInfoRenderer getInfoRenderer(Book book, World world, BlockPos pos, BlockState state, RayTraceResult rayTrace, PlayerEntity player); /** * @return returns the book required to display information. diff --git a/src/main/java/amerifrance/guideapi/api/IPage.java b/src/api/java/amerifrance/guideapi/api/IPage.java similarity index 61% rename from src/main/java/amerifrance/guideapi/api/IPage.java rename to src/api/java/amerifrance/guideapi/api/IPage.java index 317433d9..f94d669d 100644 --- a/src/main/java/amerifrance/guideapi/api/IPage.java +++ b/src/api/java/amerifrance/guideapi/api/IPage.java @@ -3,30 +3,28 @@ import amerifrance.guideapi.api.impl.Book; import amerifrance.guideapi.api.impl.abstraction.CategoryAbstract; import amerifrance.guideapi.api.impl.abstraction.EntryAbstract; -import amerifrance.guideapi.gui.GuiBase; -import amerifrance.guideapi.gui.GuiEntry; import net.minecraft.client.gui.FontRenderer; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; 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; public interface IPage { - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) void draw(Book book, CategoryAbstract category, EntryAbstract entry, int guiLeft, int guiTop, int mouseX, int mouseY, GuiBase guiBase, FontRenderer fontRendererObj); - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) void drawExtras(Book book, CategoryAbstract category, EntryAbstract entry, int guiLeft, int guiTop, int mouseX, int mouseY, GuiBase guiBase, FontRenderer fontRendererObj); - boolean canSee(Book book, CategoryAbstract category, EntryAbstract entry, EntityPlayer player, ItemStack bookStack, GuiEntry guiEntry); + boolean canSee(Book book, CategoryAbstract category, EntryAbstract entry, PlayerEntity player, ItemStack bookStack, GuiEntry guiEntry); - @SideOnly(Side.CLIENT) - void onLeftClicked(Book book, CategoryAbstract category, EntryAbstract entry, int mouseX, int mouseY, EntityPlayer player, GuiEntry guiEntry); + @OnlyIn(Dist.CLIENT) + void onLeftClicked(Book book, CategoryAbstract category, EntryAbstract entry, int mouseX, int mouseY, PlayerEntity player, GuiEntry guiEntry); - @SideOnly(Side.CLIENT) - void onRightClicked(Book book, CategoryAbstract category, EntryAbstract entry, int mouseX, int mouseY, EntityPlayer player, GuiEntry guiEntry); + @OnlyIn(Dist.CLIENT) + void onRightClicked(Book book, CategoryAbstract category, EntryAbstract entry, int mouseX, int mouseY, PlayerEntity player, GuiEntry guiEntry); - @SideOnly(Side.CLIENT) - void onInit(Book book, CategoryAbstract category, EntryAbstract entry, EntityPlayer player, ItemStack bookStack, GuiEntry guiEntry); + @OnlyIn(Dist.CLIENT) + void onInit(Book book, CategoryAbstract category, EntryAbstract entry, PlayerEntity player, ItemStack bookStack, GuiEntry guiEntry); } diff --git a/src/main/java/amerifrance/guideapi/api/IRecipeRenderer.java b/src/api/java/amerifrance/guideapi/api/IRecipeRenderer.java similarity index 87% rename from src/main/java/amerifrance/guideapi/api/IRecipeRenderer.java rename to src/api/java/amerifrance/guideapi/api/IRecipeRenderer.java index 786bd66e..075ea8e1 100644 --- a/src/main/java/amerifrance/guideapi/api/IRecipeRenderer.java +++ b/src/api/java/amerifrance/guideapi/api/IRecipeRenderer.java @@ -3,21 +3,20 @@ import amerifrance.guideapi.api.impl.Book; import amerifrance.guideapi.api.impl.abstraction.CategoryAbstract; import amerifrance.guideapi.api.impl.abstraction.EntryAbstract; -import amerifrance.guideapi.gui.GuiBase; import com.google.common.collect.Lists; import net.minecraft.client.gui.FontRenderer; import net.minecraft.item.crafting.IRecipe; -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.List; public interface IRecipeRenderer { - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) void draw(Book book, CategoryAbstract category, EntryAbstract entry, int guiLeft, int guiTop, int mouseX, int mouseY, GuiBase guiBase, FontRenderer fontRendererObj); - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) void drawExtras(Book book, CategoryAbstract category, EntryAbstract entry, int guiLeft, int guiTop, int mouseX, int mouseY, GuiBase guiBase, FontRenderer fontRendererObj); abstract class RecipeRendererBase implements IRecipeRenderer { diff --git a/src/main/java/amerifrance/guideapi/api/SubTexture.java b/src/api/java/amerifrance/guideapi/api/SubTexture.java similarity index 93% rename from src/main/java/amerifrance/guideapi/api/SubTexture.java rename to src/api/java/amerifrance/guideapi/api/SubTexture.java index e40d2451..00ed6393 100644 --- a/src/main/java/amerifrance/guideapi/api/SubTexture.java +++ b/src/api/java/amerifrance/guideapi/api/SubTexture.java @@ -1,11 +1,14 @@ package amerifrance.guideapi.api; +import com.mojang.blaze3d.platform.GlStateManager; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.util.ResourceLocation; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -55,12 +58,12 @@ public SubTexture(ResourceLocation textureLocation, int xPos, int yPos, int widt this.height = height; } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public void draw(int drawX, int drawY, double zLevel) { final float someMagicValueFromMojang = 0.00390625F; - Minecraft.getMinecraft().renderEngine.bindTexture(textureLocation); - GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); + Minecraft.getInstance().renderEngine.bindTexture(textureLocation); + GlStateManager.color4f(1.0F, 1.0F, 1.0F, 1.0F); Tessellator tessellator = Tessellator.getInstance(); BufferBuilder vertexbuffer = tessellator.getBuffer(); vertexbuffer.begin(7, DefaultVertexFormats.POSITION_TEX); @@ -71,7 +74,7 @@ public void draw(int drawX, int drawY, double zLevel) { tessellator.draw(); } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public void draw(int drawX, int drawY) { draw(drawX, drawY, 0.1D); } diff --git a/src/main/java/amerifrance/guideapi/api/button/ButtonGuideAPI.java b/src/api/java/amerifrance/guideapi/api/button/ButtonGuideAPI.java similarity index 71% rename from src/main/java/amerifrance/guideapi/api/button/ButtonGuideAPI.java rename to src/api/java/amerifrance/guideapi/api/button/ButtonGuideAPI.java index bf00f201..c17caddb 100644 --- a/src/main/java/amerifrance/guideapi/api/button/ButtonGuideAPI.java +++ b/src/api/java/amerifrance/guideapi/api/button/ButtonGuideAPI.java @@ -1,9 +1,9 @@ package amerifrance.guideapi.api.button; import amerifrance.guideapi.gui.GuiBase; -import net.minecraft.client.gui.GuiButton; +import net.minecraft.client.gui.widget.button.Button; -public class ButtonGuideAPI extends GuiButton { +public class ButtonGuideAPI extends Button { public GuiBase guiBase; diff --git a/src/main/java/amerifrance/guideapi/api/impl/Book.java b/src/api/java/amerifrance/guideapi/api/impl/Book.java similarity index 100% rename from src/main/java/amerifrance/guideapi/api/impl/Book.java rename to src/api/java/amerifrance/guideapi/api/impl/Book.java diff --git a/src/main/java/amerifrance/guideapi/api/impl/BookBinder.java b/src/api/java/amerifrance/guideapi/api/impl/BookBinder.java similarity index 100% rename from src/main/java/amerifrance/guideapi/api/impl/BookBinder.java rename to src/api/java/amerifrance/guideapi/api/impl/BookBinder.java diff --git a/src/main/java/amerifrance/guideapi/api/impl/Category.java b/src/api/java/amerifrance/guideapi/api/impl/Category.java similarity index 86% rename from src/main/java/amerifrance/guideapi/api/impl/Category.java rename to src/api/java/amerifrance/guideapi/api/impl/Category.java index 9544594e..14805991 100644 --- a/src/main/java/amerifrance/guideapi/api/impl/Category.java +++ b/src/api/java/amerifrance/guideapi/api/impl/Category.java @@ -7,7 +7,7 @@ import amerifrance.guideapi.gui.GuiHome; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.RenderItem; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; @@ -36,23 +36,23 @@ public void drawExtras(Book book, int categoryX, int categoryY, int categoryWidt } @Override - public boolean canSee(EntityPlayer player, ItemStack bookStack) { + public boolean canSee(PlayerEntity player, ItemStack bookStack) { return true; } @Override @SideOnly(Side.CLIENT) - public void onLeftClicked(Book book, int mouseX, int mouseY, EntityPlayer player, ItemStack bookStack) { + public void onLeftClicked(Book book, int mouseX, int mouseY, PlayerEntity player, ItemStack bookStack) { Minecraft.getMinecraft().displayGuiScreen(new GuiCategory(book, this, player, bookStack, null)); } @Override @SideOnly(Side.CLIENT) - public void onRightClicked(Book book, int mouseX, int mouseY, EntityPlayer player, ItemStack bookStack) { + public void onRightClicked(Book book, int mouseX, int mouseY, PlayerEntity player, ItemStack bookStack) { } @Override @SideOnly(Side.CLIENT) - public void onInit(Book book, GuiHome guiHome, EntityPlayer player, ItemStack bookStack) { + public void onInit(Book book, GuiHome guiHome, PlayerEntity player, ItemStack bookStack) { } } diff --git a/src/main/java/amerifrance/guideapi/api/impl/Entry.java b/src/api/java/amerifrance/guideapi/api/impl/Entry.java similarity index 92% rename from src/main/java/amerifrance/guideapi/api/impl/Entry.java rename to src/api/java/amerifrance/guideapi/api/impl/Entry.java index 0cdc6ed0..558b774b 100644 --- a/src/main/java/amerifrance/guideapi/api/impl/Entry.java +++ b/src/api/java/amerifrance/guideapi/api/impl/Entry.java @@ -9,7 +9,7 @@ import amerifrance.guideapi.gui.GuiEntry; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -87,23 +87,23 @@ public void drawExtras(Book book, CategoryAbstract category, int entryX, int ent } @Override - public boolean canSee(EntityPlayer player, ItemStack bookStack) { + public boolean canSee(PlayerEntity player, ItemStack bookStack) { return true; } @Override @SideOnly(Side.CLIENT) - public void onLeftClicked(Book book, CategoryAbstract category, int mouseX, int mouseY, EntityPlayer player, GuiCategory guiCategory) { + public void onLeftClicked(Book book, CategoryAbstract category, int mouseX, int mouseY, PlayerEntity player, GuiCategory guiCategory) { Minecraft.getMinecraft().displayGuiScreen(new GuiEntry(book, category, this, player, guiCategory.bookStack)); } @Override @SideOnly(Side.CLIENT) - public void onRightClicked(Book book, CategoryAbstract category, int mouseX, int mouseY, EntityPlayer player, GuiCategory guiCategory) { + public void onRightClicked(Book book, CategoryAbstract category, int mouseX, int mouseY, PlayerEntity player, GuiCategory guiCategory) { } @Override @SideOnly(Side.CLIENT) - public void onInit(Book book, CategoryAbstract category, GuiCategory guiCategory, EntityPlayer player, ItemStack bookStack) { + public void onInit(Book book, CategoryAbstract category, GuiCategory guiCategory, PlayerEntity player, ItemStack bookStack) { } } \ No newline at end of file diff --git a/src/main/java/amerifrance/guideapi/api/impl/Page.java b/src/api/java/amerifrance/guideapi/api/impl/Page.java similarity index 85% rename from src/main/java/amerifrance/guideapi/api/impl/Page.java rename to src/api/java/amerifrance/guideapi/api/impl/Page.java index 86b4ffdb..34a58251 100644 --- a/src/main/java/amerifrance/guideapi/api/impl/Page.java +++ b/src/api/java/amerifrance/guideapi/api/impl/Page.java @@ -6,7 +6,7 @@ import amerifrance.guideapi.gui.GuiBase; import amerifrance.guideapi.gui.GuiEntry; import net.minecraft.client.gui.FontRenderer; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -26,23 +26,23 @@ public void drawExtras(Book book, CategoryAbstract category, EntryAbstract entry } @Override - public boolean canSee(Book book, CategoryAbstract category, EntryAbstract entry, EntityPlayer player, ItemStack bookStack, GuiEntry guiEntry) { + public boolean canSee(Book book, CategoryAbstract category, EntryAbstract entry, PlayerEntity player, ItemStack bookStack, GuiEntry guiEntry) { return true; } @Override @SideOnly(Side.CLIENT) - public void onLeftClicked(Book book, CategoryAbstract category, EntryAbstract entry, int mouseX, int mouseY, EntityPlayer player, GuiEntry guiEntry) { + public void onLeftClicked(Book book, CategoryAbstract category, EntryAbstract entry, int mouseX, int mouseY, PlayerEntity player, GuiEntry guiEntry) { } @Override @SideOnly(Side.CLIENT) - public void onRightClicked(Book book, CategoryAbstract category, EntryAbstract entry, int mouseX, int mouseY, EntityPlayer player, GuiEntry guiEntry) { + public void onRightClicked(Book book, CategoryAbstract category, EntryAbstract entry, int mouseX, int mouseY, PlayerEntity player, GuiEntry guiEntry) { } @Override @SideOnly(Side.CLIENT) - public void onInit(Book book, CategoryAbstract category, EntryAbstract entry, EntityPlayer player, ItemStack bookStack, GuiEntry guiEntry) { + public void onInit(Book book, CategoryAbstract category, EntryAbstract entry, PlayerEntity player, ItemStack bookStack, GuiEntry guiEntry) { } public void setUnicodeFlag(boolean flag) { diff --git a/src/main/java/amerifrance/guideapi/api/impl/abstraction/CategoryAbstract.java b/src/api/java/amerifrance/guideapi/api/impl/abstraction/CategoryAbstract.java similarity index 94% rename from src/main/java/amerifrance/guideapi/api/impl/abstraction/CategoryAbstract.java rename to src/api/java/amerifrance/guideapi/api/impl/abstraction/CategoryAbstract.java index 460774ba..c9577c4f 100644 --- a/src/main/java/amerifrance/guideapi/api/impl/abstraction/CategoryAbstract.java +++ b/src/api/java/amerifrance/guideapi/api/impl/abstraction/CategoryAbstract.java @@ -8,7 +8,7 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import net.minecraft.client.renderer.RenderItem; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; @@ -139,16 +139,16 @@ public List getTooltip() { @SideOnly(Side.CLIENT) public abstract void drawExtras(Book book, int categoryX, int categoryY, int categoryWidth, int categoryHeight, int mouseX, int mouseY, GuiBase guiBase, boolean drawOnLeft, RenderItem renderItem); - public abstract boolean canSee(EntityPlayer player, ItemStack bookStack); + public abstract boolean canSee(PlayerEntity player, ItemStack bookStack); @SideOnly(Side.CLIENT) - public abstract void onLeftClicked(Book book, int mouseX, int mouseY, EntityPlayer player, ItemStack bookStack); + public abstract void onLeftClicked(Book book, int mouseX, int mouseY, PlayerEntity player, ItemStack bookStack); @SideOnly(Side.CLIENT) - public abstract void onRightClicked(Book book, int mouseX, int mouseY, EntityPlayer player, ItemStack bookStack); + public abstract void onRightClicked(Book book, int mouseX, int mouseY, PlayerEntity player, ItemStack bookStack); @SideOnly(Side.CLIENT) - public abstract void onInit(Book book, GuiHome guiHome, EntityPlayer player, ItemStack bookStack); + public abstract void onInit(Book book, GuiHome guiHome, PlayerEntity player, ItemStack bookStack); @Override public boolean equals(Object o) { diff --git a/src/main/java/amerifrance/guideapi/api/impl/abstraction/EntryAbstract.java b/src/api/java/amerifrance/guideapi/api/impl/abstraction/EntryAbstract.java similarity index 90% rename from src/main/java/amerifrance/guideapi/api/impl/abstraction/EntryAbstract.java rename to src/api/java/amerifrance/guideapi/api/impl/abstraction/EntryAbstract.java index c2a0827e..122bf408 100644 --- a/src/main/java/amerifrance/guideapi/api/impl/abstraction/EntryAbstract.java +++ b/src/api/java/amerifrance/guideapi/api/impl/abstraction/EntryAbstract.java @@ -7,7 +7,7 @@ import amerifrance.guideapi.gui.GuiCategory; import com.google.common.collect.Lists; import net.minecraft.client.gui.FontRenderer; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -64,16 +64,16 @@ public String getLocalizedName() { @SideOnly(Side.CLIENT) public abstract void drawExtras(Book book, CategoryAbstract category, int entryX, int entryY, int entryWidth, int entryHeight, int mouseX, int mouseY, GuiBase guiBase, FontRenderer renderer); - public abstract boolean canSee(EntityPlayer player, ItemStack bookStack); + public abstract boolean canSee(PlayerEntity player, ItemStack bookStack); @SideOnly(Side.CLIENT) - public abstract void onLeftClicked(Book book, CategoryAbstract category, int mouseX, int mouseY, EntityPlayer player, GuiCategory guiCategory); + public abstract void onLeftClicked(Book book, CategoryAbstract category, int mouseX, int mouseY, PlayerEntity player, GuiCategory guiCategory); @SideOnly(Side.CLIENT) - public abstract void onRightClicked(Book book, CategoryAbstract category, int mouseX, int mouseY, EntityPlayer player, GuiCategory guiCategory); + public abstract void onRightClicked(Book book, CategoryAbstract category, int mouseX, int mouseY, PlayerEntity player, GuiCategory guiCategory); @SideOnly(Side.CLIENT) - public abstract void onInit(Book book, CategoryAbstract category, GuiCategory guiCategory, EntityPlayer player, ItemStack bookStack); + public abstract void onInit(Book book, CategoryAbstract category, GuiCategory guiCategory, PlayerEntity player, ItemStack bookStack); @Override public boolean equals(Object o) { diff --git a/src/main/java/amerifrance/guideapi/api/package-info.java b/src/api/java/amerifrance/guideapi/api/package-info.java similarity index 100% rename from src/main/java/amerifrance/guideapi/api/package-info.java rename to src/api/java/amerifrance/guideapi/api/package-info.java diff --git a/src/main/java/amerifrance/guideapi/api/util/BookHelper.java b/src/api/java/amerifrance/guideapi/api/util/BookHelper.java similarity index 100% rename from src/main/java/amerifrance/guideapi/api/util/BookHelper.java rename to src/api/java/amerifrance/guideapi/api/util/BookHelper.java diff --git a/src/main/java/amerifrance/guideapi/api/util/GuiHelper.java b/src/api/java/amerifrance/guideapi/api/util/GuiHelper.java similarity index 100% rename from src/main/java/amerifrance/guideapi/api/util/GuiHelper.java rename to src/api/java/amerifrance/guideapi/api/util/GuiHelper.java diff --git a/src/main/java/amerifrance/guideapi/api/util/NBTBookTags.java b/src/api/java/amerifrance/guideapi/api/util/NBTBookTags.java similarity index 100% rename from src/main/java/amerifrance/guideapi/api/util/NBTBookTags.java rename to src/api/java/amerifrance/guideapi/api/util/NBTBookTags.java diff --git a/src/main/java/amerifrance/guideapi/api/util/PageHelper.java b/src/api/java/amerifrance/guideapi/api/util/PageHelper.java similarity index 100% rename from src/main/java/amerifrance/guideapi/api/util/PageHelper.java rename to src/api/java/amerifrance/guideapi/api/util/PageHelper.java diff --git a/src/main/java/amerifrance/guideapi/api/util/TextHelper.java b/src/api/java/amerifrance/guideapi/api/util/TextHelper.java similarity index 96% rename from src/main/java/amerifrance/guideapi/api/util/TextHelper.java rename to src/api/java/amerifrance/guideapi/api/util/TextHelper.java index 2f225549..01148018 100644 --- a/src/main/java/amerifrance/guideapi/api/util/TextHelper.java +++ b/src/api/java/amerifrance/guideapi/api/util/TextHelper.java @@ -13,7 +13,7 @@ public static String getFormattedText(String string) { } public static String localize(String input, Object... format) { - return I18n.translateToLocalFormatted(input, format); + return Il8n.translateToLocalFormatted(input, format); } public static String localizeEffect(String input, Object... format) { diff --git a/src/main/java/amerifrance/guideapi/gui/GuiBase.java b/src/main/java/amerifrance/guideapi/gui/GuiBase.java index d490b74b..f35c597c 100644 --- a/src/main/java/amerifrance/guideapi/gui/GuiBase.java +++ b/src/main/java/amerifrance/guideapi/gui/GuiBase.java @@ -1,11 +1,11 @@ package amerifrance.guideapi.gui; import net.minecraft.client.gui.FontRenderer; -import net.minecraft.client.gui.GuiScreen; +import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; @@ -15,16 +15,16 @@ import static net.minecraft.client.renderer.GlStateManager.*; -public class GuiBase extends GuiScreen { +public class GuiBase extends Screen { public int guiLeft, guiTop; public int xSize = 192; public int ySize = 192; - public EntityPlayer player; + public PlayerEntity player; public ItemStack bookStack; public float publicZLevel; - public GuiBase(EntityPlayer player, ItemStack bookStack) { + public GuiBase(PlayerEntity player, ItemStack bookStack) { this.player = player; this.bookStack = bookStack; this.publicZLevel = zLevel; diff --git a/src/main/java/amerifrance/guideapi/gui/GuiCategory.java b/src/main/java/amerifrance/guideapi/gui/GuiCategory.java index 7c73586c..0432cab4 100644 --- a/src/main/java/amerifrance/guideapi/gui/GuiCategory.java +++ b/src/main/java/amerifrance/guideapi/gui/GuiCategory.java @@ -13,8 +13,8 @@ import com.google.common.collect.HashMultimap; import com.google.common.collect.Lists; import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.GuiButton; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.client.gui.widget.button.Button; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.MathHelper; @@ -41,7 +41,7 @@ public class GuiCategory extends GuiBase { public int entryPage; @Nullable public EntryAbstract startEntry; - public GuiCategory(Book book, CategoryAbstract category, EntityPlayer player, ItemStack bookStack, @Nullable EntryAbstract startEntry) { + public GuiCategory(Book book, CategoryAbstract category, PlayerEntity player, ItemStack bookStack, @Nullable EntryAbstract startEntry) { super(player, bookStack); this.book = book; this.category = category; @@ -155,7 +155,7 @@ public void keyTyped(char typedChar, int keyCode) { } @Override - public void actionPerformed(GuiButton button) { + public void actionPerformed(Button button) { if (button.id == 0) this.mc.displayGuiScreen(new GuiHome(book, player, bookStack)); else if (button.id == 1 && entryPage + 1 < entryWrapperMap.asMap().size()) diff --git a/src/main/java/amerifrance/guideapi/gui/GuiEntry.java b/src/main/java/amerifrance/guideapi/gui/GuiEntry.java index 886204f6..02dc5b9f 100644 --- a/src/main/java/amerifrance/guideapi/gui/GuiEntry.java +++ b/src/main/java/amerifrance/guideapi/gui/GuiEntry.java @@ -12,8 +12,8 @@ import amerifrance.guideapi.network.PacketSyncEntry; import amerifrance.guideapi.wrapper.PageWrapper; import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.GuiButton; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.client.gui.widget.button.Button; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.MathHelper; @@ -40,7 +40,7 @@ public class GuiEntry extends GuiBase { public ButtonSearch buttonSearch; public int pageNumber; - public GuiEntry(Book book, CategoryAbstract category, EntryAbstract entry, EntityPlayer player, ItemStack bookStack) { + public GuiEntry(Book book, CategoryAbstract category, EntryAbstract entry, PlayerEntity player, ItemStack bookStack) { super(player, bookStack); this.book = book; this.category = category; @@ -138,7 +138,7 @@ public void keyTyped(char typedChar, int keyCode) { } @Override - public void actionPerformed(GuiButton button) { + public void actionPerformed(Button button) { if (button.id == 0) this.mc.displayGuiScreen(new GuiCategory(book, category, player, bookStack, entry)); else if (button.id == 1 && pageNumber + 1 < pageWrapperList.size()) diff --git a/src/main/java/amerifrance/guideapi/gui/GuiHome.java b/src/main/java/amerifrance/guideapi/gui/GuiHome.java index 7de64895..e2bb436e 100644 --- a/src/main/java/amerifrance/guideapi/gui/GuiHome.java +++ b/src/main/java/amerifrance/guideapi/gui/GuiHome.java @@ -10,9 +10,9 @@ import amerifrance.guideapi.wrapper.CategoryWrapper; import com.google.common.collect.HashMultimap; import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.GuiButton; +import net.minecraft.client.gui.widget.button.Button; import net.minecraft.client.resources.I18n; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.MathHelper; @@ -33,7 +33,7 @@ public class GuiHome extends GuiBase { public ButtonSearch buttonSearch; public int categoryPage; - public GuiHome(Book book, EntityPlayer player, ItemStack bookStack) { + public GuiHome(Book book, PlayerEntity player, ItemStack bookStack) { super(player, bookStack); this.book = book; this.pageTexture = book.getPageTexture(); @@ -126,7 +126,7 @@ public void drawScreen(int mouseX, int mouseY, float renderPartialTicks) { buttonPrev.visible = categoryPage != 0; buttonNext.visible = categoryPage != categoryWrapperMap.asMap().size() - 1 && !categoryWrapperMap.asMap().isEmpty(); - for (GuiButton button : this.buttonList) + for (Button button : this.buttonList) button.drawButton(this.mc, mouseX, mouseY, renderPartialTicks); } @@ -167,7 +167,7 @@ public void keyTyped(char typedChar, int keyCode) { } @Override - public void actionPerformed(GuiButton button) { + public void actionPerformed(Button button) { if (button.id == 0 && categoryPage + 1 < categoryWrapperMap.asMap().size()) nextPage(); else if (button.id == 1 && categoryPage > 0) diff --git a/src/main/java/amerifrance/guideapi/gui/GuiSearch.java b/src/main/java/amerifrance/guideapi/gui/GuiSearch.java index 6e578e1a..caad061a 100644 --- a/src/main/java/amerifrance/guideapi/gui/GuiSearch.java +++ b/src/main/java/amerifrance/guideapi/gui/GuiSearch.java @@ -10,10 +10,10 @@ import amerifrance.guideapi.button.ButtonPrev; import com.google.common.base.Strings; import com.google.common.collect.Lists; -import net.minecraft.client.gui.GuiButton; -import net.minecraft.client.gui.GuiScreen; -import net.minecraft.client.gui.GuiTextField; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.client.gui.widget.button.Button; +import net.minecraft.client.gui.screen.Screen; +import net.minecraft.client.gui.widget.TextFieldWidget; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.client.config.GuiUtils; @@ -35,13 +35,13 @@ public class GuiSearch extends GuiBase { private ResourceLocation pageTexture; private ButtonNext buttonNext; private ButtonPrev buttonPrev; - private GuiTextField searchField; - private GuiScreen parent; + private TextFieldWidget searchField; + private Screen parent; private List>> searchResults; private int currentPage = 0; private String lastQuery = ""; - public GuiSearch(Book book, EntityPlayer player, ItemStack bookStack, GuiScreen parent) { + public GuiSearch(Book book, PlayerEntity player, ItemStack bookStack, Screen parent) { super(player, bookStack); this.book = book; @@ -62,7 +62,7 @@ public void initGui() { addButton(buttonNext = new ButtonNext(1, guiLeft + 4 * xSize / 6, guiTop + 5 * ySize / 6, this)); addButton(buttonPrev = new ButtonPrev(2, guiLeft + xSize / 5, guiTop + 5 * ySize / 6, this)); - searchField = new GuiTextField(3, fontRenderer, guiLeft + 43, guiTop + 12, 100, 10); + searchField = new TextFieldWidget(3, fontRenderer, guiLeft + 43, guiTop + 12, 100, 10); searchField.setEnableBackgroundDrawing(false); searchField.setFocused(true); searchResults = getMatches(book, null, player, bookStack); @@ -154,7 +154,7 @@ public void keyTyped(char typedChar, int keyCode) { } @Override - public void actionPerformed(GuiButton button) { + public void actionPerformed(Button button) { switch (button.id) { case 0: { mc.displayGuiScreen(parent); @@ -174,7 +174,7 @@ public void actionPerformed(GuiButton button) { } @Nonnull - static List>> getMatches(Book book, @Nullable String query, EntityPlayer player, ItemStack bookStack) { + static List>> getMatches(Book book, @Nullable String query, PlayerEntity player, ItemStack bookStack) { List> discovered = Lists.newArrayList(); for (CategoryAbstract category : book.getCategoryList()) { diff --git a/src/main/java/amerifrance/guideapi/info/InfoRendererDescription.java b/src/main/java/amerifrance/guideapi/info/InfoRendererDescription.java index dd99c8db..8c9e840c 100644 --- a/src/main/java/amerifrance/guideapi/info/InfoRendererDescription.java +++ b/src/main/java/amerifrance/guideapi/info/InfoRendererDescription.java @@ -3,12 +3,12 @@ import amerifrance.guideapi.api.IInfoRenderer; import amerifrance.guideapi.api.impl.Book; import amerifrance.guideapi.api.util.GuiHelper; -import net.minecraft.block.state.IBlockState; +import net.minecraft.block.BlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; @@ -32,7 +32,7 @@ public InfoRendererDescription(ItemStack stack, ITextComponent description) { } @Override - public void drawInformation(Book book, World world, BlockPos pos, IBlockState state, RayTraceResult rayTrace, EntityPlayer player) { + public void drawInformation(Book book, World world, BlockPos pos, BlockState state, RayTraceResult rayTrace, PlayerEntity player) { if (tiny) { GlStateManager.pushMatrix(); GlStateManager.scale(0.5F, 0.5F, 0.5F); diff --git a/src/main/java/amerifrance/guideapi/info/InfoRendererImage.java b/src/main/java/amerifrance/guideapi/info/InfoRendererImage.java index 23565b2c..7ec2ee4e 100644 --- a/src/main/java/amerifrance/guideapi/info/InfoRendererImage.java +++ b/src/main/java/amerifrance/guideapi/info/InfoRendererImage.java @@ -2,11 +2,11 @@ import amerifrance.guideapi.api.IInfoRenderer; import amerifrance.guideapi.api.impl.Book; -import net.minecraft.block.state.IBlockState; +import net.minecraft.block.BlockState; import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.Gui; +import net.minecraft.client.gui.AbstractGui; import net.minecraft.client.gui.ScaledResolution; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; @@ -29,9 +29,9 @@ public InfoRendererImage(ResourceLocation image, int imageX, int imageY, int ima } @Override - public void drawInformation(Book book, World world, BlockPos pos, IBlockState state, RayTraceResult rayTrace, EntityPlayer player) { + public void drawInformation(Book book, World world, BlockPos pos, BlockState state, RayTraceResult rayTrace, PlayerEntity player) { ScaledResolution resolution = new ScaledResolution(Minecraft.getMinecraft()); Minecraft.getMinecraft().renderEngine.bindTexture(image); - Gui.drawModalRectWithCustomSizedTexture(resolution.getScaledWidth() / 2 + 20, resolution.getScaledHeight() / 2 - imageHeight / 2, imageX, imageY, imageWidth, imageHeight, imageWidth, imageHeight); + AbstractGui.drawModalRectWithCustomSizedTexture(resolution.getScaledWidth() / 2 + 20, resolution.getScaledHeight() / 2 - imageHeight / 2, imageX, imageY, imageWidth, imageHeight, imageWidth, imageHeight); } } diff --git a/src/main/java/amerifrance/guideapi/item/ItemGuideBook.java b/src/main/java/amerifrance/guideapi/item/ItemGuideBook.java index 7bf6bf63..53a51caf 100644 --- a/src/main/java/amerifrance/guideapi/item/ItemGuideBook.java +++ b/src/main/java/amerifrance/guideapi/item/ItemGuideBook.java @@ -9,10 +9,10 @@ import amerifrance.guideapi.api.impl.abstraction.CategoryAbstract; import amerifrance.guideapi.api.util.TextHelper; import com.google.common.base.Strings; -import net.minecraft.block.state.IBlockState; +import net.minecraft.block.BlockState; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.client.util.ITooltipFlag.TooltipFlags; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.*; @@ -39,42 +39,42 @@ public ItemGuideBook(@Nonnull Book book) { } @Override - public ActionResult onItemRightClick(World world, EntityPlayer player, EnumHand hand) { + public ActionResult onItemRightClick(World world, PlayerEntity player, Hand hand) { ItemStack heldStack = player.getHeldItem(hand); BookEvent.Open event = new BookEvent.Open(book, heldStack, player); if (MinecraftForge.EVENT_BUS.post(event)) { player.sendStatusMessage(event.getCanceledText(), true); - return ActionResult.newResult(EnumActionResult.FAIL, heldStack); + return ActionResult.newResult(ActionResultType.FAIL, heldStack); } player.openGui(GuideMod.INSTANCE, GuideAPI.getIndexedBooks().indexOf(book), world, hand.ordinal(), 0, 0); - return ActionResult.newResult(EnumActionResult.SUCCESS, heldStack); + return ActionResult.newResult(ActionResultType.SUCCESS, heldStack); } @Override - public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) { + public ActionResultType onItemUse(PlayerEntity player, World world, BlockPos pos, Hand hand, Direction facing, float hitX, float hitY, float hitZ) { if (!world.isRemote || !player.isSneaking()) - return EnumActionResult.PASS; + return ActionResultType.PASS; ItemStack stack = player.getHeldItem(hand); - IBlockState state = world.getBlockState(pos); + BlockState state = world.getBlockState(pos); if (state.getBlock() instanceof IGuideLinked) { IGuideLinked guideLinked = (IGuideLinked) state.getBlock(); ResourceLocation entryKey = guideLinked.getLinkedEntry(world, pos, player, stack); if (entryKey == null) - return EnumActionResult.FAIL; + return ActionResultType.FAIL; for (CategoryAbstract category : book.getCategoryList()) { if (category.entries.containsKey(entryKey)) { GuideMod.PROXY.openEntry(book, category, category.entries.get(entryKey), player, stack); - return EnumActionResult.SUCCESS; + return ActionResultType.SUCCESS; } } } - return EnumActionResult.PASS; + return ActionResultType.PASS; } @Override diff --git a/src/main/java/amerifrance/guideapi/network/PacketSyncCategory.java b/src/main/java/amerifrance/guideapi/network/PacketSyncCategory.java index c1593e52..79607ec8 100644 --- a/src/main/java/amerifrance/guideapi/network/PacketSyncCategory.java +++ b/src/main/java/amerifrance/guideapi/network/PacketSyncCategory.java @@ -4,7 +4,7 @@ import amerifrance.guideapi.api.util.NBTBookTags; import io.netty.buffer.ByteBuf; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; @@ -45,7 +45,7 @@ public IMessage onMessage(PacketSyncCategory message, MessageContext ctx) { if (!book.isEmpty() && book.getItem() instanceof IGuideItem) { if (message.category != -1 && message.page != -1) { if (!book.hasTagCompound()) - book.setTagCompound(new NBTTagCompound()); + book.setTagCompound(new CompoundNBT()); book.getTagCompound().setInteger(NBTBookTags.CATEGORY_TAG, message.category); book.getTagCompound().setInteger(NBTBookTags.ENTRY_PAGE_TAG, message.page); diff --git a/src/main/java/amerifrance/guideapi/network/PacketSyncEntry.java b/src/main/java/amerifrance/guideapi/network/PacketSyncEntry.java index 69952189..4d2f9a77 100644 --- a/src/main/java/amerifrance/guideapi/network/PacketSyncEntry.java +++ b/src/main/java/amerifrance/guideapi/network/PacketSyncEntry.java @@ -4,7 +4,7 @@ import amerifrance.guideapi.api.util.NBTBookTags; import io.netty.buffer.ByteBuf; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.common.network.ByteBufUtils; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; @@ -52,7 +52,7 @@ public IMessage onMessage(PacketSyncEntry message, MessageContext ctx) { if (!book.isEmpty() && book.getItem() instanceof IGuideItem) { if (message.category != -1 && !message.entry.equals(new ResourceLocation("guideapi", "none")) && message.page != -1) { if (!book.hasTagCompound()) - book.setTagCompound(new NBTTagCompound()); + book.setTagCompound(new CompoundNBT()); book.getTagCompound().setInteger(NBTBookTags.CATEGORY_TAG, message.category); book.getTagCompound().setString(NBTBookTags.ENTRY_TAG, message.entry.toString()); diff --git a/src/main/java/amerifrance/guideapi/network/PacketSyncHome.java b/src/main/java/amerifrance/guideapi/network/PacketSyncHome.java index 94ff2077..552fc3f3 100644 --- a/src/main/java/amerifrance/guideapi/network/PacketSyncHome.java +++ b/src/main/java/amerifrance/guideapi/network/PacketSyncHome.java @@ -4,7 +4,7 @@ import amerifrance.guideapi.api.util.NBTBookTags; import io.netty.buffer.ByteBuf; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.CompoundNBT; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; @@ -39,7 +39,7 @@ public IMessage onMessage(PacketSyncHome message, MessageContext ctx) { if (!book.isEmpty() && book.getItem() instanceof IGuideItem && message.page != -1) { if (!book.hasTagCompound()) - book.setTagCompound(new NBTTagCompound()); + book.setTagCompound(new CompoundNBT()); book.getTagCompound().setInteger(NBTBookTags.CATEGORY_PAGE_TAG, message.page); book.getTagCompound().removeTag(NBTBookTags.CATEGORY_TAG); book.getTagCompound().removeTag(NBTBookTags.ENTRY_TAG); diff --git a/src/main/java/amerifrance/guideapi/page/PageBrewingRecipe.java b/src/main/java/amerifrance/guideapi/page/PageBrewingRecipe.java index 50129454..c0ceca32 100644 --- a/src/main/java/amerifrance/guideapi/page/PageBrewingRecipe.java +++ b/src/main/java/amerifrance/guideapi/page/PageBrewingRecipe.java @@ -8,8 +8,8 @@ import amerifrance.guideapi.api.util.GuiHelper; import amerifrance.guideapi.api.util.TextHelper; import amerifrance.guideapi.gui.GuiBase; +import net.minecraft.block.Blocks; import net.minecraft.client.gui.FontRenderer; -import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.common.brewing.BrewingRecipe; diff --git a/src/main/java/amerifrance/guideapi/page/PageFurnaceRecipe.java b/src/main/java/amerifrance/guideapi/page/PageFurnaceRecipe.java index f37b2242..51715b59 100644 --- a/src/main/java/amerifrance/guideapi/page/PageFurnaceRecipe.java +++ b/src/main/java/amerifrance/guideapi/page/PageFurnaceRecipe.java @@ -9,8 +9,8 @@ import amerifrance.guideapi.api.util.TextHelper; import amerifrance.guideapi.gui.GuiBase; import net.minecraft.block.Block; +import net.minecraft.block.Blocks; import net.minecraft.client.gui.FontRenderer; -import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.FurnaceRecipes; diff --git a/src/main/java/amerifrance/guideapi/page/PageIRecipe.java b/src/main/java/amerifrance/guideapi/page/PageIRecipe.java index 60412c9d..9b934517 100644 --- a/src/main/java/amerifrance/guideapi/page/PageIRecipe.java +++ b/src/main/java/amerifrance/guideapi/page/PageIRecipe.java @@ -13,7 +13,7 @@ import amerifrance.guideapi.page.reciperenderer.ShapelessRecipesRenderer; import amerifrance.guideapi.util.LogHelper; import net.minecraft.client.gui.FontRenderer; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.item.crafting.ShapedRecipes; @@ -74,7 +74,7 @@ public void drawExtras(Book book, CategoryAbstract category, EntryAbstract entry } @Override - public boolean canSee(Book book, CategoryAbstract category, EntryAbstract entry, EntityPlayer player, ItemStack bookStack, GuiEntry guiEntry) { + public boolean canSee(Book book, CategoryAbstract category, EntryAbstract entry, PlayerEntity player, ItemStack bookStack, GuiEntry guiEntry) { return isValid; } diff --git a/src/main/java/amerifrance/guideapi/page/PageItemStack.java b/src/main/java/amerifrance/guideapi/page/PageItemStack.java index a189bdf7..974c3f39 100644 --- a/src/main/java/amerifrance/guideapi/page/PageItemStack.java +++ b/src/main/java/amerifrance/guideapi/page/PageItemStack.java @@ -7,7 +7,7 @@ import amerifrance.guideapi.gui.GuiBase; import net.minecraft.block.Block; import net.minecraft.client.gui.FontRenderer; -import net.minecraft.init.Blocks; +import net.minecraft.block.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.relauncher.Side; diff --git a/src/main/java/amerifrance/guideapi/page/PageSound.java b/src/main/java/amerifrance/guideapi/page/PageSound.java index ff761a3e..3bfc9f11 100644 --- a/src/main/java/amerifrance/guideapi/page/PageSound.java +++ b/src/main/java/amerifrance/guideapi/page/PageSound.java @@ -9,7 +9,7 @@ import amerifrance.guideapi.gui.GuiBase; import amerifrance.guideapi.gui.GuiEntry; import net.minecraft.client.gui.FontRenderer; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.SoundEvent; import net.minecraftforge.fml.relauncher.Side; @@ -42,20 +42,20 @@ public void drawExtras(Book book, CategoryAbstract category, EntryAbstract entry } @Override - public boolean canSee(Book book, CategoryAbstract category, EntryAbstract entry, EntityPlayer player, ItemStack bookStack, GuiEntry guiEntry) { + public boolean canSee(Book book, CategoryAbstract category, EntryAbstract entry, PlayerEntity player, ItemStack bookStack, GuiEntry guiEntry) { return pageToEmulate.canSee(book, category, entry, player, bookStack, guiEntry); } @Override @SideOnly(Side.CLIENT) - public void onLeftClicked(Book book, CategoryAbstract category, EntryAbstract entry, int mouseX, int mouseY, EntityPlayer player, GuiEntry guiEntry) { + public void onLeftClicked(Book book, CategoryAbstract category, EntryAbstract entry, int mouseX, int mouseY, PlayerEntity player, GuiEntry guiEntry) { GuideMod.PROXY.playSound(sound); pageToEmulate.onLeftClicked(book, category, entry, mouseX, mouseY, player, guiEntry); } @Override @SideOnly(Side.CLIENT) - public void onRightClicked(Book book, CategoryAbstract category, EntryAbstract entry, int mouseX, int mouseY, EntityPlayer player, GuiEntry guiEntry) { + public void onRightClicked(Book book, CategoryAbstract category, EntryAbstract entry, int mouseX, int mouseY, PlayerEntity player, GuiEntry guiEntry) { pageToEmulate.onRightClicked(book, category, entry, mouseX, mouseY, player, guiEntry); } diff --git a/src/main/java/amerifrance/guideapi/proxy/ClientProxy.java b/src/main/java/amerifrance/guideapi/proxy/ClientProxy.java index 2122c622..a47d7ef8 100644 --- a/src/main/java/amerifrance/guideapi/proxy/ClientProxy.java +++ b/src/main/java/amerifrance/guideapi/proxy/ClientProxy.java @@ -9,7 +9,7 @@ import amerifrance.guideapi.gui.GuiEntry; import net.minecraft.client.Minecraft; import net.minecraft.client.audio.PositionedSoundRecord; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.SoundEvent; import net.minecraftforge.common.MinecraftForge; @@ -22,7 +22,7 @@ public void playSound(SoundEvent sound) { } @Override - public void openEntry(Book book, CategoryAbstract categoryAbstract, EntryAbstract entryAbstract, EntityPlayer player, ItemStack stack) { + public void openEntry(Book book, CategoryAbstract categoryAbstract, EntryAbstract entryAbstract, PlayerEntity player, ItemStack stack) { BookEvent.Open event = new BookEvent.Open(book, stack, player); if (MinecraftForge.EVENT_BUS.post(event)) { player.sendStatusMessage(event.getCanceledText(), true); diff --git a/src/main/java/amerifrance/guideapi/proxy/CommonProxy.java b/src/main/java/amerifrance/guideapi/proxy/CommonProxy.java index 4d9c6c71..e78b6f32 100644 --- a/src/main/java/amerifrance/guideapi/proxy/CommonProxy.java +++ b/src/main/java/amerifrance/guideapi/proxy/CommonProxy.java @@ -9,10 +9,10 @@ import amerifrance.guideapi.gui.GuiCategory; import amerifrance.guideapi.gui.GuiEntry; import amerifrance.guideapi.gui.GuiHome; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.EnumHand; +import net.minecraft.nbt.CompoundNBT; +import net.minecraft.util.Hand; import net.minecraft.util.ResourceLocation; import net.minecraft.util.SoundEvent; import net.minecraft.world.World; @@ -21,19 +21,19 @@ public class CommonProxy implements IGuiHandler { @Override - public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { + public Object getServerGuiElement(int ID, PlayerEntity player, World world, int x, int y, int z) { return null; } @Override - public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { - ItemStack bookStack = player.getHeldItem(EnumHand.values()[x]); + public Object getClientGuiElement(int ID, PlayerEntity player, World world, int x, int y, int z) { + ItemStack bookStack = player.getHeldItem(Hand.values()[x]); if (!bookStack.isEmpty() && bookStack.getItem() instanceof IGuideItem) { Book book = GuideAPI.getIndexedBooks().get(ID); try { if (bookStack.hasTagCompound()) { - NBTTagCompound tagCompound = bookStack.getTagCompound(); + CompoundNBT tagCompound = bookStack.getTagCompound(); if (tagCompound.hasKey(NBTBookTags.ENTRY_TAG) && tagCompound.hasKey(NBTBookTags.CATEGORY_TAG)) { CategoryAbstract category = book.getCategoryList().get(tagCompound.getInteger(NBTBookTags.CATEGORY_TAG)); EntryAbstract entry = category.entries.get(new ResourceLocation(tagCompound.getString(NBTBookTags.ENTRY_TAG))); @@ -67,7 +67,7 @@ public Object getClientGuiElement(int ID, EntityPlayer player, World world, int public void playSound(SoundEvent sound) { } - public void openEntry(Book book, CategoryAbstract categoryAbstract, EntryAbstract entryAbstract, EntityPlayer player, ItemStack stack) { + public void openEntry(Book book, CategoryAbstract categoryAbstract, EntryAbstract entryAbstract, PlayerEntity player, ItemStack stack) { } public void initColors() { diff --git a/src/main/java/amerifrance/guideapi/test/TestBook.java b/src/main/java/amerifrance/guideapi/test/TestBook.java index 09650f02..92ea97fa 100644 --- a/src/main/java/amerifrance/guideapi/test/TestBook.java +++ b/src/main/java/amerifrance/guideapi/test/TestBook.java @@ -15,8 +15,8 @@ import amerifrance.guideapi.page.PageText; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; +import net.minecraft.block.Blocks; +import net.minecraft.item.Items; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/amerifrance/guideapi/test/TestBook2.java b/src/main/java/amerifrance/guideapi/test/TestBook2.java index 1e9ffbce..12191e52 100644 --- a/src/main/java/amerifrance/guideapi/test/TestBook2.java +++ b/src/main/java/amerifrance/guideapi/test/TestBook2.java @@ -7,9 +7,9 @@ import amerifrance.guideapi.category.CategoryItemStack; import amerifrance.guideapi.entry.EntryItemStack; import amerifrance.guideapi.page.*; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.init.PotionTypes; +import net.minecraft.block.Blocks; +import net.minecraft.item.Items; +import net.minecraft.potion.Potions; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.potion.PotionUtils; @@ -42,9 +42,9 @@ public Book buildBook() { testCategory.getEntry("entry").addPage(new PageFurnaceRecipe(Blocks.COBBLESTONE)); testCategory.getEntry("entry").addPage(PageIRecipe.newShaped(new ItemStack(Items.ACACIA_BOAT), "X X", "XXX", 'X', new ItemStack(Blocks.PLANKS, 1, 4))); testCategory.getEntry("entry").addPage(new PageBrewingRecipe(new BrewingRecipe( - PotionUtils.addPotionToItemStack(new ItemStack(Items.POTIONITEM), PotionTypes.AWKWARD), + PotionUtils.addPotionToItemStack(new ItemStack(Items.POTIONITEM), Potions.AWKWARD), new ItemStack(Items.SPECKLED_MELON), - PotionUtils.addPotionToItemStack(new ItemStack(Items.POTIONITEM), PotionTypes.HEALING))) + PotionUtils.addPotionToItemStack(new ItemStack(Items.POTIONITEM), Potions.HEALING))) ); testCategory.getEntry("entry").addPage(new PageJsonRecipe(new ResourceLocation("bread"))); book.addCategory(testCategory); diff --git a/src/main/java/amerifrance/guideapi/test/TestBook3.java b/src/main/java/amerifrance/guideapi/test/TestBook3.java index 1f460fa3..62758d5f 100644 --- a/src/main/java/amerifrance/guideapi/test/TestBook3.java +++ b/src/main/java/amerifrance/guideapi/test/TestBook3.java @@ -11,13 +11,13 @@ import amerifrance.guideapi.entry.EntryItemStack; import amerifrance.guideapi.page.*; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.init.PotionTypes; +import net.minecraft.block.Blocks; +import net.minecraft.item.Items; +import net.minecraft.potion.Potions; import net.minecraft.item.ItemStack; import net.minecraft.potion.PotionUtils; import net.minecraft.util.ResourceLocation; -import net.minecraft.util.text.TextComponentString; +import net.minecraft.util.text.StringTextComponent; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.brewing.BrewingRecipe; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; @@ -48,9 +48,9 @@ public Book buildBook() { testCategory.getEntry("entry").addPage(new PageFurnaceRecipe(Blocks.COBBLESTONE)); testCategory.getEntry("entry").addPage(PageIRecipe.newShaped(new ItemStack(Items.ACACIA_BOAT), "X X", "XXX", 'X', new ItemStack(Blocks.PLANKS, 1, 4))); testCategory.getEntry("entry").addPage(new PageBrewingRecipe(new BrewingRecipe( - PotionUtils.addPotionToItemStack(new ItemStack(Items.POTIONITEM), PotionTypes.AWKWARD), + PotionUtils.addPotionToItemStack(new ItemStack(Items.POTIONITEM), Potions.AWKWARD), new ItemStack(Items.SPECKLED_MELON), - PotionUtils.addPotionToItemStack(new ItemStack(Items.POTIONITEM), PotionTypes.HEALING))) + PotionUtils.addPotionToItemStack(new ItemStack(Items.POTIONITEM), Potions.HEALING))) ); testCategory.getEntry("entry").addPage(new PageJsonRecipe(new ResourceLocation("bread"))); binder.addCategory(testCategory); @@ -61,7 +61,7 @@ public Book buildBook() { @SubscribeEvent public void onBookOpen(BookEvent.Open event) { if (event.getBook() == book && event.getPlayer().isSneaking()) { - event.setCanceledText(new TextComponentString("No snek allowed")); + event.setCanceledText(new StringTextComponent("No snek allowed")); event.setCanceled(true); } } diff --git a/src/main/java/amerifrance/guideapi/util/EventHandler.java b/src/main/java/amerifrance/guideapi/util/EventHandler.java index a7e3194e..428891c1 100644 --- a/src/main/java/amerifrance/guideapi/util/EventHandler.java +++ b/src/main/java/amerifrance/guideapi/util/EventHandler.java @@ -12,14 +12,14 @@ import com.google.common.base.Strings; import com.google.common.collect.Multimap; import net.minecraft.block.Block; -import net.minecraft.block.state.IBlockState; +import net.minecraft.block.BlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.ScaledResolution; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.EnumHand; +import net.minecraft.nbt.CompoundNBT; +import net.minecraft.util.Hand; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.RayTraceResult; import net.minecraft.util.text.TextFormatting; @@ -39,9 +39,9 @@ public class EventHandler { @SubscribeEvent public static void onPlayerJoinWorld(EntityJoinWorldEvent event) { - if (!event.getEntity().world.isRemote && event.getEntity() instanceof EntityPlayer) { - EntityPlayer player = (EntityPlayer) event.getEntity(); - NBTTagCompound tag = getModTag(player, GuideMod.ID); + if (!event.getEntity().world.isRemote && event.getEntity() instanceof PlayerEntity) { + PlayerEntity player = (PlayerEntity) event.getEntity(); + CompoundNBT tag = getModTag(player, GuideMod.ID); if (ConfigHandler.canSpawnWithBooks) { for (Book book : GuideAPI.getBooks().values()) { if (ConfigHandler.SPAWN_BOOKS.getOrDefault(book, false) && !tag.getBoolean("hasInitial" + book.getTitle())) { @@ -63,11 +63,11 @@ public static void renderOverlay(RenderGameOverlayEvent.Pre event) { if (rayTrace == null || rayTrace.typeOfHit != RayTraceResult.Type.BLOCK) return; - EntityPlayer player = Minecraft.getMinecraft().player; + PlayerEntity player = Minecraft.getMinecraft().player; World world = Minecraft.getMinecraft().world; ItemStack held = ItemStack.EMPTY; Book book = null; - for (EnumHand hand : EnumHand.values()) { + for (Hand hand : Hand.values()) { ItemStack heldStack = player.getHeldItem(hand); if (heldStack.getItem() instanceof IGuideItem) { held = heldStack; @@ -79,7 +79,7 @@ public static void renderOverlay(RenderGameOverlayEvent.Pre event) { if (book == null) return; - IBlockState state = world.getBlockState(rayTrace.getBlockPos()); + BlockState state = world.getBlockState(rayTrace.getBlockPos()); String linkedEntry = null; if (state.getBlock() instanceof IGuideLinked) { IGuideLinked linked = (IGuideLinked) state.getBlock(); @@ -123,22 +123,22 @@ public static void renderOverlay(RenderGameOverlayEvent.Pre event) { renderer.drawInformation(book, world, rayTrace.getBlockPos(), state, rayTrace, player); } - public static NBTTagCompound getModTag(EntityPlayer player, String modName) { - NBTTagCompound tag = player.getEntityData(); - NBTTagCompound persistTag; + public static CompoundNBT getModTag(PlayerEntity player, String modName) { + CompoundNBT tag = player.getEntityData(); + CompoundNBT persistTag; - if (tag.hasKey(EntityPlayer.PERSISTED_NBT_TAG)) - persistTag = tag.getCompoundTag(EntityPlayer.PERSISTED_NBT_TAG); + if (tag.hasKey(PlayerEntity.PERSISTED_NBT_TAG)) + persistTag = tag.getCompoundTag(PlayerEntity.PERSISTED_NBT_TAG); else { - persistTag = new NBTTagCompound(); - tag.setTag(EntityPlayer.PERSISTED_NBT_TAG, persistTag); + persistTag = new CompoundNBT(); + tag.setTag(PlayerEntity.PERSISTED_NBT_TAG, persistTag); } - NBTTagCompound modTag; + CompoundNBT modTag; if (persistTag.hasKey(modName)) { modTag = persistTag.getCompoundTag(modName); } else { - modTag = new NBTTagCompound(); + modTag = new CompoundNBT(); persistTag.setTag(modName, modTag); } return modTag; diff --git a/src/main/java/amerifrance/guideapi/wrapper/CategoryWrapper.java b/src/main/java/amerifrance/guideapi/wrapper/CategoryWrapper.java index 745c3746..1ce8312b 100644 --- a/src/main/java/amerifrance/guideapi/wrapper/CategoryWrapper.java +++ b/src/main/java/amerifrance/guideapi/wrapper/CategoryWrapper.java @@ -6,7 +6,7 @@ import amerifrance.guideapi.gui.GuiBase; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.renderer.RenderItem; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; public class CategoryWrapper extends AbstractWrapper { @@ -14,13 +14,13 @@ public class CategoryWrapper extends AbstractWrapper { public Book book; public CategoryAbstract category; public int x, y, width, height; - public EntityPlayer player; + public PlayerEntity player; public FontRenderer renderer; public RenderItem renderItem; public boolean drawOnLeft; public ItemStack bookStack; - public CategoryWrapper(Book book, CategoryAbstract category, int x, int y, int width, int height, EntityPlayer player, FontRenderer renderer, RenderItem renderItem, boolean drawOnLeft, ItemStack bookStack) { + public CategoryWrapper(Book book, CategoryAbstract category, int x, int y, int width, int height, PlayerEntity player, FontRenderer renderer, RenderItem renderItem, boolean drawOnLeft, ItemStack bookStack) { this.book = book; this.category = category; this.x = x; diff --git a/src/main/java/amerifrance/guideapi/wrapper/EntryWrapper.java b/src/main/java/amerifrance/guideapi/wrapper/EntryWrapper.java index 33cbe96f..5ef8dce2 100644 --- a/src/main/java/amerifrance/guideapi/wrapper/EntryWrapper.java +++ b/src/main/java/amerifrance/guideapi/wrapper/EntryWrapper.java @@ -8,7 +8,7 @@ import amerifrance.guideapi.gui.GuiCategory; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; public class EntryWrapper extends AbstractWrapper { @@ -17,12 +17,12 @@ public class EntryWrapper extends AbstractWrapper { public CategoryAbstract category; public EntryAbstract entry; public int x, y, width, height; - public EntityPlayer player; + public PlayerEntity player; public FontRenderer renderer; public GuiCategory categoryGui; public ItemStack bookStack; - public EntryWrapper(GuiCategory categoryGui, Book book, CategoryAbstract category, EntryAbstract entry, int x, int y, int width, int height, EntityPlayer player, FontRenderer renderer, ItemStack bookStack) { + public EntryWrapper(GuiCategory categoryGui, Book book, CategoryAbstract category, EntryAbstract entry, int x, int y, int width, int height, PlayerEntity player, FontRenderer renderer, ItemStack bookStack) { this.book = book; this.category = category; this.entry = entry; diff --git a/src/main/java/amerifrance/guideapi/wrapper/PageWrapper.java b/src/main/java/amerifrance/guideapi/wrapper/PageWrapper.java index 3aaef696..5a68ec6b 100644 --- a/src/main/java/amerifrance/guideapi/wrapper/PageWrapper.java +++ b/src/main/java/amerifrance/guideapi/wrapper/PageWrapper.java @@ -8,7 +8,7 @@ import amerifrance.guideapi.gui.GuiEntry; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; public class PageWrapper extends AbstractWrapper { @@ -19,11 +19,11 @@ public class PageWrapper extends AbstractWrapper { public EntryAbstract entry; public IPage page; public int guiLeft, guiTop; - public EntityPlayer player; + public PlayerEntity player; public FontRenderer renderer; public ItemStack bookStack; - public PageWrapper(GuiEntry guiEntry, Book book, CategoryAbstract category, EntryAbstract entry, IPage page, int guiLeft, int guiTop, EntityPlayer player, FontRenderer renderer, ItemStack bookStack) { + public PageWrapper(GuiEntry guiEntry, Book book, CategoryAbstract category, EntryAbstract entry, IPage page, int guiLeft, int guiTop, PlayerEntity player, FontRenderer renderer, ItemStack bookStack) { this.guiEntry = guiEntry; this.book = book; this.category = category; From 9dafec7d8613a6c1b5704005a263244586b99a7b Mon Sep 17 00:00:00 2001 From: Maxanier Date: Fri, 20 Mar 2020 23:41:24 +0100 Subject: [PATCH 02/28] Changes --- build.gradle | 29 ++----------------- .../amerifrance/guideapi/ConfigHandler.java | 4 +-- .../java/amerifrance/guideapi/GuideMod.java | 6 ++-- .../guideapi/RegistrarGuideAPI.java | 12 ++++---- .../guideapi/button/ButtonBack.java | 7 ++--- .../guideapi/button/ButtonNext.java | 7 ++--- .../guideapi/button/ButtonPrev.java | 7 ++--- .../guideapi/button/ButtonSearch.java | 9 +++--- .../guideapi/category/CategoryItemStack.java | 10 +++---- .../category/CategoryResourceLocation.java | 10 +++---- .../guideapi/entry/EntryItemStack.java | 10 +++---- .../guideapi/entry/EntryResourceLocation.java | 10 +++---- .../amerifrance/guideapi/gui/GuiBase.java | 2 -- .../amerifrance/guideapi/gui/GuiCategory.java | 8 ++--- .../amerifrance/guideapi/gui/GuiEntry.java | 10 +++---- .../amerifrance/guideapi/gui/GuiHome.java | 6 ++-- .../amerifrance/guideapi/gui/GuiSearch.java | 10 +++---- .../info/InfoRendererDescription.java | 7 ++--- .../guideapi/info/InfoRendererImage.java | 4 +-- .../guideapi/item/ItemGuideBook.java | 14 ++++----- .../guideapi/network/PacketSyncCategory.java | 4 +-- .../guideapi/network/PacketSyncEntry.java | 4 +-- .../guideapi/network/PacketSyncHome.java | 4 +-- .../guideapi/page/PageBrewingRecipe.java | 16 +++++----- .../guideapi/page/PageFurnaceRecipe.java | 14 ++++----- .../guideapi/page/PageIRecipe.java | 10 +++---- .../amerifrance/guideapi/page/PageImage.java | 12 ++++---- .../guideapi/page/PageItemStack.java | 8 ++--- .../amerifrance/guideapi/page/PageSound.java | 12 ++++---- .../amerifrance/guideapi/page/PageText.java | 10 +++---- .../guideapi/page/PageTextImage.java | 10 +++---- .../reciperenderer/BasicRecipeRenderer.java | 14 ++++----- .../reciperenderer/ShapedRecipesRenderer.java | 8 ++--- .../ShapelessRecipesRenderer.java | 10 +++---- .../guideapi/proxy/ClientProxy.java | 12 ++++---- .../guideapi/proxy/CommonProxy.java | 12 ++++---- .../amerifrance/guideapi/test/TestBook.java | 14 ++++----- .../amerifrance/guideapi/test/TestBook2.java | 8 ++--- .../amerifrance/guideapi/test/TestBook3.java | 12 ++++---- .../amerifrance/guideapi/util/APISetter.java | 4 +-- .../guideapi/util/AnnotationHandler.java | 8 ++--- .../guideapi/util/EventHandler.java | 14 ++++----- .../guideapi/wrapper/CategoryWrapper.java | 6 ++-- .../guideapi/wrapper/EntryWrapper.java | 8 ++--- .../guideapi/wrapper/PageWrapper.java | 8 ++--- .../guideapi => main/java}/api/BookEvent.java | 4 +-- .../guideapi => main/java}/api/GuideAPI.java | 4 +-- .../guideapi => main/java}/api/GuideBook.java | 2 +- .../java}/api/IGuideBook.java | 4 +-- .../java}/api/IGuideItem.java | 4 +-- .../java}/api/IGuideLinked.java | 2 +- .../java}/api/IInfoRenderer.java | 6 ++-- .../guideapi => main/java}/api/IPage.java | 8 ++--- .../java}/api/IRecipeRenderer.java | 8 ++--- .../java}/api/SubTexture.java | 2 +- .../java}/api/button/ButtonGuideAPI.java | 2 +- .../guideapi => main/java}/api/impl/Book.java | 6 ++-- .../java}/api/impl/BookBinder.java | 4 +-- .../java}/api/impl/Category.java | 8 ++--- .../java}/api/impl/Entry.java | 10 +++---- .../guideapi => main/java}/api/impl/Page.java | 10 +++---- .../impl/abstraction/CategoryAbstract.java | 18 +++++------- .../api/impl/abstraction/EntryAbstract.java | 20 ++++++------- .../java}/api/package-info.java | 2 +- .../java}/api/util/BookHelper.java | 8 ++--- .../java}/api/util/GuiHelper.java | 2 +- .../java}/api/util/NBTBookTags.java | 2 +- .../java}/api/util/PageHelper.java | 6 ++-- .../java}/api/util/TextHelper.java | 2 +- 69 files changed, 255 insertions(+), 313 deletions(-) rename src/{api/java/amerifrance/guideapi => main/java}/api/BookEvent.java (96%) rename src/{api/java/amerifrance/guideapi => main/java}/api/GuideAPI.java (97%) rename src/{api/java/amerifrance/guideapi => main/java}/api/GuideBook.java (92%) rename src/{api/java/amerifrance/guideapi => main/java}/api/IGuideBook.java (94%) rename src/{api/java/amerifrance/guideapi => main/java}/api/IGuideItem.java (58%) rename src/{api/java/amerifrance/guideapi => main/java}/api/IGuideLinked.java (95%) rename src/{api/java/amerifrance/guideapi => main/java}/api/IInfoRenderer.java (91%) rename src/{api/java/amerifrance/guideapi => main/java}/api/IPage.java (86%) rename src/{api/java/amerifrance/guideapi => main/java}/api/IRecipeRenderer.java (85%) rename src/{api/java/amerifrance/guideapi => main/java}/api/SubTexture.java (99%) rename src/{api/java/amerifrance/guideapi => main/java}/api/button/ButtonGuideAPI.java (88%) rename src/{api/java/amerifrance/guideapi => main/java}/api/impl/Book.java (98%) rename src/{api/java/amerifrance/guideapi => main/java}/api/impl/BookBinder.java (98%) rename src/{api/java/amerifrance/guideapi => main/java}/api/impl/Category.java (86%) rename src/{api/java/amerifrance/guideapi => main/java}/api/impl/Entry.java (93%) rename src/{api/java/amerifrance/guideapi => main/java}/api/impl/Page.java (85%) rename src/{api/java/amerifrance/guideapi => main/java}/api/impl/abstraction/CategoryAbstract.java (93%) rename src/{api/java/amerifrance/guideapi => main/java}/api/impl/abstraction/EntryAbstract.java (87%) rename src/{api/java/amerifrance/guideapi => main/java}/api/package-info.java (78%) rename src/{api/java/amerifrance/guideapi => main/java}/api/util/BookHelper.java (73%) rename src/{api/java/amerifrance/guideapi => main/java}/api/util/GuiHelper.java (99%) rename src/{api/java/amerifrance/guideapi => main/java}/api/util/NBTBookTags.java (91%) rename src/{api/java/amerifrance/guideapi => main/java}/api/util/PageHelper.java (96%) rename src/{api/java/amerifrance/guideapi => main/java}/api/util/TextHelper.java (98%) diff --git a/build.gradle b/build.gradle index 7739d720..0d8d1a37 100644 --- a/build.gradle +++ b/build.gradle @@ -47,17 +47,7 @@ dependencies { runtimeOnly fg.deobf("mezz.jei:jei-${project.minecraft_version}:${project.jei_version}") //Full for runtime } -sourceSets { - api - main { - compileClasspath += sourceSets.api.output - runtimeClasspath += sourceSets.api.output - } -} -configurations { - apiCompile.extendsFrom(compile) -} minecraft { @@ -73,9 +63,8 @@ minecraft { workingDirectory project.file('run/client1').canonicalPath mods { - vampirism { + guideapi { source sourceSets.main - source sourceSets.api } } @@ -86,12 +75,10 @@ minecraft { workingDirectory project.file('run/server').canonicalPath mods { - vampirism { + guideapi { source sourceSets.main - source sourceSets.api } - } } } @@ -119,9 +106,7 @@ jar { includeEmptyDirs = false from sourceSets.main.output.classesDirs - from sourceSets.api.output.classesDirs from sourceSets.main.output.resourcesDir - from sourceSets.api.output.resourcesDir classifier = '' manifest.mainAttributes( @@ -133,15 +118,7 @@ jar { exclude 'amerifrance/guideapi/test/**/*' } -// API jar -task apiJar(type: Jar) { - from sourceSets.main.allSource - from sourceSets.main.output - include 'amerifrance/guideapi/api/**/*' - classifier = 'api' -} -tasks.build.dependsOn apiJar tasks.withType(JavaCompile) { task -> task.options.encoding = 'UTF-8' @@ -152,7 +129,6 @@ publishing { publications { mavenJava(MavenPublication) { artifact jar - artifact apiJar } } repositories { @@ -200,7 +176,6 @@ curseforge { changelog = getChangelogText() releaseType = 'beta' - addArtifact apiJar } } diff --git a/src/main/java/amerifrance/guideapi/ConfigHandler.java b/src/main/java/amerifrance/guideapi/ConfigHandler.java index e2e6c16e..c70f8176 100644 --- a/src/main/java/amerifrance/guideapi/ConfigHandler.java +++ b/src/main/java/amerifrance/guideapi/ConfigHandler.java @@ -1,7 +1,7 @@ package amerifrance.guideapi; -import amerifrance.guideapi.api.GuideAPI; -import amerifrance.guideapi.api.impl.Book; +import api.GuideAPI; +import api.impl.Book; import com.google.common.collect.Maps; import net.minecraftforge.common.config.Configuration; diff --git a/src/main/java/amerifrance/guideapi/GuideMod.java b/src/main/java/amerifrance/guideapi/GuideMod.java index ce707df2..152d3336 100644 --- a/src/main/java/amerifrance/guideapi/GuideMod.java +++ b/src/main/java/amerifrance/guideapi/GuideMod.java @@ -1,8 +1,8 @@ package amerifrance.guideapi; -import amerifrance.guideapi.api.GuideAPI; -import amerifrance.guideapi.api.IGuideBook; -import amerifrance.guideapi.api.impl.Book; +import api.GuideAPI; +import api.IGuideBook; +import api.impl.Book; import amerifrance.guideapi.network.PacketHandler; import amerifrance.guideapi.proxy.CommonProxy; import amerifrance.guideapi.util.AnnotationHandler; diff --git a/src/main/java/amerifrance/guideapi/RegistrarGuideAPI.java b/src/main/java/amerifrance/guideapi/RegistrarGuideAPI.java index 3e035056..27f17a8d 100644 --- a/src/main/java/amerifrance/guideapi/RegistrarGuideAPI.java +++ b/src/main/java/amerifrance/guideapi/RegistrarGuideAPI.java @@ -1,11 +1,11 @@ package amerifrance.guideapi; -import amerifrance.guideapi.api.GuideAPI; -import amerifrance.guideapi.api.IGuideBook; -import amerifrance.guideapi.api.IPage; -import amerifrance.guideapi.api.impl.Book; -import amerifrance.guideapi.api.impl.abstraction.CategoryAbstract; -import amerifrance.guideapi.api.impl.abstraction.EntryAbstract; +import api.GuideAPI; +import api.IGuideBook; +import api.IPage; +import api.impl.Book; +import api.impl.abstraction.CategoryAbstract; +import api.impl.abstraction.EntryAbstract; import amerifrance.guideapi.item.ItemGuideBook; import amerifrance.guideapi.page.PageJsonRecipe; import amerifrance.guideapi.util.APISetter; diff --git a/src/main/java/amerifrance/guideapi/button/ButtonBack.java b/src/main/java/amerifrance/guideapi/button/ButtonBack.java index d08f1114..89fd5ec6 100644 --- a/src/main/java/amerifrance/guideapi/button/ButtonBack.java +++ b/src/main/java/amerifrance/guideapi/button/ButtonBack.java @@ -1,12 +1,11 @@ package amerifrance.guideapi.button; import amerifrance.guideapi.GuideMod; -import amerifrance.guideapi.api.button.ButtonGuideAPI; -import amerifrance.guideapi.api.util.GuiHelper; -import amerifrance.guideapi.api.util.TextHelper; +import api.button.ButtonGuideAPI; +import api.util.GuiHelper; +import api.util.TextHelper; import amerifrance.guideapi.gui.GuiBase; import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/amerifrance/guideapi/button/ButtonNext.java b/src/main/java/amerifrance/guideapi/button/ButtonNext.java index ca9f2244..46f57233 100644 --- a/src/main/java/amerifrance/guideapi/button/ButtonNext.java +++ b/src/main/java/amerifrance/guideapi/button/ButtonNext.java @@ -1,12 +1,11 @@ package amerifrance.guideapi.button; import amerifrance.guideapi.GuideMod; -import amerifrance.guideapi.api.button.ButtonGuideAPI; -import amerifrance.guideapi.api.util.GuiHelper; -import amerifrance.guideapi.api.util.TextHelper; +import api.button.ButtonGuideAPI; +import api.util.GuiHelper; +import api.util.TextHelper; import amerifrance.guideapi.gui.GuiBase; import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/amerifrance/guideapi/button/ButtonPrev.java b/src/main/java/amerifrance/guideapi/button/ButtonPrev.java index 50e9f738..8df20e93 100644 --- a/src/main/java/amerifrance/guideapi/button/ButtonPrev.java +++ b/src/main/java/amerifrance/guideapi/button/ButtonPrev.java @@ -1,12 +1,11 @@ package amerifrance.guideapi.button; import amerifrance.guideapi.GuideMod; -import amerifrance.guideapi.api.button.ButtonGuideAPI; -import amerifrance.guideapi.api.util.GuiHelper; -import amerifrance.guideapi.api.util.TextHelper; +import api.button.ButtonGuideAPI; +import api.util.GuiHelper; +import api.util.TextHelper; import amerifrance.guideapi.gui.GuiBase; import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/amerifrance/guideapi/button/ButtonSearch.java b/src/main/java/amerifrance/guideapi/button/ButtonSearch.java index 2183af1f..ac8b82a3 100644 --- a/src/main/java/amerifrance/guideapi/button/ButtonSearch.java +++ b/src/main/java/amerifrance/guideapi/button/ButtonSearch.java @@ -1,12 +1,11 @@ package amerifrance.guideapi.button; -import amerifrance.guideapi.api.SubTexture; -import amerifrance.guideapi.api.button.ButtonGuideAPI; -import amerifrance.guideapi.api.util.GuiHelper; -import amerifrance.guideapi.api.util.TextHelper; +import api.SubTexture; +import api.button.ButtonGuideAPI; +import api.util.GuiHelper; +import api.util.TextHelper; import amerifrance.guideapi.gui.GuiBase; import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.RenderHelper; import java.util.ArrayList; diff --git a/src/main/java/amerifrance/guideapi/category/CategoryItemStack.java b/src/main/java/amerifrance/guideapi/category/CategoryItemStack.java index 9d6aba3e..92ca541f 100644 --- a/src/main/java/amerifrance/guideapi/category/CategoryItemStack.java +++ b/src/main/java/amerifrance/guideapi/category/CategoryItemStack.java @@ -1,16 +1,14 @@ package amerifrance.guideapi.category; -import amerifrance.guideapi.api.impl.Book; -import amerifrance.guideapi.api.impl.Category; -import amerifrance.guideapi.api.impl.abstraction.EntryAbstract; -import amerifrance.guideapi.api.util.GuiHelper; +import api.impl.Book; +import api.impl.Category; +import api.impl.abstraction.EntryAbstract; +import api.util.GuiHelper; import amerifrance.guideapi.gui.GuiBase; import net.minecraft.client.Minecraft; 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 java.util.Map; diff --git a/src/main/java/amerifrance/guideapi/category/CategoryResourceLocation.java b/src/main/java/amerifrance/guideapi/category/CategoryResourceLocation.java index 79ef78b8..09435e61 100644 --- a/src/main/java/amerifrance/guideapi/category/CategoryResourceLocation.java +++ b/src/main/java/amerifrance/guideapi/category/CategoryResourceLocation.java @@ -1,15 +1,13 @@ package amerifrance.guideapi.category; -import amerifrance.guideapi.api.impl.Book; -import amerifrance.guideapi.api.impl.Category; -import amerifrance.guideapi.api.impl.abstraction.EntryAbstract; -import amerifrance.guideapi.api.util.GuiHelper; +import api.impl.Book; +import api.impl.Category; +import api.impl.abstraction.EntryAbstract; +import api.util.GuiHelper; import amerifrance.guideapi.gui.GuiBase; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.RenderItem; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import java.util.Map; diff --git a/src/main/java/amerifrance/guideapi/entry/EntryItemStack.java b/src/main/java/amerifrance/guideapi/entry/EntryItemStack.java index a401355f..20ce0c07 100644 --- a/src/main/java/amerifrance/guideapi/entry/EntryItemStack.java +++ b/src/main/java/amerifrance/guideapi/entry/EntryItemStack.java @@ -1,10 +1,10 @@ package amerifrance.guideapi.entry; -import amerifrance.guideapi.api.IPage; -import amerifrance.guideapi.api.impl.Book; -import amerifrance.guideapi.api.impl.Entry; -import amerifrance.guideapi.api.impl.abstraction.CategoryAbstract; -import amerifrance.guideapi.api.util.GuiHelper; +import api.IPage; +import api.impl.Book; +import api.impl.Entry; +import api.impl.abstraction.CategoryAbstract; +import api.util.GuiHelper; import amerifrance.guideapi.gui.GuiBase; import net.minecraft.client.gui.FontRenderer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/amerifrance/guideapi/entry/EntryResourceLocation.java b/src/main/java/amerifrance/guideapi/entry/EntryResourceLocation.java index 7d5ade2b..bff3496e 100644 --- a/src/main/java/amerifrance/guideapi/entry/EntryResourceLocation.java +++ b/src/main/java/amerifrance/guideapi/entry/EntryResourceLocation.java @@ -1,10 +1,10 @@ package amerifrance.guideapi.entry; -import amerifrance.guideapi.api.IPage; -import amerifrance.guideapi.api.impl.Book; -import amerifrance.guideapi.api.impl.Entry; -import amerifrance.guideapi.api.impl.abstraction.CategoryAbstract; -import amerifrance.guideapi.api.util.GuiHelper; +import api.IPage; +import api.impl.Book; +import api.impl.Entry; +import api.impl.abstraction.CategoryAbstract; +import api.util.GuiHelper; import amerifrance.guideapi.gui.GuiBase; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; diff --git a/src/main/java/amerifrance/guideapi/gui/GuiBase.java b/src/main/java/amerifrance/guideapi/gui/GuiBase.java index f35c597c..4f93e3ba 100644 --- a/src/main/java/amerifrance/guideapi/gui/GuiBase.java +++ b/src/main/java/amerifrance/guideapi/gui/GuiBase.java @@ -7,13 +7,11 @@ import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; import java.awt.Color; import java.util.List; -import static net.minecraft.client.renderer.GlStateManager.*; public class GuiBase extends Screen { diff --git a/src/main/java/amerifrance/guideapi/gui/GuiCategory.java b/src/main/java/amerifrance/guideapi/gui/GuiCategory.java index 0432cab4..44018810 100644 --- a/src/main/java/amerifrance/guideapi/gui/GuiCategory.java +++ b/src/main/java/amerifrance/guideapi/gui/GuiCategory.java @@ -1,8 +1,8 @@ package amerifrance.guideapi.gui; -import amerifrance.guideapi.api.impl.Book; -import amerifrance.guideapi.api.impl.abstraction.CategoryAbstract; -import amerifrance.guideapi.api.impl.abstraction.EntryAbstract; +import api.impl.Book; +import api.impl.abstraction.CategoryAbstract; +import api.impl.abstraction.EntryAbstract; import amerifrance.guideapi.button.ButtonBack; import amerifrance.guideapi.button.ButtonNext; import amerifrance.guideapi.button.ButtonPrev; @@ -18,8 +18,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.MathHelper; -import org.lwjgl.input.Keyboard; -import org.lwjgl.input.Mouse; import java.awt.Color; import java.io.IOException; diff --git a/src/main/java/amerifrance/guideapi/gui/GuiEntry.java b/src/main/java/amerifrance/guideapi/gui/GuiEntry.java index 02dc5b9f..54523e86 100644 --- a/src/main/java/amerifrance/guideapi/gui/GuiEntry.java +++ b/src/main/java/amerifrance/guideapi/gui/GuiEntry.java @@ -1,9 +1,9 @@ package amerifrance.guideapi.gui; -import amerifrance.guideapi.api.IPage; -import amerifrance.guideapi.api.impl.Book; -import amerifrance.guideapi.api.impl.abstraction.CategoryAbstract; -import amerifrance.guideapi.api.impl.abstraction.EntryAbstract; +import api.IPage; +import api.impl.Book; +import api.impl.abstraction.CategoryAbstract; +import api.impl.abstraction.EntryAbstract; import amerifrance.guideapi.button.ButtonBack; import amerifrance.guideapi.button.ButtonNext; import amerifrance.guideapi.button.ButtonPrev; @@ -17,8 +17,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.MathHelper; -import org.lwjgl.input.Keyboard; -import org.lwjgl.input.Mouse; import java.awt.Color; import java.io.IOException; diff --git a/src/main/java/amerifrance/guideapi/gui/GuiHome.java b/src/main/java/amerifrance/guideapi/gui/GuiHome.java index e2bb436e..e1a21940 100644 --- a/src/main/java/amerifrance/guideapi/gui/GuiHome.java +++ b/src/main/java/amerifrance/guideapi/gui/GuiHome.java @@ -1,7 +1,7 @@ package amerifrance.guideapi.gui; -import amerifrance.guideapi.api.impl.Book; -import amerifrance.guideapi.api.impl.abstraction.CategoryAbstract; +import api.impl.Book; +import api.impl.abstraction.CategoryAbstract; import amerifrance.guideapi.button.ButtonNext; import amerifrance.guideapi.button.ButtonPrev; import amerifrance.guideapi.button.ButtonSearch; @@ -16,8 +16,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.MathHelper; -import org.lwjgl.input.Keyboard; -import org.lwjgl.input.Mouse; import java.awt.Color; import java.io.IOException; diff --git a/src/main/java/amerifrance/guideapi/gui/GuiSearch.java b/src/main/java/amerifrance/guideapi/gui/GuiSearch.java index caad061a..29bde351 100644 --- a/src/main/java/amerifrance/guideapi/gui/GuiSearch.java +++ b/src/main/java/amerifrance/guideapi/gui/GuiSearch.java @@ -1,10 +1,10 @@ package amerifrance.guideapi.gui; import amerifrance.guideapi.GuideMod; -import amerifrance.guideapi.api.impl.Book; -import amerifrance.guideapi.api.impl.abstraction.CategoryAbstract; -import amerifrance.guideapi.api.impl.abstraction.EntryAbstract; -import amerifrance.guideapi.api.util.GuiHelper; +import api.impl.Book; +import api.impl.abstraction.CategoryAbstract; +import api.impl.abstraction.EntryAbstract; +import api.util.GuiHelper; import amerifrance.guideapi.button.ButtonBack; import amerifrance.guideapi.button.ButtonNext; import amerifrance.guideapi.button.ButtonPrev; @@ -18,8 +18,6 @@ import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.client.config.GuiUtils; import org.apache.commons.lang3.tuple.Pair; -import org.lwjgl.input.Keyboard; -import org.lwjgl.input.Mouse; import javax.annotation.Nonnull; import javax.annotation.Nullable; diff --git a/src/main/java/amerifrance/guideapi/info/InfoRendererDescription.java b/src/main/java/amerifrance/guideapi/info/InfoRendererDescription.java index 8c9e840c..a0b26004 100644 --- a/src/main/java/amerifrance/guideapi/info/InfoRendererDescription.java +++ b/src/main/java/amerifrance/guideapi/info/InfoRendererDescription.java @@ -1,13 +1,12 @@ package amerifrance.guideapi.info; -import amerifrance.guideapi.api.IInfoRenderer; -import amerifrance.guideapi.api.impl.Book; -import amerifrance.guideapi.api.util.GuiHelper; +import api.IInfoRenderer; +import api.impl.Book; +import api.util.GuiHelper; import net.minecraft.block.BlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.ScaledResolution; -import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/amerifrance/guideapi/info/InfoRendererImage.java b/src/main/java/amerifrance/guideapi/info/InfoRendererImage.java index 7ec2ee4e..b34d03f7 100644 --- a/src/main/java/amerifrance/guideapi/info/InfoRendererImage.java +++ b/src/main/java/amerifrance/guideapi/info/InfoRendererImage.java @@ -1,7 +1,7 @@ package amerifrance.guideapi.info; -import amerifrance.guideapi.api.IInfoRenderer; -import amerifrance.guideapi.api.impl.Book; +import api.IInfoRenderer; +import api.impl.Book; import net.minecraft.block.BlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.AbstractGui; diff --git a/src/main/java/amerifrance/guideapi/item/ItemGuideBook.java b/src/main/java/amerifrance/guideapi/item/ItemGuideBook.java index 53a51caf..bb89f323 100644 --- a/src/main/java/amerifrance/guideapi/item/ItemGuideBook.java +++ b/src/main/java/amerifrance/guideapi/item/ItemGuideBook.java @@ -1,13 +1,13 @@ package amerifrance.guideapi.item; import amerifrance.guideapi.GuideMod; -import amerifrance.guideapi.api.BookEvent; -import amerifrance.guideapi.api.GuideAPI; -import amerifrance.guideapi.api.IGuideItem; -import amerifrance.guideapi.api.IGuideLinked; -import amerifrance.guideapi.api.impl.Book; -import amerifrance.guideapi.api.impl.abstraction.CategoryAbstract; -import amerifrance.guideapi.api.util.TextHelper; +import api.BookEvent; +import api.GuideAPI; +import api.IGuideItem; +import api.IGuideLinked; +import api.impl.Book; +import api.impl.abstraction.CategoryAbstract; +import api.util.TextHelper; import com.google.common.base.Strings; import net.minecraft.block.BlockState; import net.minecraft.client.util.ITooltipFlag; diff --git a/src/main/java/amerifrance/guideapi/network/PacketSyncCategory.java b/src/main/java/amerifrance/guideapi/network/PacketSyncCategory.java index 79607ec8..9be201d6 100644 --- a/src/main/java/amerifrance/guideapi/network/PacketSyncCategory.java +++ b/src/main/java/amerifrance/guideapi/network/PacketSyncCategory.java @@ -1,7 +1,7 @@ package amerifrance.guideapi.network; -import amerifrance.guideapi.api.IGuideItem; -import amerifrance.guideapi.api.util.NBTBookTags; +import api.IGuideItem; +import api.util.NBTBookTags; import io.netty.buffer.ByteBuf; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; diff --git a/src/main/java/amerifrance/guideapi/network/PacketSyncEntry.java b/src/main/java/amerifrance/guideapi/network/PacketSyncEntry.java index 4d2f9a77..d84e6444 100644 --- a/src/main/java/amerifrance/guideapi/network/PacketSyncEntry.java +++ b/src/main/java/amerifrance/guideapi/network/PacketSyncEntry.java @@ -1,7 +1,7 @@ package amerifrance.guideapi.network; -import amerifrance.guideapi.api.IGuideItem; -import amerifrance.guideapi.api.util.NBTBookTags; +import api.IGuideItem; +import api.util.NBTBookTags; import io.netty.buffer.ByteBuf; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; diff --git a/src/main/java/amerifrance/guideapi/network/PacketSyncHome.java b/src/main/java/amerifrance/guideapi/network/PacketSyncHome.java index 552fc3f3..9e2a4070 100644 --- a/src/main/java/amerifrance/guideapi/network/PacketSyncHome.java +++ b/src/main/java/amerifrance/guideapi/network/PacketSyncHome.java @@ -1,7 +1,7 @@ package amerifrance.guideapi.network; -import amerifrance.guideapi.api.IGuideItem; -import amerifrance.guideapi.api.util.NBTBookTags; +import api.IGuideItem; +import api.util.NBTBookTags; import io.netty.buffer.ByteBuf; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; diff --git a/src/main/java/amerifrance/guideapi/page/PageBrewingRecipe.java b/src/main/java/amerifrance/guideapi/page/PageBrewingRecipe.java index c0ceca32..af8a889b 100644 --- a/src/main/java/amerifrance/guideapi/page/PageBrewingRecipe.java +++ b/src/main/java/amerifrance/guideapi/page/PageBrewingRecipe.java @@ -1,20 +1,18 @@ package amerifrance.guideapi.page; -import amerifrance.guideapi.api.SubTexture; -import amerifrance.guideapi.api.impl.Book; -import amerifrance.guideapi.api.impl.Page; -import amerifrance.guideapi.api.impl.abstraction.CategoryAbstract; -import amerifrance.guideapi.api.impl.abstraction.EntryAbstract; -import amerifrance.guideapi.api.util.GuiHelper; -import amerifrance.guideapi.api.util.TextHelper; +import api.SubTexture; +import api.impl.Book; +import api.impl.Page; +import api.impl.abstraction.CategoryAbstract; +import api.impl.abstraction.EntryAbstract; +import api.util.GuiHelper; +import api.util.TextHelper; import amerifrance.guideapi.gui.GuiBase; import net.minecraft.block.Blocks; import net.minecraft.client.gui.FontRenderer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.common.brewing.BrewingRecipe; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/amerifrance/guideapi/page/PageFurnaceRecipe.java b/src/main/java/amerifrance/guideapi/page/PageFurnaceRecipe.java index 51715b59..82f4d410 100644 --- a/src/main/java/amerifrance/guideapi/page/PageFurnaceRecipe.java +++ b/src/main/java/amerifrance/guideapi/page/PageFurnaceRecipe.java @@ -1,12 +1,12 @@ package amerifrance.guideapi.page; -import amerifrance.guideapi.api.SubTexture; -import amerifrance.guideapi.api.impl.Book; -import amerifrance.guideapi.api.impl.Page; -import amerifrance.guideapi.api.impl.abstraction.CategoryAbstract; -import amerifrance.guideapi.api.impl.abstraction.EntryAbstract; -import amerifrance.guideapi.api.util.GuiHelper; -import amerifrance.guideapi.api.util.TextHelper; +import api.SubTexture; +import api.impl.Book; +import api.impl.Page; +import api.impl.abstraction.CategoryAbstract; +import api.impl.abstraction.EntryAbstract; +import api.util.GuiHelper; +import api.util.TextHelper; import amerifrance.guideapi.gui.GuiBase; import net.minecraft.block.Block; import net.minecraft.block.Blocks; diff --git a/src/main/java/amerifrance/guideapi/page/PageIRecipe.java b/src/main/java/amerifrance/guideapi/page/PageIRecipe.java index 9b934517..c78e7650 100644 --- a/src/main/java/amerifrance/guideapi/page/PageIRecipe.java +++ b/src/main/java/amerifrance/guideapi/page/PageIRecipe.java @@ -1,10 +1,10 @@ package amerifrance.guideapi.page; -import amerifrance.guideapi.api.IRecipeRenderer; -import amerifrance.guideapi.api.impl.Book; -import amerifrance.guideapi.api.impl.Page; -import amerifrance.guideapi.api.impl.abstraction.CategoryAbstract; -import amerifrance.guideapi.api.impl.abstraction.EntryAbstract; +import api.IRecipeRenderer; +import api.impl.Book; +import api.impl.Page; +import api.impl.abstraction.CategoryAbstract; +import api.impl.abstraction.EntryAbstract; import amerifrance.guideapi.gui.GuiBase; import amerifrance.guideapi.gui.GuiEntry; import amerifrance.guideapi.page.reciperenderer.ShapedOreRecipeRenderer; diff --git a/src/main/java/amerifrance/guideapi/page/PageImage.java b/src/main/java/amerifrance/guideapi/page/PageImage.java index e133b1c9..f1ddacde 100644 --- a/src/main/java/amerifrance/guideapi/page/PageImage.java +++ b/src/main/java/amerifrance/guideapi/page/PageImage.java @@ -1,16 +1,14 @@ package amerifrance.guideapi.page; -import amerifrance.guideapi.api.impl.Book; -import amerifrance.guideapi.api.impl.Page; -import amerifrance.guideapi.api.impl.abstraction.CategoryAbstract; -import amerifrance.guideapi.api.impl.abstraction.EntryAbstract; -import amerifrance.guideapi.api.util.GuiHelper; +import api.impl.Book; +import api.impl.Page; +import api.impl.abstraction.CategoryAbstract; +import api.impl.abstraction.EntryAbstract; +import api.util.GuiHelper; import amerifrance.guideapi.gui.GuiBase; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class PageImage extends Page { diff --git a/src/main/java/amerifrance/guideapi/page/PageItemStack.java b/src/main/java/amerifrance/guideapi/page/PageItemStack.java index 974c3f39..417d7c74 100644 --- a/src/main/java/amerifrance/guideapi/page/PageItemStack.java +++ b/src/main/java/amerifrance/guideapi/page/PageItemStack.java @@ -1,9 +1,9 @@ package amerifrance.guideapi.page; -import amerifrance.guideapi.api.impl.Book; -import amerifrance.guideapi.api.impl.abstraction.CategoryAbstract; -import amerifrance.guideapi.api.impl.abstraction.EntryAbstract; -import amerifrance.guideapi.api.util.GuiHelper; +import api.impl.Book; +import api.impl.abstraction.CategoryAbstract; +import api.impl.abstraction.EntryAbstract; +import api.util.GuiHelper; import amerifrance.guideapi.gui.GuiBase; import net.minecraft.block.Block; import net.minecraft.client.gui.FontRenderer; diff --git a/src/main/java/amerifrance/guideapi/page/PageSound.java b/src/main/java/amerifrance/guideapi/page/PageSound.java index 3bfc9f11..b040649f 100644 --- a/src/main/java/amerifrance/guideapi/page/PageSound.java +++ b/src/main/java/amerifrance/guideapi/page/PageSound.java @@ -1,19 +1,17 @@ package amerifrance.guideapi.page; import amerifrance.guideapi.GuideMod; -import amerifrance.guideapi.api.IPage; -import amerifrance.guideapi.api.impl.Book; -import amerifrance.guideapi.api.impl.Page; -import amerifrance.guideapi.api.impl.abstraction.CategoryAbstract; -import amerifrance.guideapi.api.impl.abstraction.EntryAbstract; +import api.IPage; +import api.impl.Book; +import api.impl.Page; +import api.impl.abstraction.CategoryAbstract; +import api.impl.abstraction.EntryAbstract; import amerifrance.guideapi.gui.GuiBase; import amerifrance.guideapi.gui.GuiEntry; import net.minecraft.client.gui.FontRenderer; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.SoundEvent; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class PageSound extends Page { diff --git a/src/main/java/amerifrance/guideapi/page/PageText.java b/src/main/java/amerifrance/guideapi/page/PageText.java index 078fb600..7982e202 100644 --- a/src/main/java/amerifrance/guideapi/page/PageText.java +++ b/src/main/java/amerifrance/guideapi/page/PageText.java @@ -1,10 +1,10 @@ package amerifrance.guideapi.page; -import amerifrance.guideapi.api.impl.Book; -import amerifrance.guideapi.api.impl.Page; -import amerifrance.guideapi.api.impl.abstraction.CategoryAbstract; -import amerifrance.guideapi.api.impl.abstraction.EntryAbstract; -import amerifrance.guideapi.api.util.PageHelper; +import api.impl.Book; +import api.impl.Page; +import api.impl.abstraction.CategoryAbstract; +import api.impl.abstraction.EntryAbstract; +import api.util.PageHelper; import amerifrance.guideapi.gui.GuiBase; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.resources.I18n; diff --git a/src/main/java/amerifrance/guideapi/page/PageTextImage.java b/src/main/java/amerifrance/guideapi/page/PageTextImage.java index a8f51927..fcf141c7 100644 --- a/src/main/java/amerifrance/guideapi/page/PageTextImage.java +++ b/src/main/java/amerifrance/guideapi/page/PageTextImage.java @@ -1,10 +1,10 @@ package amerifrance.guideapi.page; -import amerifrance.guideapi.api.impl.Book; -import amerifrance.guideapi.api.impl.Page; -import amerifrance.guideapi.api.impl.abstraction.CategoryAbstract; -import amerifrance.guideapi.api.impl.abstraction.EntryAbstract; -import amerifrance.guideapi.api.util.GuiHelper; +import api.impl.Book; +import api.impl.Page; +import api.impl.abstraction.CategoryAbstract; +import api.impl.abstraction.EntryAbstract; +import api.util.GuiHelper; import amerifrance.guideapi.gui.GuiBase; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; diff --git a/src/main/java/amerifrance/guideapi/page/reciperenderer/BasicRecipeRenderer.java b/src/main/java/amerifrance/guideapi/page/reciperenderer/BasicRecipeRenderer.java index ddf74344..23be4441 100644 --- a/src/main/java/amerifrance/guideapi/page/reciperenderer/BasicRecipeRenderer.java +++ b/src/main/java/amerifrance/guideapi/page/reciperenderer/BasicRecipeRenderer.java @@ -1,12 +1,12 @@ package amerifrance.guideapi.page.reciperenderer; -import amerifrance.guideapi.api.IRecipeRenderer.RecipeRendererBase; -import amerifrance.guideapi.api.SubTexture; -import amerifrance.guideapi.api.impl.Book; -import amerifrance.guideapi.api.impl.abstraction.CategoryAbstract; -import amerifrance.guideapi.api.impl.abstraction.EntryAbstract; -import amerifrance.guideapi.api.util.GuiHelper; -import amerifrance.guideapi.api.util.TextHelper; +import api.IRecipeRenderer.RecipeRendererBase; +import api.SubTexture; +import api.impl.Book; +import api.impl.abstraction.CategoryAbstract; +import api.impl.abstraction.EntryAbstract; +import api.util.GuiHelper; +import api.util.TextHelper; import amerifrance.guideapi.gui.GuiBase; import com.google.common.base.Strings; import net.minecraft.client.Minecraft; diff --git a/src/main/java/amerifrance/guideapi/page/reciperenderer/ShapedRecipesRenderer.java b/src/main/java/amerifrance/guideapi/page/reciperenderer/ShapedRecipesRenderer.java index 36e5591b..b3c3781e 100644 --- a/src/main/java/amerifrance/guideapi/page/reciperenderer/ShapedRecipesRenderer.java +++ b/src/main/java/amerifrance/guideapi/page/reciperenderer/ShapedRecipesRenderer.java @@ -1,9 +1,9 @@ package amerifrance.guideapi.page.reciperenderer; -import amerifrance.guideapi.api.impl.Book; -import amerifrance.guideapi.api.impl.abstraction.CategoryAbstract; -import amerifrance.guideapi.api.impl.abstraction.EntryAbstract; -import amerifrance.guideapi.api.util.GuiHelper; +import api.impl.Book; +import api.impl.abstraction.CategoryAbstract; +import api.impl.abstraction.EntryAbstract; +import api.util.GuiHelper; import amerifrance.guideapi.gui.GuiBase; import net.minecraft.client.gui.FontRenderer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/amerifrance/guideapi/page/reciperenderer/ShapelessRecipesRenderer.java b/src/main/java/amerifrance/guideapi/page/reciperenderer/ShapelessRecipesRenderer.java index 10733a3b..a99a78c0 100644 --- a/src/main/java/amerifrance/guideapi/page/reciperenderer/ShapelessRecipesRenderer.java +++ b/src/main/java/amerifrance/guideapi/page/reciperenderer/ShapelessRecipesRenderer.java @@ -1,10 +1,10 @@ package amerifrance.guideapi.page.reciperenderer; -import amerifrance.guideapi.api.impl.Book; -import amerifrance.guideapi.api.impl.abstraction.CategoryAbstract; -import amerifrance.guideapi.api.impl.abstraction.EntryAbstract; -import amerifrance.guideapi.api.util.GuiHelper; -import amerifrance.guideapi.api.util.TextHelper; +import api.impl.Book; +import api.impl.abstraction.CategoryAbstract; +import api.impl.abstraction.EntryAbstract; +import api.util.GuiHelper; +import api.util.TextHelper; import amerifrance.guideapi.gui.GuiBase; import net.minecraft.client.gui.FontRenderer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/amerifrance/guideapi/proxy/ClientProxy.java b/src/main/java/amerifrance/guideapi/proxy/ClientProxy.java index a47d7ef8..0989ba40 100644 --- a/src/main/java/amerifrance/guideapi/proxy/ClientProxy.java +++ b/src/main/java/amerifrance/guideapi/proxy/ClientProxy.java @@ -1,11 +1,11 @@ package amerifrance.guideapi.proxy; -import amerifrance.guideapi.api.BookEvent; -import amerifrance.guideapi.api.GuideAPI; -import amerifrance.guideapi.api.IGuideItem; -import amerifrance.guideapi.api.impl.Book; -import amerifrance.guideapi.api.impl.abstraction.CategoryAbstract; -import amerifrance.guideapi.api.impl.abstraction.EntryAbstract; +import api.BookEvent; +import api.GuideAPI; +import api.IGuideItem; +import api.impl.Book; +import api.impl.abstraction.CategoryAbstract; +import api.impl.abstraction.EntryAbstract; import amerifrance.guideapi.gui.GuiEntry; import net.minecraft.client.Minecraft; import net.minecraft.client.audio.PositionedSoundRecord; diff --git a/src/main/java/amerifrance/guideapi/proxy/CommonProxy.java b/src/main/java/amerifrance/guideapi/proxy/CommonProxy.java index e78b6f32..73c31602 100644 --- a/src/main/java/amerifrance/guideapi/proxy/CommonProxy.java +++ b/src/main/java/amerifrance/guideapi/proxy/CommonProxy.java @@ -1,11 +1,11 @@ package amerifrance.guideapi.proxy; -import amerifrance.guideapi.api.GuideAPI; -import amerifrance.guideapi.api.IGuideItem; -import amerifrance.guideapi.api.impl.Book; -import amerifrance.guideapi.api.impl.abstraction.CategoryAbstract; -import amerifrance.guideapi.api.impl.abstraction.EntryAbstract; -import amerifrance.guideapi.api.util.NBTBookTags; +import api.GuideAPI; +import api.IGuideItem; +import api.impl.Book; +import api.impl.abstraction.CategoryAbstract; +import api.impl.abstraction.EntryAbstract; +import api.util.NBTBookTags; import amerifrance.guideapi.gui.GuiCategory; import amerifrance.guideapi.gui.GuiEntry; import amerifrance.guideapi.gui.GuiHome; diff --git a/src/main/java/amerifrance/guideapi/test/TestBook.java b/src/main/java/amerifrance/guideapi/test/TestBook.java index 92ea97fa..78df4bd0 100644 --- a/src/main/java/amerifrance/guideapi/test/TestBook.java +++ b/src/main/java/amerifrance/guideapi/test/TestBook.java @@ -1,12 +1,12 @@ package amerifrance.guideapi.test; -import amerifrance.guideapi.api.GuideBook; -import amerifrance.guideapi.api.IGuideBook; -import amerifrance.guideapi.api.IPage; -import amerifrance.guideapi.api.impl.Book; -import amerifrance.guideapi.api.impl.Entry; -import amerifrance.guideapi.api.impl.abstraction.CategoryAbstract; -import amerifrance.guideapi.api.impl.abstraction.EntryAbstract; +import api.GuideBook; +import api.IGuideBook; +import api.IPage; +import api.impl.Book; +import api.impl.Entry; +import api.impl.abstraction.CategoryAbstract; +import api.impl.abstraction.EntryAbstract; import amerifrance.guideapi.category.CategoryItemStack; import amerifrance.guideapi.entry.EntryItemStack; import amerifrance.guideapi.page.PageFurnaceRecipe; diff --git a/src/main/java/amerifrance/guideapi/test/TestBook2.java b/src/main/java/amerifrance/guideapi/test/TestBook2.java index 12191e52..f1dd8863 100644 --- a/src/main/java/amerifrance/guideapi/test/TestBook2.java +++ b/src/main/java/amerifrance/guideapi/test/TestBook2.java @@ -1,9 +1,9 @@ package amerifrance.guideapi.test; -import amerifrance.guideapi.api.GuideBook; -import amerifrance.guideapi.api.IGuideBook; -import amerifrance.guideapi.api.impl.Book; -import amerifrance.guideapi.api.impl.abstraction.CategoryAbstract; +import api.GuideBook; +import api.IGuideBook; +import api.impl.Book; +import api.impl.abstraction.CategoryAbstract; import amerifrance.guideapi.category.CategoryItemStack; import amerifrance.guideapi.entry.EntryItemStack; import amerifrance.guideapi.page.*; diff --git a/src/main/java/amerifrance/guideapi/test/TestBook3.java b/src/main/java/amerifrance/guideapi/test/TestBook3.java index 62758d5f..5adcb6f5 100644 --- a/src/main/java/amerifrance/guideapi/test/TestBook3.java +++ b/src/main/java/amerifrance/guideapi/test/TestBook3.java @@ -1,12 +1,12 @@ package amerifrance.guideapi.test; import amerifrance.guideapi.GuideMod; -import amerifrance.guideapi.api.BookEvent; -import amerifrance.guideapi.api.GuideBook; -import amerifrance.guideapi.api.IGuideBook; -import amerifrance.guideapi.api.impl.Book; -import amerifrance.guideapi.api.impl.BookBinder; -import amerifrance.guideapi.api.impl.abstraction.CategoryAbstract; +import api.BookEvent; +import api.GuideBook; +import api.IGuideBook; +import api.impl.Book; +import api.impl.BookBinder; +import api.impl.abstraction.CategoryAbstract; import amerifrance.guideapi.category.CategoryItemStack; import amerifrance.guideapi.entry.EntryItemStack; import amerifrance.guideapi.page.*; diff --git a/src/main/java/amerifrance/guideapi/util/APISetter.java b/src/main/java/amerifrance/guideapi/util/APISetter.java index 86b53c95..c8f06786 100644 --- a/src/main/java/amerifrance/guideapi/util/APISetter.java +++ b/src/main/java/amerifrance/guideapi/util/APISetter.java @@ -1,8 +1,8 @@ package amerifrance.guideapi.util; import amerifrance.guideapi.GuideMod; -import amerifrance.guideapi.api.GuideAPI; -import amerifrance.guideapi.api.impl.Book; +import api.GuideAPI; +import api.impl.Book; import com.google.common.base.Throwables; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/amerifrance/guideapi/util/AnnotationHandler.java b/src/main/java/amerifrance/guideapi/util/AnnotationHandler.java index 93b12dfd..e2203d15 100644 --- a/src/main/java/amerifrance/guideapi/util/AnnotationHandler.java +++ b/src/main/java/amerifrance/guideapi/util/AnnotationHandler.java @@ -1,9 +1,9 @@ package amerifrance.guideapi.util; -import amerifrance.guideapi.api.GuideAPI; -import amerifrance.guideapi.api.GuideBook; -import amerifrance.guideapi.api.IGuideBook; -import amerifrance.guideapi.api.impl.Book; +import api.GuideAPI; +import api.GuideBook; +import api.IGuideBook; +import api.impl.Book; import com.google.common.collect.Lists; import net.minecraftforge.fml.common.discovery.ASMDataTable; import net.minecraftforge.fml.common.discovery.asm.ModAnnotation; diff --git a/src/main/java/amerifrance/guideapi/util/EventHandler.java b/src/main/java/amerifrance/guideapi/util/EventHandler.java index 428891c1..5de2071f 100644 --- a/src/main/java/amerifrance/guideapi/util/EventHandler.java +++ b/src/main/java/amerifrance/guideapi/util/EventHandler.java @@ -2,13 +2,13 @@ import amerifrance.guideapi.ConfigHandler; import amerifrance.guideapi.GuideMod; -import amerifrance.guideapi.api.GuideAPI; -import amerifrance.guideapi.api.IGuideItem; -import amerifrance.guideapi.api.IGuideLinked; -import amerifrance.guideapi.api.IInfoRenderer; -import amerifrance.guideapi.api.impl.Book; -import amerifrance.guideapi.api.impl.abstraction.CategoryAbstract; -import amerifrance.guideapi.api.util.TextHelper; +import api.GuideAPI; +import api.IGuideItem; +import api.IGuideLinked; +import api.IInfoRenderer; +import api.impl.Book; +import api.impl.abstraction.CategoryAbstract; +import api.util.TextHelper; import com.google.common.base.Strings; import com.google.common.collect.Multimap; import net.minecraft.block.Block; diff --git a/src/main/java/amerifrance/guideapi/wrapper/CategoryWrapper.java b/src/main/java/amerifrance/guideapi/wrapper/CategoryWrapper.java index 1ce8312b..d61b501b 100644 --- a/src/main/java/amerifrance/guideapi/wrapper/CategoryWrapper.java +++ b/src/main/java/amerifrance/guideapi/wrapper/CategoryWrapper.java @@ -1,8 +1,8 @@ package amerifrance.guideapi.wrapper; -import amerifrance.guideapi.api.impl.Book; -import amerifrance.guideapi.api.impl.abstraction.CategoryAbstract; -import amerifrance.guideapi.api.util.GuiHelper; +import api.impl.Book; +import api.impl.abstraction.CategoryAbstract; +import api.util.GuiHelper; import amerifrance.guideapi.gui.GuiBase; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.renderer.RenderItem; diff --git a/src/main/java/amerifrance/guideapi/wrapper/EntryWrapper.java b/src/main/java/amerifrance/guideapi/wrapper/EntryWrapper.java index 5ef8dce2..9a8d2b6d 100644 --- a/src/main/java/amerifrance/guideapi/wrapper/EntryWrapper.java +++ b/src/main/java/amerifrance/guideapi/wrapper/EntryWrapper.java @@ -1,9 +1,9 @@ package amerifrance.guideapi.wrapper; -import amerifrance.guideapi.api.impl.Book; -import amerifrance.guideapi.api.impl.abstraction.CategoryAbstract; -import amerifrance.guideapi.api.impl.abstraction.EntryAbstract; -import amerifrance.guideapi.api.util.GuiHelper; +import api.impl.Book; +import api.impl.abstraction.CategoryAbstract; +import api.impl.abstraction.EntryAbstract; +import api.util.GuiHelper; import amerifrance.guideapi.gui.GuiBase; import amerifrance.guideapi.gui.GuiCategory; import net.minecraft.client.Minecraft; diff --git a/src/main/java/amerifrance/guideapi/wrapper/PageWrapper.java b/src/main/java/amerifrance/guideapi/wrapper/PageWrapper.java index 5a68ec6b..e19843da 100644 --- a/src/main/java/amerifrance/guideapi/wrapper/PageWrapper.java +++ b/src/main/java/amerifrance/guideapi/wrapper/PageWrapper.java @@ -1,9 +1,9 @@ package amerifrance.guideapi.wrapper; -import amerifrance.guideapi.api.IPage; -import amerifrance.guideapi.api.impl.Book; -import amerifrance.guideapi.api.impl.abstraction.CategoryAbstract; -import amerifrance.guideapi.api.impl.abstraction.EntryAbstract; +import api.IPage; +import api.impl.Book; +import api.impl.abstraction.CategoryAbstract; +import api.impl.abstraction.EntryAbstract; import amerifrance.guideapi.gui.GuiBase; import amerifrance.guideapi.gui.GuiEntry; import net.minecraft.client.Minecraft; diff --git a/src/api/java/amerifrance/guideapi/api/BookEvent.java b/src/main/java/api/BookEvent.java similarity index 96% rename from src/api/java/amerifrance/guideapi/api/BookEvent.java rename to src/main/java/api/BookEvent.java index a92ad2ff..07d0db15 100644 --- a/src/api/java/amerifrance/guideapi/api/BookEvent.java +++ b/src/main/java/api/BookEvent.java @@ -1,6 +1,6 @@ -package amerifrance.guideapi.api; +package api; -import amerifrance.guideapi.api.impl.Book; +import api.impl.Book; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.text.ITextComponent; diff --git a/src/api/java/amerifrance/guideapi/api/GuideAPI.java b/src/main/java/api/GuideAPI.java similarity index 97% rename from src/api/java/amerifrance/guideapi/api/GuideAPI.java rename to src/main/java/api/GuideAPI.java index 7eb5bf37..fa9ee88e 100644 --- a/src/api/java/amerifrance/guideapi/api/GuideAPI.java +++ b/src/main/java/api/GuideAPI.java @@ -1,6 +1,6 @@ -package amerifrance.guideapi.api; +package api; -import amerifrance.guideapi.api.impl.Book; +import api.impl.Book; import com.google.common.collect.*; import net.minecraft.block.Block; import net.minecraft.client.renderer.model.ModelResourceLocation; diff --git a/src/api/java/amerifrance/guideapi/api/GuideBook.java b/src/main/java/api/GuideBook.java similarity index 92% rename from src/api/java/amerifrance/guideapi/api/GuideBook.java rename to src/main/java/api/GuideBook.java index 97890413..a88959bd 100644 --- a/src/api/java/amerifrance/guideapi/api/GuideBook.java +++ b/src/main/java/api/GuideBook.java @@ -1,4 +1,4 @@ -package amerifrance.guideapi.api; +package api; import net.minecraftforge.eventbus.api.EventPriority; diff --git a/src/api/java/amerifrance/guideapi/api/IGuideBook.java b/src/main/java/api/IGuideBook.java similarity index 94% rename from src/api/java/amerifrance/guideapi/api/IGuideBook.java rename to src/main/java/api/IGuideBook.java index d4b8e11d..401c6b90 100644 --- a/src/api/java/amerifrance/guideapi/api/IGuideBook.java +++ b/src/main/java/api/IGuideBook.java @@ -1,6 +1,6 @@ -package amerifrance.guideapi.api; +package api; -import amerifrance.guideapi.api.impl.Book; +import api.impl.Book; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraftforge.api.distmarker.Dist; diff --git a/src/api/java/amerifrance/guideapi/api/IGuideItem.java b/src/main/java/api/IGuideItem.java similarity index 58% rename from src/api/java/amerifrance/guideapi/api/IGuideItem.java rename to src/main/java/api/IGuideItem.java index 60c55150..1ed345e7 100644 --- a/src/api/java/amerifrance/guideapi/api/IGuideItem.java +++ b/src/main/java/api/IGuideItem.java @@ -1,6 +1,6 @@ -package amerifrance.guideapi.api; +package api; -import amerifrance.guideapi.api.impl.Book; +import api.impl.Book; import net.minecraft.item.ItemStack; public interface IGuideItem { diff --git a/src/api/java/amerifrance/guideapi/api/IGuideLinked.java b/src/main/java/api/IGuideLinked.java similarity index 95% rename from src/api/java/amerifrance/guideapi/api/IGuideLinked.java rename to src/main/java/api/IGuideLinked.java index f1a3a772..b7850284 100644 --- a/src/api/java/amerifrance/guideapi/api/IGuideLinked.java +++ b/src/main/java/api/IGuideLinked.java @@ -1,4 +1,4 @@ -package amerifrance.guideapi.api; +package api; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; diff --git a/src/api/java/amerifrance/guideapi/api/IInfoRenderer.java b/src/main/java/api/IInfoRenderer.java similarity index 91% rename from src/api/java/amerifrance/guideapi/api/IInfoRenderer.java rename to src/main/java/api/IInfoRenderer.java index 55af3ab8..fbb5dc8b 100644 --- a/src/api/java/amerifrance/guideapi/api/IInfoRenderer.java +++ b/src/main/java/api/IInfoRenderer.java @@ -1,6 +1,6 @@ -package amerifrance.guideapi.api; +package api; -import amerifrance.guideapi.api.impl.Book; +import api.impl.Book; import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.util.math.BlockPos; @@ -14,7 +14,7 @@ * Used to render information on screen about a block while a player is looking at and holding the guide. This is only * called on the client. *

- * Use {@link GuideAPI#registerInfoRenderer(amerifrance.guideapi.api.impl.Book, IInfoRenderer, Class...)} to register your + * Use {@link GuideAPI#registerInfoRenderer(Book, IInfoRenderer, Class...)} to register your * handler. You can also implement {@link Block} on a block. *

* Some example usages can be found in {@link amerifrance.guideapi.info} diff --git a/src/api/java/amerifrance/guideapi/api/IPage.java b/src/main/java/api/IPage.java similarity index 86% rename from src/api/java/amerifrance/guideapi/api/IPage.java rename to src/main/java/api/IPage.java index f94d669d..d869b193 100644 --- a/src/api/java/amerifrance/guideapi/api/IPage.java +++ b/src/main/java/api/IPage.java @@ -1,8 +1,8 @@ -package amerifrance.guideapi.api; +package api; -import amerifrance.guideapi.api.impl.Book; -import amerifrance.guideapi.api.impl.abstraction.CategoryAbstract; -import amerifrance.guideapi.api.impl.abstraction.EntryAbstract; +import api.impl.Book; +import api.impl.abstraction.CategoryAbstract; +import api.impl.abstraction.EntryAbstract; import net.minecraft.client.gui.FontRenderer; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; diff --git a/src/api/java/amerifrance/guideapi/api/IRecipeRenderer.java b/src/main/java/api/IRecipeRenderer.java similarity index 85% rename from src/api/java/amerifrance/guideapi/api/IRecipeRenderer.java rename to src/main/java/api/IRecipeRenderer.java index 075ea8e1..b9de4f17 100644 --- a/src/api/java/amerifrance/guideapi/api/IRecipeRenderer.java +++ b/src/main/java/api/IRecipeRenderer.java @@ -1,8 +1,8 @@ -package amerifrance.guideapi.api; +package api; -import amerifrance.guideapi.api.impl.Book; -import amerifrance.guideapi.api.impl.abstraction.CategoryAbstract; -import amerifrance.guideapi.api.impl.abstraction.EntryAbstract; +import api.impl.Book; +import api.impl.abstraction.CategoryAbstract; +import api.impl.abstraction.EntryAbstract; import com.google.common.collect.Lists; import net.minecraft.client.gui.FontRenderer; import net.minecraft.item.crafting.IRecipe; diff --git a/src/api/java/amerifrance/guideapi/api/SubTexture.java b/src/main/java/api/SubTexture.java similarity index 99% rename from src/api/java/amerifrance/guideapi/api/SubTexture.java rename to src/main/java/api/SubTexture.java index 00ed6393..03fa136a 100644 --- a/src/api/java/amerifrance/guideapi/api/SubTexture.java +++ b/src/main/java/api/SubTexture.java @@ -1,4 +1,4 @@ -package amerifrance.guideapi.api; +package api; import com.mojang.blaze3d.platform.GlStateManager; import net.minecraft.client.Minecraft; diff --git a/src/api/java/amerifrance/guideapi/api/button/ButtonGuideAPI.java b/src/main/java/api/button/ButtonGuideAPI.java similarity index 88% rename from src/api/java/amerifrance/guideapi/api/button/ButtonGuideAPI.java rename to src/main/java/api/button/ButtonGuideAPI.java index c17caddb..fa9d775d 100644 --- a/src/api/java/amerifrance/guideapi/api/button/ButtonGuideAPI.java +++ b/src/main/java/api/button/ButtonGuideAPI.java @@ -1,4 +1,4 @@ -package amerifrance.guideapi.api.button; +package api.button; import amerifrance.guideapi.gui.GuiBase; import net.minecraft.client.gui.widget.button.Button; diff --git a/src/api/java/amerifrance/guideapi/api/impl/Book.java b/src/main/java/api/impl/Book.java similarity index 98% rename from src/api/java/amerifrance/guideapi/api/impl/Book.java rename to src/main/java/api/impl/Book.java index a7b12e24..24715a29 100644 --- a/src/api/java/amerifrance/guideapi/api/impl/Book.java +++ b/src/main/java/api/impl/Book.java @@ -1,7 +1,7 @@ -package amerifrance.guideapi.api.impl; +package api.impl; -import amerifrance.guideapi.api.impl.abstraction.CategoryAbstract; -import amerifrance.guideapi.api.util.TextHelper; +import api.impl.abstraction.CategoryAbstract; +import api.util.TextHelper; import com.google.common.base.Joiner; import com.google.common.collect.Lists; import net.minecraft.creativetab.CreativeTabs; diff --git a/src/api/java/amerifrance/guideapi/api/impl/BookBinder.java b/src/main/java/api/impl/BookBinder.java similarity index 98% rename from src/api/java/amerifrance/guideapi/api/impl/BookBinder.java rename to src/main/java/api/impl/BookBinder.java index 288469c6..58ed5523 100644 --- a/src/api/java/amerifrance/guideapi/api/impl/BookBinder.java +++ b/src/main/java/api/impl/BookBinder.java @@ -1,6 +1,6 @@ -package amerifrance.guideapi.api.impl; +package api.impl; -import amerifrance.guideapi.api.impl.abstraction.CategoryAbstract; +import api.impl.abstraction.CategoryAbstract; import com.google.common.base.Strings; import com.google.common.collect.Lists; import net.minecraft.creativetab.CreativeTabs; diff --git a/src/api/java/amerifrance/guideapi/api/impl/Category.java b/src/main/java/api/impl/Category.java similarity index 86% rename from src/api/java/amerifrance/guideapi/api/impl/Category.java rename to src/main/java/api/impl/Category.java index 14805991..01094425 100644 --- a/src/api/java/amerifrance/guideapi/api/impl/Category.java +++ b/src/main/java/api/impl/Category.java @@ -1,7 +1,7 @@ -package amerifrance.guideapi.api.impl; +package api.impl; -import amerifrance.guideapi.api.impl.abstraction.CategoryAbstract; -import amerifrance.guideapi.api.impl.abstraction.EntryAbstract; +import api.impl.abstraction.CategoryAbstract; +import api.impl.abstraction.EntryAbstract; import amerifrance.guideapi.gui.GuiBase; import amerifrance.guideapi.gui.GuiCategory; import amerifrance.guideapi.gui.GuiHome; @@ -10,8 +10,6 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import java.util.Map; diff --git a/src/api/java/amerifrance/guideapi/api/impl/Entry.java b/src/main/java/api/impl/Entry.java similarity index 93% rename from src/api/java/amerifrance/guideapi/api/impl/Entry.java rename to src/main/java/api/impl/Entry.java index 558b774b..1c79a34a 100644 --- a/src/api/java/amerifrance/guideapi/api/impl/Entry.java +++ b/src/main/java/api/impl/Entry.java @@ -1,9 +1,9 @@ -package amerifrance.guideapi.api.impl; +package api.impl; -import amerifrance.guideapi.api.IPage; -import amerifrance.guideapi.api.impl.abstraction.CategoryAbstract; -import amerifrance.guideapi.api.impl.abstraction.EntryAbstract; -import amerifrance.guideapi.api.util.GuiHelper; +import api.IPage; +import api.impl.abstraction.CategoryAbstract; +import api.impl.abstraction.EntryAbstract; +import api.util.GuiHelper; import amerifrance.guideapi.gui.GuiBase; import amerifrance.guideapi.gui.GuiCategory; import amerifrance.guideapi.gui.GuiEntry; diff --git a/src/api/java/amerifrance/guideapi/api/impl/Page.java b/src/main/java/api/impl/Page.java similarity index 85% rename from src/api/java/amerifrance/guideapi/api/impl/Page.java rename to src/main/java/api/impl/Page.java index 34a58251..97f853c0 100644 --- a/src/api/java/amerifrance/guideapi/api/impl/Page.java +++ b/src/main/java/api/impl/Page.java @@ -1,15 +1,13 @@ -package amerifrance.guideapi.api.impl; +package api.impl; -import amerifrance.guideapi.api.IPage; -import amerifrance.guideapi.api.impl.abstraction.CategoryAbstract; -import amerifrance.guideapi.api.impl.abstraction.EntryAbstract; +import api.IPage; +import api.impl.abstraction.CategoryAbstract; +import api.impl.abstraction.EntryAbstract; import amerifrance.guideapi.gui.GuiBase; import amerifrance.guideapi.gui.GuiEntry; import net.minecraft.client.gui.FontRenderer; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class Page implements IPage { diff --git a/src/api/java/amerifrance/guideapi/api/impl/abstraction/CategoryAbstract.java b/src/main/java/api/impl/abstraction/CategoryAbstract.java similarity index 93% rename from src/api/java/amerifrance/guideapi/api/impl/abstraction/CategoryAbstract.java rename to src/main/java/api/impl/abstraction/CategoryAbstract.java index c9577c4f..96678e0c 100644 --- a/src/api/java/amerifrance/guideapi/api/impl/abstraction/CategoryAbstract.java +++ b/src/main/java/api/impl/abstraction/CategoryAbstract.java @@ -1,7 +1,7 @@ -package amerifrance.guideapi.api.impl.abstraction; +package api.impl.abstraction; -import amerifrance.guideapi.api.impl.Book; -import amerifrance.guideapi.api.util.TextHelper; +import api.impl.Book; +import api.util.TextHelper; import amerifrance.guideapi.gui.GuiBase; import amerifrance.guideapi.gui.GuiHome; import com.google.common.base.Strings; @@ -11,8 +11,6 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import java.util.List; import java.util.Map; @@ -133,21 +131,21 @@ public List getTooltip() { return Lists.newArrayList(getLocalizedName()); } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public abstract void draw(Book book, int categoryX, int categoryY, int categoryWidth, int categoryHeight, int mouseX, int mouseY, GuiBase guiBase, boolean drawOnLeft, RenderItem renderItem); - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public abstract void drawExtras(Book book, int categoryX, int categoryY, int categoryWidth, int categoryHeight, int mouseX, int mouseY, GuiBase guiBase, boolean drawOnLeft, RenderItem renderItem); public abstract boolean canSee(PlayerEntity player, ItemStack bookStack); - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public abstract void onLeftClicked(Book book, int mouseX, int mouseY, PlayerEntity player, ItemStack bookStack); - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public abstract void onRightClicked(Book book, int mouseX, int mouseY, PlayerEntity player, ItemStack bookStack); - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public abstract void onInit(Book book, GuiHome guiHome, PlayerEntity player, ItemStack bookStack); @Override diff --git a/src/api/java/amerifrance/guideapi/api/impl/abstraction/EntryAbstract.java b/src/main/java/api/impl/abstraction/EntryAbstract.java similarity index 87% rename from src/api/java/amerifrance/guideapi/api/impl/abstraction/EntryAbstract.java rename to src/main/java/api/impl/abstraction/EntryAbstract.java index 122bf408..71d8a66a 100644 --- a/src/api/java/amerifrance/guideapi/api/impl/abstraction/EntryAbstract.java +++ b/src/main/java/api/impl/abstraction/EntryAbstract.java @@ -1,16 +1,14 @@ -package amerifrance.guideapi.api.impl.abstraction; +package api.impl.abstraction; -import amerifrance.guideapi.api.IPage; -import amerifrance.guideapi.api.impl.Book; -import amerifrance.guideapi.api.util.TextHelper; +import api.IPage; +import api.impl.Book; +import api.util.TextHelper; import amerifrance.guideapi.gui.GuiBase; import amerifrance.guideapi.gui.GuiCategory; import com.google.common.collect.Lists; import net.minecraft.client.gui.FontRenderer; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import java.util.List; @@ -58,21 +56,21 @@ public String getLocalizedName() { return TextHelper.localizeEffect(name); } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public abstract void draw(Book book, CategoryAbstract category, int entryX, int entryY, int entryWidth, int entryHeight, int mouseX, int mouseY, GuiBase guiBase, FontRenderer renderer); - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public abstract void drawExtras(Book book, CategoryAbstract category, int entryX, int entryY, int entryWidth, int entryHeight, int mouseX, int mouseY, GuiBase guiBase, FontRenderer renderer); public abstract boolean canSee(PlayerEntity player, ItemStack bookStack); - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public abstract void onLeftClicked(Book book, CategoryAbstract category, int mouseX, int mouseY, PlayerEntity player, GuiCategory guiCategory); - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public abstract void onRightClicked(Book book, CategoryAbstract category, int mouseX, int mouseY, PlayerEntity player, GuiCategory guiCategory); - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public abstract void onInit(Book book, CategoryAbstract category, GuiCategory guiCategory, PlayerEntity player, ItemStack bookStack); @Override diff --git a/src/api/java/amerifrance/guideapi/api/package-info.java b/src/main/java/api/package-info.java similarity index 78% rename from src/api/java/amerifrance/guideapi/api/package-info.java rename to src/main/java/api/package-info.java index 2eb9dd9b..aa8728bd 100644 --- a/src/api/java/amerifrance/guideapi/api/package-info.java +++ b/src/main/java/api/package-info.java @@ -1,4 +1,4 @@ @API(owner = "guideapi", apiVersion = "@API_VERSION@", provides = "Guide-API|API") -package amerifrance.guideapi.api; +package api; import net.minecraftforge.fml.common.API; \ No newline at end of file diff --git a/src/api/java/amerifrance/guideapi/api/util/BookHelper.java b/src/main/java/api/util/BookHelper.java similarity index 73% rename from src/api/java/amerifrance/guideapi/api/util/BookHelper.java rename to src/main/java/api/util/BookHelper.java index 86bd5a0e..44d6b183 100644 --- a/src/api/java/amerifrance/guideapi/api/util/BookHelper.java +++ b/src/main/java/api/util/BookHelper.java @@ -1,8 +1,8 @@ -package amerifrance.guideapi.api.util; +package api.util; -import amerifrance.guideapi.api.impl.Book; -import amerifrance.guideapi.api.impl.abstraction.CategoryAbstract; -import amerifrance.guideapi.api.impl.abstraction.EntryAbstract; +import api.impl.Book; +import api.impl.abstraction.CategoryAbstract; +import api.impl.abstraction.EntryAbstract; public class BookHelper { diff --git a/src/api/java/amerifrance/guideapi/api/util/GuiHelper.java b/src/main/java/api/util/GuiHelper.java similarity index 99% rename from src/api/java/amerifrance/guideapi/api/util/GuiHelper.java rename to src/main/java/api/util/GuiHelper.java index 8e863192..fcf6b150 100644 --- a/src/api/java/amerifrance/guideapi/api/util/GuiHelper.java +++ b/src/main/java/api/util/GuiHelper.java @@ -1,4 +1,4 @@ -package amerifrance.guideapi.api.util; +package api.util; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.RenderHelper; diff --git a/src/api/java/amerifrance/guideapi/api/util/NBTBookTags.java b/src/main/java/api/util/NBTBookTags.java similarity index 91% rename from src/api/java/amerifrance/guideapi/api/util/NBTBookTags.java rename to src/main/java/api/util/NBTBookTags.java index cfacf8e2..a44a61c7 100644 --- a/src/api/java/amerifrance/guideapi/api/util/NBTBookTags.java +++ b/src/main/java/api/util/NBTBookTags.java @@ -1,4 +1,4 @@ -package amerifrance.guideapi.api.util; +package api.util; public class NBTBookTags { diff --git a/src/api/java/amerifrance/guideapi/api/util/PageHelper.java b/src/main/java/api/util/PageHelper.java similarity index 96% rename from src/api/java/amerifrance/guideapi/api/util/PageHelper.java rename to src/main/java/api/util/PageHelper.java index f4cf31ea..a57f9425 100644 --- a/src/api/java/amerifrance/guideapi/api/util/PageHelper.java +++ b/src/main/java/api/util/PageHelper.java @@ -1,7 +1,7 @@ -package amerifrance.guideapi.api.util; +package api.util; -import amerifrance.guideapi.api.IPage; -import amerifrance.guideapi.api.impl.Page; +import api.IPage; +import api.impl.Page; import amerifrance.guideapi.gui.GuiBase; import amerifrance.guideapi.page.PageItemStack; import amerifrance.guideapi.page.PageText; diff --git a/src/api/java/amerifrance/guideapi/api/util/TextHelper.java b/src/main/java/api/util/TextHelper.java similarity index 98% rename from src/api/java/amerifrance/guideapi/api/util/TextHelper.java rename to src/main/java/api/util/TextHelper.java index 01148018..70c06a1d 100644 --- a/src/api/java/amerifrance/guideapi/api/util/TextHelper.java +++ b/src/main/java/api/util/TextHelper.java @@ -1,4 +1,4 @@ -package amerifrance.guideapi.api.util; +package api.util; import net.minecraft.util.text.translation.I18n; import org.apache.commons.lang3.text.WordUtils; From a05d2c2a5a0977e5d5b317f50aa396a8e4683056 Mon Sep 17 00:00:00 2001 From: maxanier Date: Sat, 21 Mar 2020 00:52:51 +0100 Subject: [PATCH 03/28] More updates. Still very much in progress --- .../guideapi/RegistrarGuideAPI.java | 7 +- .../guideapi/button/ButtonBack.java | 4 +- .../guideapi/button/ButtonNext.java | 4 +- .../guideapi/button/ButtonPrev.java | 4 +- .../guideapi/button/ButtonSearch.java | 4 +- .../guideapi/category/CategoryItemStack.java | 16 +++-- .../category/CategoryResourceLocation.java | 18 ++--- .../guideapi/entry/EntryItemStack.java | 10 +-- .../guideapi/entry/EntryResourceLocation.java | 12 ++-- .../gui/{GuiBase.java => BaseScreen.java} | 28 ++++---- .../{GuiCategory.java => CategoryScreen.java} | 22 +++--- .../gui/{GuiEntry.java => EntryScreen.java} | 18 ++--- .../gui/{GuiHome.java => HomeScreen.java} | 25 ++++--- .../gui/{GuiSearch.java => SearchScreen.java} | 16 ++--- .../info/InfoRendererDescription.java | 11 ++- .../guideapi/info/InfoRendererImage.java | 6 +- .../guideapi/item/ItemGuideBook.java | 4 +- .../guideapi/network/IMessage.java | 9 +++ .../guideapi/network/PacketHandler.java | 19 ++++-- .../guideapi/network/PacketSyncEntry.java | 67 +++++++++++-------- .../guideapi/page/PageBrewingRecipe.java | 4 +- .../guideapi/page/PageFurnaceRecipe.java | 16 ++--- .../guideapi/page/PageIRecipe.java | 33 +++++---- .../amerifrance/guideapi/page/PageImage.java | 10 +-- .../guideapi/page/PageItemStack.java | 11 ++- .../guideapi/page/PageJsonRecipe.java | 2 +- .../amerifrance/guideapi/page/PageSound.java | 24 ++++--- .../amerifrance/guideapi/page/PageText.java | 16 ++--- .../guideapi/page/PageTextImage.java | 12 ++-- .../reciperenderer/BasicRecipeRenderer.java | 8 +-- .../ShapedOreRecipeRenderer.java | 4 +- .../reciperenderer/ShapedRecipesRenderer.java | 17 +++-- .../ShapelessOreRecipeRenderer.java | 3 +- .../ShapelessRecipesRenderer.java | 11 ++- .../guideapi/proxy/ClientProxy.java | 10 +-- .../guideapi/proxy/CommonProxy.java | 14 ++-- .../amerifrance/guideapi/test/TestBook3.java | 17 +++-- .../amerifrance/guideapi/util/APISetter.java | 9 ++- .../guideapi/util/EventHandler.java | 57 ++++++++-------- .../guideapi/wrapper/AbstractWrapper.java | 6 +- .../guideapi/wrapper/CategoryWrapper.java | 12 ++-- .../guideapi/wrapper/EntryWrapper.java | 12 ++-- .../guideapi/wrapper/PageWrapper.java | 12 ++-- src/main/java/api/IPage.java | 14 ++-- src/main/java/api/IRecipeRenderer.java | 7 +- src/main/java/api/SubTexture.java | 5 +- src/main/java/api/button/ButtonGuideAPI.java | 6 +- src/main/java/api/impl/Book.java | 12 ++-- src/main/java/api/impl/BookBinder.java | 16 +++-- src/main/java/api/impl/Category.java | 28 ++++---- src/main/java/api/impl/Entry.java | 32 ++++----- src/main/java/api/impl/Page.java | 28 ++++---- .../impl/abstraction/CategoryAbstract.java | 14 ++-- .../api/impl/abstraction/EntryAbstract.java | 16 +++-- src/main/java/api/package-info.java | 2 - src/main/java/api/util/GuiHelper.java | 49 +++++++------- src/main/java/api/util/PageHelper.java | 4 +- src/main/java/api/util/TextHelper.java | 4 +- 58 files changed, 452 insertions(+), 409 deletions(-) rename src/main/java/amerifrance/guideapi/gui/{GuiBase.java => BaseScreen.java} (73%) rename src/main/java/amerifrance/guideapi/gui/{GuiCategory.java => CategoryScreen.java} (86%) rename src/main/java/amerifrance/guideapi/gui/{GuiEntry.java => EntryScreen.java} (86%) rename src/main/java/amerifrance/guideapi/gui/{GuiHome.java => HomeScreen.java} (83%) rename src/main/java/amerifrance/guideapi/gui/{GuiSearch.java => SearchScreen.java} (92%) create mode 100644 src/main/java/amerifrance/guideapi/network/IMessage.java diff --git a/src/main/java/amerifrance/guideapi/RegistrarGuideAPI.java b/src/main/java/amerifrance/guideapi/RegistrarGuideAPI.java index 27f17a8d..42d18cd0 100644 --- a/src/main/java/amerifrance/guideapi/RegistrarGuideAPI.java +++ b/src/main/java/amerifrance/guideapi/RegistrarGuideAPI.java @@ -16,10 +16,11 @@ import net.minecraft.world.biome.Biome; import net.minecraftforge.client.event.ModelRegistryEvent; import net.minecraftforge.event.RegistryEvent; +import net.minecraftforge.eventbus.api.EventPriority; +import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.eventhandler.EventPriority; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.common.registry.ForgeRegistries; + +import net.minecraftforge.registries.ForgeRegistries; import org.apache.commons.lang3.tuple.Pair; @Mod.EventBusSubscriber diff --git a/src/main/java/amerifrance/guideapi/button/ButtonBack.java b/src/main/java/amerifrance/guideapi/button/ButtonBack.java index 89fd5ec6..ff4a67db 100644 --- a/src/main/java/amerifrance/guideapi/button/ButtonBack.java +++ b/src/main/java/amerifrance/guideapi/button/ButtonBack.java @@ -4,7 +4,7 @@ import api.button.ButtonGuideAPI; import api.util.GuiHelper; import api.util.TextHelper; -import amerifrance.guideapi.gui.GuiBase; +import amerifrance.guideapi.gui.BaseScreen; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.util.ResourceLocation; @@ -14,7 +14,7 @@ public class ButtonBack extends ButtonGuideAPI { - public ButtonBack(int id, int x, int y, GuiBase guiBase) { + public ButtonBack(int id, int x, int y, BaseScreen guiBase) { super(id, x, y, guiBase); width = 18; height = 10; diff --git a/src/main/java/amerifrance/guideapi/button/ButtonNext.java b/src/main/java/amerifrance/guideapi/button/ButtonNext.java index 46f57233..a808c176 100644 --- a/src/main/java/amerifrance/guideapi/button/ButtonNext.java +++ b/src/main/java/amerifrance/guideapi/button/ButtonNext.java @@ -4,7 +4,7 @@ import api.button.ButtonGuideAPI; import api.util.GuiHelper; import api.util.TextHelper; -import amerifrance.guideapi.gui.GuiBase; +import amerifrance.guideapi.gui.BaseScreen; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.util.ResourceLocation; @@ -14,7 +14,7 @@ public class ButtonNext extends ButtonGuideAPI { - public ButtonNext(int id, int x, int y, GuiBase guiBase) { + public ButtonNext(int id, int x, int y, BaseScreen guiBase) { super(id, x, y, guiBase); width = 18; height = 10; diff --git a/src/main/java/amerifrance/guideapi/button/ButtonPrev.java b/src/main/java/amerifrance/guideapi/button/ButtonPrev.java index 8df20e93..e1204756 100644 --- a/src/main/java/amerifrance/guideapi/button/ButtonPrev.java +++ b/src/main/java/amerifrance/guideapi/button/ButtonPrev.java @@ -4,7 +4,7 @@ import api.button.ButtonGuideAPI; import api.util.GuiHelper; import api.util.TextHelper; -import amerifrance.guideapi.gui.GuiBase; +import amerifrance.guideapi.gui.BaseScreen; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.util.ResourceLocation; @@ -14,7 +14,7 @@ public class ButtonPrev extends ButtonGuideAPI { - public ButtonPrev(int id, int x, int y, GuiBase guiBase) { + public ButtonPrev(int id, int x, int y, BaseScreen guiBase) { super(id, x, y, guiBase); width = 18; height = 10; diff --git a/src/main/java/amerifrance/guideapi/button/ButtonSearch.java b/src/main/java/amerifrance/guideapi/button/ButtonSearch.java index ac8b82a3..3f2c262d 100644 --- a/src/main/java/amerifrance/guideapi/button/ButtonSearch.java +++ b/src/main/java/amerifrance/guideapi/button/ButtonSearch.java @@ -4,7 +4,7 @@ import api.button.ButtonGuideAPI; import api.util.GuiHelper; import api.util.TextHelper; -import amerifrance.guideapi.gui.GuiBase; +import amerifrance.guideapi.gui.BaseScreen; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.RenderHelper; @@ -13,7 +13,7 @@ public class ButtonSearch extends ButtonGuideAPI { - public ButtonSearch(int id, int x, int y, GuiBase guiBase) { + public ButtonSearch(int id, int x, int y, BaseScreen guiBase) { super(id, x, y, guiBase); width = 15; height = 15; diff --git a/src/main/java/amerifrance/guideapi/category/CategoryItemStack.java b/src/main/java/amerifrance/guideapi/category/CategoryItemStack.java index 92ca541f..2844edec 100644 --- a/src/main/java/amerifrance/guideapi/category/CategoryItemStack.java +++ b/src/main/java/amerifrance/guideapi/category/CategoryItemStack.java @@ -4,11 +4,13 @@ import api.impl.Category; import api.impl.abstraction.EntryAbstract; import api.util.GuiHelper; -import amerifrance.guideapi.gui.GuiBase; +import amerifrance.guideapi.gui.BaseScreen; import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.RenderItem; +import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import java.util.Map; @@ -27,16 +29,16 @@ public CategoryItemStack(String name, ItemStack stack) { } @Override - @SideOnly(Side.CLIENT) - public void draw(Book book, int categoryX, int categoryY, int categoryWidth, int categoryHeight, int mouseX, int mouseY, GuiBase guiBase, boolean drawOnLeft, RenderItem renderItem) { + @OnlyIn(Dist.CLIENT) + public void draw(Book book, int categoryX, int categoryY, int categoryWidth, int categoryHeight, int mouseX, int mouseY, BaseScreen guiBase, boolean drawOnLeft, ItemRenderer renderItem) { GuiHelper.drawScaledItemStack(this.stack, categoryX, categoryY, 1.5F); } @Override - @SideOnly(Side.CLIENT) - public void drawExtras(Book book, int categoryX, int categoryY, int categoryWidth, int categoryHeight, int mouseX, int mouseY, GuiBase guiBase, boolean drawOnLeft, RenderItem renderItem) { + @OnlyIn(Dist.CLIENT) + public void drawExtras(Book book, int categoryX, int categoryY, int categoryWidth, int categoryHeight, int mouseX, int mouseY, BaseScreen guiBase, boolean drawOnLeft, ItemRenderer renderItem) { if (canSee(guiBase.player, guiBase.bookStack) && GuiHelper.isMouseBetween(mouseX, mouseY, categoryX, categoryY, categoryWidth, categoryHeight)) - guiBase.drawHoveringText(this.getTooltip(), mouseX, mouseY, Minecraft.getMinecraft().fontRenderer); + guiBase.drawHoveringText(this.getTooltip(), mouseX, mouseY, Minecraft.getInstance().fontRenderer); } @Override diff --git a/src/main/java/amerifrance/guideapi/category/CategoryResourceLocation.java b/src/main/java/amerifrance/guideapi/category/CategoryResourceLocation.java index 09435e61..dbc4a723 100644 --- a/src/main/java/amerifrance/guideapi/category/CategoryResourceLocation.java +++ b/src/main/java/amerifrance/guideapi/category/CategoryResourceLocation.java @@ -4,10 +4,12 @@ import api.impl.Category; import api.impl.abstraction.EntryAbstract; import api.util.GuiHelper; -import amerifrance.guideapi.gui.GuiBase; +import amerifrance.guideapi.gui.BaseScreen; import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.RenderItem; +import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.util.ResourceLocation; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import java.util.Map; @@ -26,17 +28,17 @@ public CategoryResourceLocation(String name, ResourceLocation resourceLocation) } @Override - @SideOnly(Side.CLIENT) - public void draw(Book book, int categoryX, int categoryY, int categoryWidth, int categoryHeight, int mouseX, int mouseY, GuiBase guiBase, boolean drawOnLeft, RenderItem renderItem) { - Minecraft.getMinecraft().getTextureManager().bindTexture(resourceLocation); + @OnlyIn(Dist.CLIENT) + public void draw(Book book, int categoryX, int categoryY, int categoryWidth, int categoryHeight, int mouseX, int mouseY, BaseScreen guiBase, boolean drawOnLeft, ItemRenderer renderItem) { + Minecraft.getInstance().getTextureManager().bindTexture(resourceLocation); GuiHelper.drawSizedIconWithoutColor(categoryX, categoryY, 48, 48, 0); } @Override - @SideOnly(Side.CLIENT) - public void drawExtras(Book book, int categoryX, int categoryY, int categoryWidth, int categoryHeight, int mouseX, int mouseY, GuiBase guiBase, boolean drawOnLeft, RenderItem renderItem) { + @OnlyIn(Dist.CLIENT) + public void drawExtras(Book book, int categoryX, int categoryY, int categoryWidth, int categoryHeight, int mouseX, int mouseY, BaseScreen guiBase, boolean drawOnLeft, ItemRenderer renderItem) { if (canSee(guiBase.player, guiBase.bookStack) && GuiHelper.isMouseBetween(mouseX, mouseY, categoryX, categoryY, categoryWidth, categoryHeight)) - guiBase.drawHoveringText(this.getTooltip(), mouseX, mouseY, Minecraft.getMinecraft().fontRenderer); + guiBase.drawHoveringText(this.getTooltip(), mouseX, mouseY, Minecraft.getInstance().fontRenderer); } @Override diff --git a/src/main/java/amerifrance/guideapi/entry/EntryItemStack.java b/src/main/java/amerifrance/guideapi/entry/EntryItemStack.java index 20ce0c07..78c83520 100644 --- a/src/main/java/amerifrance/guideapi/entry/EntryItemStack.java +++ b/src/main/java/amerifrance/guideapi/entry/EntryItemStack.java @@ -5,11 +5,11 @@ import api.impl.Entry; import api.impl.abstraction.CategoryAbstract; import api.util.GuiHelper; -import amerifrance.guideapi.gui.GuiBase; +import amerifrance.guideapi.gui.BaseScreen; import net.minecraft.client.gui.FontRenderer; 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 java.util.List; @@ -37,8 +37,8 @@ public EntryItemStack(String name, ItemStack stack) { } @Override - @SideOnly(Side.CLIENT) - public void drawExtras(Book book, CategoryAbstract category, int entryX, int entryY, int entryWidth, int entryHeight, int mouseX, int mouseY, GuiBase guiBase, FontRenderer fontRendererObj) { + @OnlyIn(Dist.CLIENT) + public void drawExtras(Book book, CategoryAbstract category, int entryX, int entryY, int entryWidth, int entryHeight, int mouseX, int mouseY, BaseScreen guiBase, FontRenderer fontRendererObj) { if (stack != null) GuiHelper.drawScaledItemStack(stack, entryX + 2, entryY, 0.5F); diff --git a/src/main/java/amerifrance/guideapi/entry/EntryResourceLocation.java b/src/main/java/amerifrance/guideapi/entry/EntryResourceLocation.java index bff3496e..7a651436 100644 --- a/src/main/java/amerifrance/guideapi/entry/EntryResourceLocation.java +++ b/src/main/java/amerifrance/guideapi/entry/EntryResourceLocation.java @@ -5,12 +5,12 @@ import api.impl.Entry; import api.impl.abstraction.CategoryAbstract; import api.util.GuiHelper; -import amerifrance.guideapi.gui.GuiBase; +import amerifrance.guideapi.gui.BaseScreen; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; 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 java.util.List; @@ -38,9 +38,9 @@ public EntryResourceLocation(String name, ResourceLocation image) { } @Override - @SideOnly(Side.CLIENT) - public void drawExtras(Book book, CategoryAbstract category, int entryX, int entryY, int entryWidth, int entryHeight, int mouseX, int mouseY, GuiBase guiBase, FontRenderer fontRendererObj) { - Minecraft.getMinecraft().getTextureManager().bindTexture(image); + @OnlyIn(Dist.CLIENT) + public void drawExtras(Book book, CategoryAbstract category, int entryX, int entryY, int entryWidth, int entryHeight, int mouseX, int mouseY, BaseScreen guiBase, FontRenderer fontRendererObj) { + Minecraft.getInstance().getTextureManager().bindTexture(image); GuiHelper.drawSizedIconWithoutColor(entryX + 2, entryY, 16, 16, 1F); super.drawExtras(book, category, entryX, entryY, entryWidth, entryHeight, mouseX, mouseY, guiBase, fontRendererObj); diff --git a/src/main/java/amerifrance/guideapi/gui/GuiBase.java b/src/main/java/amerifrance/guideapi/gui/BaseScreen.java similarity index 73% rename from src/main/java/amerifrance/guideapi/gui/GuiBase.java rename to src/main/java/amerifrance/guideapi/gui/BaseScreen.java index 4f93e3ba..bbf5b3e8 100644 --- a/src/main/java/amerifrance/guideapi/gui/GuiBase.java +++ b/src/main/java/amerifrance/guideapi/gui/BaseScreen.java @@ -7,13 +7,16 @@ import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; +import net.minecraft.util.text.ITextComponent; import org.lwjgl.opengl.GL11; import java.awt.Color; import java.util.List; +import static com.mojang.blaze3d.platform.GlStateManager.*; -public class GuiBase extends Screen { + +public class BaseScreen extends Screen { public int guiLeft, guiTop; public int xSize = 192; @@ -22,10 +25,11 @@ public class GuiBase extends Screen { public ItemStack bookStack; public float publicZLevel; - public GuiBase(PlayerEntity player, ItemStack bookStack) { + public BaseScreen(ITextComponent title, PlayerEntity player, ItemStack bookStack) { + super(title); this.player = player; this.bookStack = bookStack; - this.publicZLevel = zLevel; + this.publicZLevel = blitOffset; } @Override @@ -35,9 +39,9 @@ public boolean doesGuiPauseGame() { @Override public void keyTyped(char typedChar, int keyCode) { - if (keyCode == Keyboard.KEY_ESCAPE || keyCode == this.mc.gameSettings.keyBindInventory.getKeyCode()) { - this.mc.displayGuiScreen(null); - this.mc.setIngameFocus(); + if (keyCode == Keyboard.KEY_ESCAPE || keyCode == this.minecraft.gameSettings.keyBindInventory.getKeyCode()) { + this.minecraft.displayGuiScreen(null); + this.minecraft.setIngameFocus(); } } @@ -48,13 +52,13 @@ public void drawTexturedModalRectWithColor(int x, int y, int textureX, int textu float f = 0.00390625F; float f1 = 0.00390625F; disableLighting(); - color((float) color.getRed() / 255F, (float) color.getGreen() / 255F, (float) color.getBlue() / 255F); + color3f((float) color.getRed() / 255F, (float) color.getGreen() / 255F, (float) color.getBlue() / 255F); Tessellator tessellator = Tessellator.getInstance(); tessellator.getBuffer().begin(7, DefaultVertexFormats.POSITION_TEX); - tessellator.getBuffer().pos((double) (x), (double) (y + height), (double) this.zLevel).tex((double) ((float) (textureX) * f), (double) ((float) (textureY + height) * f1)).endVertex(); - tessellator.getBuffer().pos((double) (x + width), (double) (y + height), (double) this.zLevel).tex((double) ((float) (textureX + width) * f), (double) ((float) (textureY + height) * f1)).endVertex(); - tessellator.getBuffer().pos((double) (x + width), (double) (y), (double) this.zLevel).tex((double) ((float) (textureX + width) * f), (double) ((float) (textureY) * f1)).endVertex(); - tessellator.getBuffer().pos((double) (x), (double) (y), (double) this.zLevel).tex((double) ((float) (textureX) * f), (double) ((float) (textureY) * f1)).endVertex(); + tessellator.getBuffer().pos((double) (x), (double) (y + height), (double) this.blitOffset).tex((double) ((float) (textureX) * f), (double) ((float) (textureY + height) * f1)).endVertex(); + tessellator.getBuffer().pos((double) (x + width), (double) (y + height), (double) this.blitOffset).tex((double) ((float) (textureX + width) * f), (double) ((float) (textureY + height) * f1)).endVertex(); + tessellator.getBuffer().pos((double) (x + width), (double) (y), (double) this.blitOffset).tex((double) ((float) (textureX + width) * f), (double) ((float) (textureY) * f1)).endVertex(); + tessellator.getBuffer().pos((double) (x), (double) (y), (double) this.blitOffset).tex((double) ((float) (textureX) * f), (double) ((float) (textureY) * f1)).endVertex(); tessellator.draw(); disableBlend(); popMatrix(); @@ -74,7 +78,7 @@ public void drawCenteredStringWithShadow(FontRenderer fontRendererObj, String st @Override public void drawTexturedModalRect(int x, int y, int textureX, int textureY, int width, int height) { pushMatrix(); - color(1.0F, 1.0F, 1.0F, 1.0F); + color4f(1.0F, 1.0F, 1.0F, 1.0F); super.drawTexturedModalRect(x, y, textureX, textureY, width, height); popMatrix(); } diff --git a/src/main/java/amerifrance/guideapi/gui/GuiCategory.java b/src/main/java/amerifrance/guideapi/gui/CategoryScreen.java similarity index 86% rename from src/main/java/amerifrance/guideapi/gui/GuiCategory.java rename to src/main/java/amerifrance/guideapi/gui/CategoryScreen.java index 44018810..7eb84f0f 100644 --- a/src/main/java/amerifrance/guideapi/gui/GuiCategory.java +++ b/src/main/java/amerifrance/guideapi/gui/CategoryScreen.java @@ -25,7 +25,7 @@ import javax.annotation.Nullable; -public class GuiCategory extends GuiBase { +public class CategoryScreen extends BaseScreen { public ResourceLocation outlineTexture; public ResourceLocation pageTexture; @@ -39,7 +39,7 @@ public class GuiCategory extends GuiBase { public int entryPage; @Nullable public EntryAbstract startEntry; - public GuiCategory(Book book, CategoryAbstract category, PlayerEntity player, ItemStack bookStack, @Nullable EntryAbstract startEntry) { + public CategoryScreen(Book book, CategoryAbstract category, PlayerEntity player, ItemStack bookStack, @Nullable EntryAbstract startEntry) { super(player, bookStack); this.book = book; this.category = category; @@ -70,7 +70,7 @@ public void initGui() { List entries = Lists.newArrayList(category.entries.values()); for (EntryAbstract entry : entries) { entry.onInit(book, category, this, player, bookStack); - entryWrapperMap.put(pageNumber, new EntryWrapper(this, book, category, entry, eX, eY, 4 * xSize / 6, 10, player, this.fontRenderer, bookStack)); + entryWrapperMap.put(pageNumber, new EntryWrapper(this, book, category, entry, eX, eY, 4 * xSize / 6, 10, player, this.font, bookStack)); if (entry.equals(this.startEntry)) { this.startEntry = null; this.entryPage = pageNumber; @@ -88,9 +88,9 @@ public void initGui() { @Override public void drawScreen(int mouseX, int mouseY, float renderPartialTicks) { - Minecraft.getMinecraft().getTextureManager().bindTexture(pageTexture); + minecraft.getTextureManager().bindTexture(pageTexture); drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize); - Minecraft.getMinecraft().getTextureManager().bindTexture(outlineTexture); + minecraft.getTextureManager().bindTexture(outlineTexture); drawTexturedModalRectWithColor(guiLeft, guiTop, 0, 0, xSize, ySize, book.getColor()); entryPage = MathHelper.clamp(entryPage, 0, entryWrapperMap.size() - 1); @@ -105,8 +105,8 @@ public void drawScreen(int mouseX, int mouseY, float renderPartialTicks) { } } - drawCenteredString(fontRenderer, String.format("%d/%d", entryPage + 1, entryWrapperMap.asMap().size()), guiLeft + xSize / 2, guiTop + 5 * ySize / 6, 0); - drawCenteredStringWithShadow(fontRenderer, category.getLocalizedName(), guiLeft + xSize / 2, guiTop - 10, Color.WHITE.getRGB()); + drawCenteredString(font, String.format("%d/%d", entryPage + 1, entryWrapperMap.asMap().size()), guiLeft + xSize / 2, guiTop + 5 * ySize / 6, 0); + drawCenteredStringWithShadow(font, category.getLocalizedName(), guiLeft + xSize / 2, guiTop - 10, Color.WHITE.getRGB()); buttonPrev.visible = entryPage != 0; buttonNext.visible = entryPage != entryWrapperMap.asMap().size() - 1 && !entryWrapperMap.asMap().isEmpty(); @@ -127,7 +127,7 @@ else if (typeofClick == 1) } if (typeofClick == 1) - this.mc.displayGuiScreen(new GuiHome(book, player, bookStack)); + this.mc.displayGuiScreen(new HomeScreen(book, player, bookStack)); } @Override @@ -145,7 +145,7 @@ else if (movement > 0) public void keyTyped(char typedChar, int keyCode) { super.keyTyped(typedChar, keyCode); if (keyCode == Keyboard.KEY_BACK || keyCode == this.mc.gameSettings.keyBindUseItem.getKeyCode()) - this.mc.displayGuiScreen(new GuiHome(book, player, bookStack)); + this.minecraft.displayGuiScreen(new HomeScreen(book, player, bookStack)); if ((keyCode == Keyboard.KEY_UP || keyCode == Keyboard.KEY_RIGHT) && entryPage + 1 < entryWrapperMap.asMap().size()) nextPage(); if ((keyCode == Keyboard.KEY_DOWN || keyCode == Keyboard.KEY_LEFT) && entryPage > 0) @@ -155,13 +155,13 @@ public void keyTyped(char typedChar, int keyCode) { @Override public void actionPerformed(Button button) { if (button.id == 0) - this.mc.displayGuiScreen(new GuiHome(book, player, bookStack)); + this.minecraft.displayGuiScreen(new HomeScreen(book, player, bookStack)); else if (button.id == 1 && entryPage + 1 < entryWrapperMap.asMap().size()) nextPage(); else if (button.id == 2 && entryPage > 0) prevPage(); else if (button.id == 3) - this.mc.displayGuiScreen(new GuiSearch(book, player, bookStack, this)); + this.minecraft.displayGuiScreen(new SearchScreen(book, player, bookStack, this)); } @Override diff --git a/src/main/java/amerifrance/guideapi/gui/GuiEntry.java b/src/main/java/amerifrance/guideapi/gui/EntryScreen.java similarity index 86% rename from src/main/java/amerifrance/guideapi/gui/GuiEntry.java rename to src/main/java/amerifrance/guideapi/gui/EntryScreen.java index 54523e86..6042a429 100644 --- a/src/main/java/amerifrance/guideapi/gui/GuiEntry.java +++ b/src/main/java/amerifrance/guideapi/gui/EntryScreen.java @@ -24,7 +24,7 @@ import java.util.List; import java.util.Map; -public class GuiEntry extends GuiBase { +public class EntryScreen extends BaseScreen { public ResourceLocation outlineTexture; public ResourceLocation pageTexture; @@ -38,7 +38,7 @@ public class GuiEntry extends GuiBase { public ButtonSearch buttonSearch; public int pageNumber; - public GuiEntry(Book book, CategoryAbstract category, EntryAbstract entry, PlayerEntity player, ItemStack bookStack) { + public EntryScreen(Book book, CategoryAbstract category, EntryAbstract entry, PlayerEntity player, ItemStack bookStack) { super(player, bookStack); this.book = book; this.category = category; @@ -65,7 +65,7 @@ public void initGui() { for (IPage page : this.entry.pageList) { page.onInit(book, category, entry, player, bookStack, this); - pageWrapperList.add(new PageWrapper(this, book, category, entry, page, guiLeft, guiTop, player, this.fontRenderer, bookStack)); + pageWrapperList.add(new PageWrapper(this, book, category, entry, page, guiLeft, guiTop, player, this.font, bookStack)); } } @@ -85,8 +85,8 @@ public void drawScreen(int mouseX, int mouseY, float renderPartialTicks) { } } - drawCenteredString(fontRenderer, String.format("%d/%d", pageNumber + 1, pageWrapperList.size()), guiLeft + xSize / 2, guiTop + 5 * ySize / 6, 0); - drawCenteredStringWithShadow(fontRenderer, entry.getLocalizedName(), guiLeft + xSize / 2, guiTop - 10, Color.WHITE.getRGB()); + drawCenteredString(font, String.format("%d/%d", pageNumber + 1, pageWrapperList.size()), guiLeft + xSize / 2, guiTop + 5 * ySize / 6, 0); + drawCenteredStringWithShadow(font, entry.getLocalizedName(), guiLeft + xSize / 2, guiTop - 10, Color.WHITE.getRGB()); buttonPrev.visible = pageNumber != 0; buttonNext.visible = pageNumber != pageWrapperList.size() - 1 && !pageWrapperList.isEmpty(); @@ -109,7 +109,7 @@ public void mouseClicked(int mouseX, int mouseY, int typeofClick) throws IOExcep } if (typeofClick == 1) { - this.mc.displayGuiScreen(new GuiCategory(book, category, player, bookStack, entry)); + this.mc.displayGuiScreen(new CategoryScreen(book, category, player, bookStack, entry)); } } @@ -128,7 +128,7 @@ else if (movement > 0) public void keyTyped(char typedChar, int keyCode) { super.keyTyped(typedChar, keyCode); if (keyCode == Keyboard.KEY_BACK || keyCode == this.mc.gameSettings.keyBindUseItem.getKeyCode()) - this.mc.displayGuiScreen(new GuiCategory(book, category, player, bookStack, entry)); + this.minecraft.displayGuiScreen(new CategoryScreen(book, category, player, bookStack, entry)); if ((keyCode == Keyboard.KEY_UP || keyCode == Keyboard.KEY_RIGHT) && pageNumber + 1 < pageWrapperList.size()) nextPage(); if ((keyCode == Keyboard.KEY_DOWN || keyCode == Keyboard.KEY_LEFT) && pageNumber > 0) @@ -138,13 +138,13 @@ public void keyTyped(char typedChar, int keyCode) { @Override public void actionPerformed(Button button) { if (button.id == 0) - this.mc.displayGuiScreen(new GuiCategory(book, category, player, bookStack, entry)); + this.minecraft.displayGuiScreen(new CategoryScreen(book, category, player, bookStack, entry)); else if (button.id == 1 && pageNumber + 1 < pageWrapperList.size()) nextPage(); else if (button.id == 2 && pageNumber > 0) prevPage(); else if (button.id == 3) - this.mc.displayGuiScreen(new GuiSearch(book, player, bookStack, this)); + this.mc.displayGuiScreen(new SearchScreen(book, player, bookStack, this)); } @Override diff --git a/src/main/java/amerifrance/guideapi/gui/GuiHome.java b/src/main/java/amerifrance/guideapi/gui/HomeScreen.java similarity index 83% rename from src/main/java/amerifrance/guideapi/gui/GuiHome.java rename to src/main/java/amerifrance/guideapi/gui/HomeScreen.java index e1a21940..b4644113 100644 --- a/src/main/java/amerifrance/guideapi/gui/GuiHome.java +++ b/src/main/java/amerifrance/guideapi/gui/HomeScreen.java @@ -9,7 +9,6 @@ import amerifrance.guideapi.network.PacketSyncHome; import amerifrance.guideapi.wrapper.CategoryWrapper; import com.google.common.collect.HashMultimap; -import net.minecraft.client.Minecraft; import net.minecraft.client.gui.widget.button.Button; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.PlayerEntity; @@ -20,7 +19,7 @@ import java.awt.Color; import java.io.IOException; -public class GuiHome extends GuiBase { +public class HomeScreen extends BaseScreen { public ResourceLocation outlineTexture; public ResourceLocation pageTexture; @@ -31,7 +30,7 @@ public class GuiHome extends GuiBase { public ButtonSearch buttonSearch; public int categoryPage; - public GuiHome(Book book, PlayerEntity player, ItemStack bookStack) { + public HomeScreen(Book book, PlayerEntity player, ItemStack bookStack) { super(player, bookStack); this.book = book; this.pageTexture = book.getPageTexture(); @@ -64,25 +63,25 @@ public void initGui() { category.onInit(book, this, player, bookStack); switch (drawLoc) { case 0: { - categoryWrapperMap.put(pageNumber, new CategoryWrapper(book, category, cX, cY, 23, 23, player, this.fontRenderer, itemRender, false, bookStack)); + categoryWrapperMap.put(pageNumber, new CategoryWrapper(book, category, cX, cY, 23, 23, player, this.font, itemRenderer, false, bookStack)); cX += 27; drawLoc = 1; break; } case 1: { - categoryWrapperMap.put(pageNumber, new CategoryWrapper(book, category, cX, cY, 23, 23, player, this.fontRenderer, itemRender, false, bookStack)); + categoryWrapperMap.put(pageNumber, new CategoryWrapper(book, category, cX, cY, 23, 23, player, this.font, itemRenderer, false, bookStack)); cX += 27; drawLoc = 2; break; } case 2: { - categoryWrapperMap.put(pageNumber, new CategoryWrapper(book, category, cX, cY, 23, 23, player, this.fontRenderer, itemRender, false, bookStack)); + categoryWrapperMap.put(pageNumber, new CategoryWrapper(book, category, cX, cY, 23, 23, player, this.font, itemRenderer, false, bookStack)); cX += 27; drawLoc = 3; break; } case 3: { - categoryWrapperMap.put(pageNumber, new CategoryWrapper(book, category, cX, cY, 23, 23, player, this.fontRenderer, itemRender, false, bookStack)); + categoryWrapperMap.put(pageNumber, new CategoryWrapper(book, category, cX, cY, 23, 23, player, this.font, itemRenderer, false, bookStack)); drawLoc = 0; cX = guiLeft + 45; cY += 30; @@ -102,11 +101,11 @@ public void initGui() { @Override public void drawScreen(int mouseX, int mouseY, float renderPartialTicks) { - Minecraft.getMinecraft().getTextureManager().bindTexture(pageTexture); + minecraft.getTextureManager().bindTexture(pageTexture); drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize); - Minecraft.getMinecraft().getTextureManager().bindTexture(outlineTexture); + minecraft.getTextureManager().bindTexture(outlineTexture); drawTexturedModalRectWithColor(guiLeft, guiTop, 0, 0, xSize, ySize, book.getColor()); - drawCenteredString(fontRenderer, I18n.format(book.getHeader()).replace("\\n", "\n").replace("&", "\u00a7"), guiLeft + xSize / 2 + 1, guiTop + 15, 0); + drawCenteredString(font, I18n.format(book.getHeader()).replace("\\n", "\n").replace("&", "\u00a7"), guiLeft + xSize / 2 + 1, guiTop + 15, 0); categoryPage = MathHelper.clamp(categoryPage, 0, categoryWrapperMap.size() - 1); @@ -118,8 +117,8 @@ public void drawScreen(int mouseX, int mouseY, float renderPartialTicks) { if (wrapper.canPlayerSee()) wrapper.drawExtras(mouseX, mouseY, this); - drawCenteredString(fontRenderer, String.format("%d/%d", categoryPage + 1, categoryWrapperMap.asMap().size()), guiLeft + xSize / 2, guiTop + 5 * ySize / 6, 0); - drawCenteredStringWithShadow(fontRenderer, I18n.format(book.getTitle()), guiLeft + xSize / 2, guiTop - 10, Color.WHITE.getRGB()); + drawCenteredString(font, String.format("%d/%d", categoryPage + 1, categoryWrapperMap.asMap().size()), guiLeft + xSize / 2, guiTop + 5 * ySize / 6, 0); + drawCenteredStringWithShadow(font, I18n.format(book.getTitle()), guiLeft + xSize / 2, guiTop - 10, Color.WHITE.getRGB()); buttonPrev.visible = categoryPage != 0; buttonNext.visible = categoryPage != categoryWrapperMap.asMap().size() - 1 && !categoryWrapperMap.asMap().isEmpty(); @@ -183,7 +182,7 @@ else if (button.id == 1 && categoryPage > 0) break; } case 2: { - mc.displayGuiScreen(new GuiSearch(book, player, bookStack, this)); + minecraft.displayGuiScreen(new SearchScreen(book, player, bookStack, this)); break; } } diff --git a/src/main/java/amerifrance/guideapi/gui/GuiSearch.java b/src/main/java/amerifrance/guideapi/gui/SearchScreen.java similarity index 92% rename from src/main/java/amerifrance/guideapi/gui/GuiSearch.java rename to src/main/java/amerifrance/guideapi/gui/SearchScreen.java index 29bde351..16b78ed6 100644 --- a/src/main/java/amerifrance/guideapi/gui/GuiSearch.java +++ b/src/main/java/amerifrance/guideapi/gui/SearchScreen.java @@ -26,7 +26,7 @@ import java.util.List; import java.util.Locale; -public class GuiSearch extends GuiBase { +public class SearchScreen extends BaseScreen { private Book book; private ResourceLocation outlineTexture; @@ -39,7 +39,7 @@ public class GuiSearch extends GuiBase { private int currentPage = 0; private String lastQuery = ""; - public GuiSearch(Book book, PlayerEntity player, ItemStack bookStack, Screen parent) { + public SearchScreen(Book book, PlayerEntity player, ItemStack bookStack, Screen parent) { super(player, bookStack); this.book = book; @@ -60,7 +60,7 @@ public void initGui() { addButton(buttonNext = new ButtonNext(1, guiLeft + 4 * xSize / 6, guiTop + 5 * ySize / 6, this)); addButton(buttonPrev = new ButtonPrev(2, guiLeft + xSize / 5, guiTop + 5 * ySize / 6, this)); - searchField = new TextFieldWidget(3, fontRenderer, guiLeft + 43, guiTop + 12, 100, 10); + searchField = new TextFieldWidget(3, font, guiLeft + 43, guiTop + 12, 100, 10); searchField.setEnableBackgroundDrawing(false); searchField.setFocused(true); searchResults = getMatches(book, null, player, bookStack); @@ -68,9 +68,9 @@ public void initGui() { @Override public void drawScreen(int mouseX, int mouseY, float partialTicks) { - mc.getTextureManager().bindTexture(pageTexture); + minecraft.getTextureManager().bindTexture(pageTexture); drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize); - mc.getTextureManager().bindTexture(outlineTexture); + minecraft.getTextureManager().bindTexture(outlineTexture); drawTexturedModalRectWithColor(guiLeft, guiTop, 0, 0, xSize, ySize, book.getColor()); drawRect(searchField.x - 1, searchField.y - 1, searchField.x + searchField.width + 1, searchField.y + searchField.height + 1, new Color(166, 166, 166, 128).getRGB()); @@ -111,13 +111,13 @@ public void mouseClicked(int mouseX, int mouseY, int mouseButton) throws IOExcep super.mouseClicked(mouseX, mouseY, mouseButton); if (mouseButton == 1) { - if (GuiHelper.isMouseBetween(mouseX, mouseY, searchField.x, searchField.y, searchField.width, searchField.height)) { + if (GuiHelper.isMouseBetween(mouseX, mouseY, searchField.x, searchField.y, searchField.getAdjustedWidth(), searchField.getHeight())) { searchField.setText(""); lastQuery = ""; searchResults = getMatches(book, "", player, bookStack); return; } else - mc.displayGuiScreen(parent); + minecraft.displayGuiScreen(parent); } searchField.mouseClicked(mouseX, mouseY, mouseButton); @@ -155,7 +155,7 @@ public void keyTyped(char typedChar, int keyCode) { public void actionPerformed(Button button) { switch (button.id) { case 0: { - mc.displayGuiScreen(parent); + minecraft.displayGuiScreen(parent); break; } case 1: { diff --git a/src/main/java/amerifrance/guideapi/info/InfoRendererDescription.java b/src/main/java/amerifrance/guideapi/info/InfoRendererDescription.java index a0b26004..b3930775 100644 --- a/src/main/java/amerifrance/guideapi/info/InfoRendererDescription.java +++ b/src/main/java/amerifrance/guideapi/info/InfoRendererDescription.java @@ -3,10 +3,10 @@ import api.IInfoRenderer; import api.impl.Book; import api.util.GuiHelper; +import com.mojang.blaze3d.platform.GlStateManager; import net.minecraft.block.BlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; -import net.minecraft.client.gui.ScaledResolution; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; @@ -34,13 +34,12 @@ public InfoRendererDescription(ItemStack stack, ITextComponent description) { public void drawInformation(Book book, World world, BlockPos pos, BlockState state, RayTraceResult rayTrace, PlayerEntity player) { if (tiny) { GlStateManager.pushMatrix(); - GlStateManager.scale(0.5F, 0.5F, 0.5F); + GlStateManager.scalef(0.5F, 0.5F, 0.5F); } - ScaledResolution resolution = new ScaledResolution(Minecraft.getMinecraft()); - FontRenderer fontRenderer = Minecraft.getMinecraft().fontRenderer; + FontRenderer fontRenderer = Minecraft.getInstance().fontRenderer; int scaleMulti = tiny ? 2 : 1; - GuiHelper.drawItemStack(stack, (resolution.getScaledWidth() / 2 + 55) * scaleMulti, ((resolution.getScaledHeight() / 2 - (tiny ? 20 : 30)) + yOffset) * scaleMulti); + GuiHelper.drawItemStack(stack, (Minecraft.getInstance().mainWindow.getScaledWidth() / 2 + 55) * scaleMulti, ((Minecraft.getInstance().mainWindow.getScaledHeight() / 2 - (tiny ? 20 : 30)) + yOffset) * scaleMulti); int y = 0; String toDraw = StringEscapeUtils.unescapeJava(description.getFormattedText()).replaceAll("\\t", " "); @@ -48,7 +47,7 @@ public void drawInformation(Book book, World world, BlockPos pos, BlockState sta for (String line : lines) { List cutLines = fontRenderer.listFormattedStringToWidth(line, 100 * scaleMulti); for (String cut : cutLines) { - fontRenderer.drawStringWithShadow(cut, (resolution.getScaledWidth() / 2 + 20) * scaleMulti, (((resolution.getScaledHeight() / 2 - 10) - y) * scaleMulti) + yOffset, Color.WHITE.getRGB()); + fontRenderer.drawStringWithShadow(cut, (Minecraft.getInstance().mainWindow.getScaledWidth()/ 2 + 20) * scaleMulti, (((Minecraft.getInstance().mainWindow.getScaledHeight() / 2 - 10) - y) * scaleMulti) + yOffset, Color.WHITE.getRGB()); y -= 10 / scaleMulti; } } diff --git a/src/main/java/amerifrance/guideapi/info/InfoRendererImage.java b/src/main/java/amerifrance/guideapi/info/InfoRendererImage.java index b34d03f7..ebbf2897 100644 --- a/src/main/java/amerifrance/guideapi/info/InfoRendererImage.java +++ b/src/main/java/amerifrance/guideapi/info/InfoRendererImage.java @@ -5,7 +5,6 @@ import net.minecraft.block.BlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.AbstractGui; -import net.minecraft.client.gui.ScaledResolution; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; @@ -30,8 +29,7 @@ public InfoRendererImage(ResourceLocation image, int imageX, int imageY, int ima @Override public void drawInformation(Book book, World world, BlockPos pos, BlockState state, RayTraceResult rayTrace, PlayerEntity player) { - ScaledResolution resolution = new ScaledResolution(Minecraft.getMinecraft()); - Minecraft.getMinecraft().renderEngine.bindTexture(image); - AbstractGui.drawModalRectWithCustomSizedTexture(resolution.getScaledWidth() / 2 + 20, resolution.getScaledHeight() / 2 - imageHeight / 2, imageX, imageY, imageWidth, imageHeight, imageWidth, imageHeight); + Minecraft.getInstance().renderEngine.bindTexture(image); + AbstractGui.drawModalRectWithCustomSizedTexture(Minecraft.getInstance().mainWindow.getScaledWidth() / 2 + 20, Minecraft.getInstance().mainWindow.getScaledHeight() / 2 - imageHeight / 2, imageX, imageY, imageWidth, imageHeight, imageWidth, imageHeight); } } diff --git a/src/main/java/amerifrance/guideapi/item/ItemGuideBook.java b/src/main/java/amerifrance/guideapi/item/ItemGuideBook.java index bb89f323..c98c1fad 100644 --- a/src/main/java/amerifrance/guideapi/item/ItemGuideBook.java +++ b/src/main/java/amerifrance/guideapi/item/ItemGuideBook.java @@ -10,6 +10,7 @@ import api.util.TextHelper; import com.google.common.base.Strings; import net.minecraft.block.BlockState; +import net.minecraft.client.resources.I18n; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.client.util.ITooltipFlag.TooltipFlags; import net.minecraft.entity.player.PlayerEntity; @@ -17,7 +18,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.*; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; @@ -79,7 +79,7 @@ public ActionResultType onItemUse(PlayerEntity player, World world, BlockPos pos @Override public String getItemStackDisplayName(ItemStack stack) { - return !Strings.isNullOrEmpty(book.getItemName()) ? I18n.translateToLocal(getBook(stack).getItemName()) : super.getItemStackDisplayName(stack); + return !Strings.isNullOrEmpty(book.getItemName()) ? I18n.format(getBook(stack).getItemName()) : super.getItemStackDisplayName(stack); } @Override diff --git a/src/main/java/amerifrance/guideapi/network/IMessage.java b/src/main/java/amerifrance/guideapi/network/IMessage.java new file mode 100644 index 00000000..170ae6f1 --- /dev/null +++ b/src/main/java/amerifrance/guideapi/network/IMessage.java @@ -0,0 +1,9 @@ +package amerifrance.guideapi.network; + +/** + * Guide-API + * + * @author maxanier + */ +public interface IMessage { +} diff --git a/src/main/java/amerifrance/guideapi/network/PacketHandler.java b/src/main/java/amerifrance/guideapi/network/PacketHandler.java index 97d2bd35..28eaa06f 100644 --- a/src/main/java/amerifrance/guideapi/network/PacketHandler.java +++ b/src/main/java/amerifrance/guideapi/network/PacketHandler.java @@ -1,16 +1,27 @@ package amerifrance.guideapi.network; import amerifrance.guideapi.GuideMod; -import net.minecraftforge.fml.common.network.simpleimpl.SimpleNetworkWrapper; -import net.minecraftforge.fml.relauncher.Side; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fml.network.NetworkRegistry; +import net.minecraftforge.fml.network.simple.SimpleChannel; + public class PacketHandler { + private static final String PROTOCOL_VERSION = Integer.toString(1); + private static byte packetId = 0; + + + public static SimpleChannel INSTANCE = NetworkRegistry.ChannelBuilder.named(new ResourceLocation(GuideMod.ID,"main")).clientAcceptedVersions(PROTOCOL_VERSION::equals).serverAcceptedVersions(PROTOCOL_VERSION::equals).networkProtocolVersion(()->PROTOCOL_VERSION).simpleChannel(); + - public static SimpleNetworkWrapper INSTANCE = new SimpleNetworkWrapper(GuideMod.CHANNEL); public static void registerPackets() { + INSTANCE.registerMessage(nextID(),PacketSyncEntry.class,PacketSyncEntry::encode,PacketSyncEntry::decode,PacketSyncEntry::handle); INSTANCE.registerMessage(PacketSyncHome.class, PacketSyncHome.class, 0, Side.SERVER); INSTANCE.registerMessage(PacketSyncCategory.class, PacketSyncCategory.class, 1, Side.SERVER); - INSTANCE.registerMessage(PacketSyncEntry.class, PacketSyncEntry.class, 2, Side.SERVER); + } + + protected static int nextID() { + return packetId++; } } diff --git a/src/main/java/amerifrance/guideapi/network/PacketSyncEntry.java b/src/main/java/amerifrance/guideapi/network/PacketSyncEntry.java index d84e6444..a45fad70 100644 --- a/src/main/java/amerifrance/guideapi/network/PacketSyncEntry.java +++ b/src/main/java/amerifrance/guideapi/network/PacketSyncEntry.java @@ -3,15 +3,18 @@ import api.IGuideItem; import api.util.NBTBookTags; import io.netty.buffer.ByteBuf; +import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; +import net.minecraft.network.PacketBuffer; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.common.network.ByteBufUtils; -import net.minecraftforge.fml.common.network.simpleimpl.IMessage; -import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; -import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; +import net.minecraftforge.fml.network.NetworkEvent; +import org.apache.commons.lang3.Validate; -public class PacketSyncEntry implements IMessage, IMessageHandler { +import java.util.function.Supplier; + +public class PacketSyncEntry implements IMessage { public int category; public ResourceLocation entry; @@ -29,36 +32,44 @@ public PacketSyncEntry(int category, ResourceLocation entry, int page) { this.page = page; } - @Override - public void fromBytes(ByteBuf buf) { - this.category = buf.readInt(); - this.entry = new ResourceLocation(ByteBufUtils.readUTF8String(buf)); - this.page = buf.readInt(); + static void encode(PacketSyncEntry msg, PacketBuffer buf){ + buf.writeInt(msg.category); + buf.writeResourceLocation(msg.entry); + buf.writeInt(msg.page); } - @Override - public void toBytes(ByteBuf buf) { - buf.writeInt(category); - ByteBufUtils.writeUTF8String(buf, entry.toString()); - buf.writeInt(page); + static PacketSyncEntry decode(PacketBuffer buf){ + PacketSyncEntry msg=new PacketSyncEntry(); + msg.category=buf.readInt(); + msg.entry=buf.readResourceLocation(); + msg.page = buf.readInt(); + return msg; } - @Override - public IMessage onMessage(PacketSyncEntry message, MessageContext ctx) { - ItemStack book = ctx.getServerHandler().player.getHeldItemOffhand(); - if (book.isEmpty() || !(book.getItem() instanceof IGuideItem)) - book = ctx.getServerHandler().player.getHeldItemMainhand(); + public static void handle(final PacketSyncEntry msg, Supplier contextSupplier){ + final NetworkEvent.Context ctx=contextSupplier.get(); + ServerPlayerEntity player = ctx.getSender(); + Validate.notNull(player); + ctx.enqueueWork(()->{ + ItemStack book = player.getHeldItemOffhand(); + if (book.isEmpty() || !(book.getItem() instanceof IGuideItem)) + book = player.getHeldItemMainhand(); - if (!book.isEmpty() && book.getItem() instanceof IGuideItem) { - if (message.category != -1 && !message.entry.equals(new ResourceLocation("guideapi", "none")) && message.page != -1) { - if (!book.hasTagCompound()) - book.setTagCompound(new CompoundNBT()); + if (!book.isEmpty() && book.getItem() instanceof IGuideItem) { + if (msg.category != -1 && !msg.entry.equals(new ResourceLocation("guideapi", "none")) && msg.page != -1) { + if (!book.hasTag()) + book.setTag(new CompoundNBT()); - book.getTagCompound().setInteger(NBTBookTags.CATEGORY_TAG, message.category); - book.getTagCompound().setString(NBTBookTags.ENTRY_TAG, message.entry.toString()); - book.getTagCompound().setInteger(NBTBookTags.PAGE_TAG, message.page); + book.getTag().putInt(NBTBookTags.CATEGORY_TAG, msg.category); + book.getTag().putString(NBTBookTags.ENTRY_TAG, msg.entry.toString()); + book.getTag().putInt(NBTBookTags.PAGE_TAG, msg.page); + } } - } - return null; + }); + ctx.setPacketHandled(true); } + + + + } diff --git a/src/main/java/amerifrance/guideapi/page/PageBrewingRecipe.java b/src/main/java/amerifrance/guideapi/page/PageBrewingRecipe.java index af8a889b..47b67961 100644 --- a/src/main/java/amerifrance/guideapi/page/PageBrewingRecipe.java +++ b/src/main/java/amerifrance/guideapi/page/PageBrewingRecipe.java @@ -7,7 +7,7 @@ import api.impl.abstraction.EntryAbstract; import api.util.GuiHelper; import api.util.TextHelper; -import amerifrance.guideapi.gui.GuiBase; +import amerifrance.guideapi.gui.BaseScreen; import net.minecraft.block.Blocks; import net.minecraft.client.gui.FontRenderer; import net.minecraft.item.Item; @@ -49,7 +49,7 @@ public PageBrewingRecipe(ItemStack input, ItemStack ingredient, ItemStack output @Override @SideOnly(Side.CLIENT) - public void draw(Book book, CategoryAbstract category, EntryAbstract entry, int guiLeft, int guiTop, int mouseX, int mouseY, GuiBase guiBase, FontRenderer fontRendererObj) { + public void draw(Book book, CategoryAbstract category, EntryAbstract entry, int guiLeft, int guiTop, int mouseX, int mouseY, BaseScreen guiBase, FontRenderer fontRendererObj) { int xStart = guiLeft + 62; int yStart = guiTop + 52; diff --git a/src/main/java/amerifrance/guideapi/page/PageFurnaceRecipe.java b/src/main/java/amerifrance/guideapi/page/PageFurnaceRecipe.java index 82f4d410..92b23c07 100644 --- a/src/main/java/amerifrance/guideapi/page/PageFurnaceRecipe.java +++ b/src/main/java/amerifrance/guideapi/page/PageFurnaceRecipe.java @@ -7,16 +7,16 @@ import api.impl.abstraction.EntryAbstract; import api.util.GuiHelper; import api.util.TextHelper; -import amerifrance.guideapi.gui.GuiBase; +import amerifrance.guideapi.gui.BaseScreen; import net.minecraft.block.Block; import net.minecraft.block.Blocks; import net.minecraft.client.gui.FontRenderer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.FurnaceRecipes; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; -import net.minecraftforge.oredict.OreDictionary; +import net.minecraft.item.crafting.FurnaceRecipe; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; + import java.util.ArrayList; import java.util.List; @@ -31,7 +31,7 @@ public class PageFurnaceRecipe extends Page { */ public PageFurnaceRecipe(ItemStack input) { this.input = input; - this.output = FurnaceRecipes.instance().getSmeltingResult(input); + this.output = FurnaceRecipe.instance().getSmeltingResult(input); } /** @@ -67,9 +67,9 @@ public PageFurnaceRecipe(String input) { } @Override - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @SuppressWarnings("unchecked") - public void draw(Book book, CategoryAbstract category, EntryAbstract entry, int guiLeft, int guiTop, int mouseX, int mouseY, GuiBase guiBase, FontRenderer fontRendererObj) { + public void draw(Book book, CategoryAbstract category, EntryAbstract entry, int guiLeft, int guiTop, int mouseX, int mouseY, BaseScreen guiBase, FontRenderer fontRendererObj) { SubTexture.FURNACE_GRID.draw(guiLeft + 64, guiTop + 71); List badTip = new ArrayList(); diff --git a/src/main/java/amerifrance/guideapi/page/PageIRecipe.java b/src/main/java/amerifrance/guideapi/page/PageIRecipe.java index c78e7650..e45ea187 100644 --- a/src/main/java/amerifrance/guideapi/page/PageIRecipe.java +++ b/src/main/java/amerifrance/guideapi/page/PageIRecipe.java @@ -5,8 +5,8 @@ import api.impl.Page; import api.impl.abstraction.CategoryAbstract; import api.impl.abstraction.EntryAbstract; -import amerifrance.guideapi.gui.GuiBase; -import amerifrance.guideapi.gui.GuiEntry; +import amerifrance.guideapi.gui.BaseScreen; +import amerifrance.guideapi.gui.EntryScreen; import amerifrance.guideapi.page.reciperenderer.ShapedOreRecipeRenderer; import amerifrance.guideapi.page.reciperenderer.ShapedRecipesRenderer; import amerifrance.guideapi.page.reciperenderer.ShapelessOreRecipeRenderer; @@ -16,12 +16,11 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; -import net.minecraft.item.crafting.ShapedRecipes; -import net.minecraft.item.crafting.ShapelessRecipes; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; -import net.minecraftforge.oredict.ShapedOreRecipe; -import net.minecraftforge.oredict.ShapelessOreRecipe; +import net.minecraft.item.crafting.ShapedRecipe; +import net.minecraft.item.crafting.ShapelessRecipe; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; + public class PageIRecipe extends Page { @@ -56,8 +55,8 @@ public PageIRecipe(IRecipe recipe, IRecipeRenderer iRecipeRenderer) { } @Override - @SideOnly(Side.CLIENT) - public void draw(Book book, CategoryAbstract category, EntryAbstract entry, int guiLeft, int guiTop, int mouseX, int mouseY, GuiBase guiBase, FontRenderer fontRendererObj) { + @OnlyIn(Dist.CLIENT) + public void draw(Book book, CategoryAbstract category, EntryAbstract entry, int guiLeft, int guiTop, int mouseX, int mouseY, BaseScreen guiBase, FontRenderer fontRendererObj) { if(isValid) { super.draw(book, category, entry, guiLeft, guiTop, mouseX, mouseY, guiBase, fontRendererObj); iRecipeRenderer.draw(book, category, entry, guiLeft, guiTop, mouseX, mouseY, guiBase, fontRendererObj); @@ -65,8 +64,8 @@ public void draw(Book book, CategoryAbstract category, EntryAbstract entry, int } @Override - @SideOnly(Side.CLIENT) - public void drawExtras(Book book, CategoryAbstract category, EntryAbstract entry, int guiLeft, int guiTop, int mouseX, int mouseY, GuiBase guiBase, FontRenderer fontRendererObj) { + @OnlyIn(Dist.CLIENT) + public void drawExtras(Book book, CategoryAbstract category, EntryAbstract entry, int guiLeft, int guiTop, int mouseX, int mouseY, BaseScreen guiBase, FontRenderer fontRendererObj) { if(isValid) { super.drawExtras(book, category, entry, guiLeft, guiTop, mouseX, mouseY, guiBase, fontRendererObj); iRecipeRenderer.drawExtras(book, category, entry, guiLeft, guiTop, mouseX, mouseY, guiBase, fontRendererObj); @@ -74,7 +73,7 @@ public void drawExtras(Book book, CategoryAbstract category, EntryAbstract entry } @Override - public boolean canSee(Book book, CategoryAbstract category, EntryAbstract entry, PlayerEntity player, ItemStack bookStack, GuiEntry guiEntry) { + public boolean canSee(Book book, CategoryAbstract category, EntryAbstract entry, PlayerEntity player, ItemStack bookStack, EntryScreen guiEntry) { return isValid; } @@ -90,10 +89,10 @@ static IRecipeRenderer getRenderer(IRecipe recipe) { if (recipe == null) { LogHelper.error("Cannot get renderer for null recipe."); return null; - } else if (recipe instanceof ShapedRecipes) { - return new ShapedRecipesRenderer((ShapedRecipes) recipe); - } else if (recipe instanceof ShapelessRecipes) { - return new ShapelessRecipesRenderer((ShapelessRecipes) recipe); + } else if (recipe instanceof ShapedRecipe) { + return new ShapedRecipesRenderer((ShapedRecipe) recipe); + } else if (recipe instanceof ShapelessRecipe) { + return new ShapelessRecipesRenderer((ShapelessRecipe) recipe); } else if (recipe instanceof ShapedOreRecipe) { return new ShapedOreRecipeRenderer((ShapedOreRecipe) recipe); } else if (recipe instanceof ShapelessOreRecipe) { diff --git a/src/main/java/amerifrance/guideapi/page/PageImage.java b/src/main/java/amerifrance/guideapi/page/PageImage.java index f1ddacde..5e76c7e4 100644 --- a/src/main/java/amerifrance/guideapi/page/PageImage.java +++ b/src/main/java/amerifrance/guideapi/page/PageImage.java @@ -5,10 +5,12 @@ import api.impl.abstraction.CategoryAbstract; import api.impl.abstraction.EntryAbstract; import api.util.GuiHelper; -import amerifrance.guideapi.gui.GuiBase; +import amerifrance.guideapi.gui.BaseScreen; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.util.ResourceLocation; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; public class PageImage extends Page { @@ -22,9 +24,9 @@ public PageImage(ResourceLocation image) { } @Override - @SideOnly(Side.CLIENT) - public void draw(Book book, CategoryAbstract category, EntryAbstract entry, int guiLeft, int guiTop, int mouseX, int mouseY, GuiBase guiBase, FontRenderer fontRendererObj) { - Minecraft.getMinecraft().getTextureManager().bindTexture(image); + @OnlyIn(Dist.CLIENT) + public void draw(Book book, CategoryAbstract category, EntryAbstract entry, int guiLeft, int guiTop, int mouseX, int mouseY, BaseScreen guiBase, FontRenderer fontRendererObj) { + Minecraft.getInstance().getTextureManager().bindTexture(image); GuiHelper.drawSizedIconWithoutColor(guiLeft + 50, guiTop + 34, guiBase.xSize, guiBase.ySize, 1F); } diff --git a/src/main/java/amerifrance/guideapi/page/PageItemStack.java b/src/main/java/amerifrance/guideapi/page/PageItemStack.java index 417d7c74..7d9c8a76 100644 --- a/src/main/java/amerifrance/guideapi/page/PageItemStack.java +++ b/src/main/java/amerifrance/guideapi/page/PageItemStack.java @@ -4,15 +4,14 @@ import api.impl.abstraction.CategoryAbstract; import api.impl.abstraction.EntryAbstract; import api.util.GuiHelper; -import amerifrance.guideapi.gui.GuiBase; +import amerifrance.guideapi.gui.BaseScreen; import net.minecraft.block.Block; import net.minecraft.client.gui.FontRenderer; import net.minecraft.block.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; -import net.minecraftforge.oredict.OreDictionary; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; public class PageItemStack extends PageText { @@ -60,8 +59,8 @@ public PageItemStack(String draw, String entry) { } @Override - @SideOnly(Side.CLIENT) - public void drawExtras(Book book, CategoryAbstract category, EntryAbstract entry, int guiLeft, int guiTop, int mouseX, int mouseY, GuiBase guiBase, FontRenderer fontRendererObj) { + @OnlyIn(Dist.CLIENT) + public void drawExtras(Book book, CategoryAbstract category, EntryAbstract entry, int guiLeft, int guiTop, int mouseX, int mouseY, BaseScreen guiBase, FontRenderer fontRendererObj) { GuiHelper.drawScaledItemStack(stack, guiLeft + 75, guiTop + 20, 3); } diff --git a/src/main/java/amerifrance/guideapi/page/PageJsonRecipe.java b/src/main/java/amerifrance/guideapi/page/PageJsonRecipe.java index 6ad26f9a..ce4e1c32 100644 --- a/src/main/java/amerifrance/guideapi/page/PageJsonRecipe.java +++ b/src/main/java/amerifrance/guideapi/page/PageJsonRecipe.java @@ -1,7 +1,7 @@ package amerifrance.guideapi.page; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fml.common.registry.ForgeRegistries; +import net.minecraftforge.registries.ForgeRegistries; public class PageJsonRecipe extends PageIRecipe { diff --git a/src/main/java/amerifrance/guideapi/page/PageSound.java b/src/main/java/amerifrance/guideapi/page/PageSound.java index b040649f..65d13500 100644 --- a/src/main/java/amerifrance/guideapi/page/PageSound.java +++ b/src/main/java/amerifrance/guideapi/page/PageSound.java @@ -6,12 +6,14 @@ import api.impl.Page; import api.impl.abstraction.CategoryAbstract; import api.impl.abstraction.EntryAbstract; -import amerifrance.guideapi.gui.GuiBase; -import amerifrance.guideapi.gui.GuiEntry; +import amerifrance.guideapi.gui.BaseScreen; +import amerifrance.guideapi.gui.EntryScreen; import net.minecraft.client.gui.FontRenderer; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.SoundEvent; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; public class PageSound extends Page { @@ -28,32 +30,32 @@ public PageSound(IPage pageToEmulate, SoundEvent sound) { } @Override - @SideOnly(Side.CLIENT) - public void draw(Book book, CategoryAbstract category, EntryAbstract entry, int guiLeft, int guiTop, int mouseX, int mouseY, GuiBase guiBase, FontRenderer fontRendererObj) { + @OnlyIn(Dist.CLIENT) + public void draw(Book book, CategoryAbstract category, EntryAbstract entry, int guiLeft, int guiTop, int mouseX, int mouseY, BaseScreen guiBase, FontRenderer fontRendererObj) { pageToEmulate.draw(book, category, entry, guiLeft, guiTop, mouseX, mouseY, guiBase, fontRendererObj); } @Override - @SideOnly(Side.CLIENT) - public void drawExtras(Book book, CategoryAbstract category, EntryAbstract entry, int guiLeft, int guiTop, int mouseX, int mouseY, GuiBase guiBase, FontRenderer fontRendererObj) { + @OnlyIn(Dist.CLIENT) + public void drawExtras(Book book, CategoryAbstract category, EntryAbstract entry, int guiLeft, int guiTop, int mouseX, int mouseY, BaseScreen guiBase, FontRenderer fontRendererObj) { pageToEmulate.drawExtras(book, category, entry, guiLeft, guiTop, mouseX, mouseY, guiBase, fontRendererObj); } @Override - public boolean canSee(Book book, CategoryAbstract category, EntryAbstract entry, PlayerEntity player, ItemStack bookStack, GuiEntry guiEntry) { + public boolean canSee(Book book, CategoryAbstract category, EntryAbstract entry, PlayerEntity player, ItemStack bookStack, EntryScreen guiEntry) { return pageToEmulate.canSee(book, category, entry, player, bookStack, guiEntry); } @Override - @SideOnly(Side.CLIENT) - public void onLeftClicked(Book book, CategoryAbstract category, EntryAbstract entry, int mouseX, int mouseY, PlayerEntity player, GuiEntry guiEntry) { + @OnlyIn(Dist.CLIENT) + public void onLeftClicked(Book book, CategoryAbstract category, EntryAbstract entry, int mouseX, int mouseY, PlayerEntity player, EntryScreen guiEntry) { GuideMod.PROXY.playSound(sound); pageToEmulate.onLeftClicked(book, category, entry, mouseX, mouseY, player, guiEntry); } @Override - @SideOnly(Side.CLIENT) - public void onRightClicked(Book book, CategoryAbstract category, EntryAbstract entry, int mouseX, int mouseY, PlayerEntity player, GuiEntry guiEntry) { + @OnlyIn(Dist.CLIENT) + public void onRightClicked(Book book, CategoryAbstract category, EntryAbstract entry, int mouseX, int mouseY, PlayerEntity player, EntryScreen guiEntry) { pageToEmulate.onRightClicked(book, category, entry, mouseX, mouseY, player, guiEntry); } diff --git a/src/main/java/amerifrance/guideapi/page/PageText.java b/src/main/java/amerifrance/guideapi/page/PageText.java index 7982e202..e1dd3ca9 100644 --- a/src/main/java/amerifrance/guideapi/page/PageText.java +++ b/src/main/java/amerifrance/guideapi/page/PageText.java @@ -5,11 +5,12 @@ import api.impl.abstraction.CategoryAbstract; import api.impl.abstraction.EntryAbstract; import api.util.PageHelper; -import amerifrance.guideapi.gui.GuiBase; +import amerifrance.guideapi.gui.BaseScreen; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.resources.I18n; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; + public class PageText extends Page { @@ -30,17 +31,12 @@ public PageText(String draw) { } @Override - @SideOnly(Side.CLIENT) - public void draw(Book book, CategoryAbstract category, EntryAbstract entry, int guiLeft, int guiTop, int mouseX, int mouseY, GuiBase guiBase, FontRenderer fontRendererObj) { - boolean startFlag = fontRendererObj.getUnicodeFlag(); + @OnlyIn(Dist.CLIENT) + public void draw(Book book, CategoryAbstract category, EntryAbstract entry, int guiLeft, int guiTop, int mouseX, int mouseY, BaseScreen guiBase, FontRenderer fontRendererObj) { - if (unicode) - fontRendererObj.setUnicodeFlag(true); PageHelper.drawFormattedText(guiLeft + 39, guiTop + 12 + yOffset, guiBase, I18n.format(draw)); - if (unicode && !startFlag) - fontRendererObj.setUnicodeFlag(false); } @Override diff --git a/src/main/java/amerifrance/guideapi/page/PageTextImage.java b/src/main/java/amerifrance/guideapi/page/PageTextImage.java index fcf141c7..2c3770b7 100644 --- a/src/main/java/amerifrance/guideapi/page/PageTextImage.java +++ b/src/main/java/amerifrance/guideapi/page/PageTextImage.java @@ -5,12 +5,12 @@ import api.impl.abstraction.CategoryAbstract; import api.impl.abstraction.EntryAbstract; import api.util.GuiHelper; -import amerifrance.guideapi.gui.GuiBase; +import amerifrance.guideapi.gui.BaseScreen; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; 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; public class PageTextImage extends Page { @@ -30,9 +30,9 @@ public PageTextImage(String draw, ResourceLocation image, boolean drawAtTop) { } @Override - @SideOnly(Side.CLIENT) - public void draw(Book book, CategoryAbstract category, EntryAbstract entry, int guiLeft, int guiTop, int mouseX, int mouseY, GuiBase guiBase, FontRenderer fontRendererObj) { - Minecraft.getMinecraft().getTextureManager().bindTexture(image); + @OnlyIn(Dist.CLIENT) + public void draw(Book book, CategoryAbstract category, EntryAbstract entry, int guiLeft, int guiTop, int mouseX, int mouseY, BaseScreen guiBase, FontRenderer fontRendererObj) { + Minecraft.getInstance().getTextureManager().bindTexture(image); GuiHelper.drawSizedIconWithoutColor(guiLeft + 50, guiTop + (drawAtTop ? 60 : 12), guiBase.xSize, guiBase.ySize, 0); pageText.setUnicodeFlag(unicode); diff --git a/src/main/java/amerifrance/guideapi/page/reciperenderer/BasicRecipeRenderer.java b/src/main/java/amerifrance/guideapi/page/reciperenderer/BasicRecipeRenderer.java index 23be4441..83dc4d0e 100644 --- a/src/main/java/amerifrance/guideapi/page/reciperenderer/BasicRecipeRenderer.java +++ b/src/main/java/amerifrance/guideapi/page/reciperenderer/BasicRecipeRenderer.java @@ -7,11 +7,11 @@ import api.impl.abstraction.EntryAbstract; import api.util.GuiHelper; import api.util.TextHelper; -import amerifrance.guideapi.gui.GuiBase; +import amerifrance.guideapi.gui.BaseScreen; import com.google.common.base.Strings; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; -import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.util.NonNullList; @@ -31,7 +31,7 @@ public BasicRecipeRenderer(T recipe) { } @Override - public void draw(Book book, CategoryAbstract category, EntryAbstract entry, int guiLeft, int guiTop, int mouseX, int mouseY, GuiBase guiBase, FontRenderer fontRendererObj) { + public void draw(Book book, CategoryAbstract category, EntryAbstract entry, int guiLeft, int guiTop, int mouseX, int mouseY, BaseScreen guiBase, FontRenderer fontRendererObj) { Minecraft mc = Minecraft.getMinecraft(); long time = mc.world.getTotalWorldTime(); @@ -63,7 +63,7 @@ public void draw(Book book, CategoryAbstract category, EntryAbstract entry, int protected ItemStack getNextItem(ItemStack stack, int position) { NonNullList subItems = NonNullList.create(); - stack.getItem().getSubItems(CreativeTabs.SEARCH, subItems); + stack.getItem().getSubItems(ItemGroup.SEARCH, subItems); return subItems.get(getRandomizedCycle(position, subItems.size())); } diff --git a/src/main/java/amerifrance/guideapi/page/reciperenderer/ShapedOreRecipeRenderer.java b/src/main/java/amerifrance/guideapi/page/reciperenderer/ShapedOreRecipeRenderer.java index 593f7400..787a1fc6 100644 --- a/src/main/java/amerifrance/guideapi/page/reciperenderer/ShapedOreRecipeRenderer.java +++ b/src/main/java/amerifrance/guideapi/page/reciperenderer/ShapedOreRecipeRenderer.java @@ -1,12 +1,12 @@ package amerifrance.guideapi.page.reciperenderer; -import net.minecraft.item.crafting.ShapedRecipes; +import net.minecraft.item.crafting.ShapedRecipe; import net.minecraftforge.oredict.ShapedOreRecipe; // TODO: Fix rendering of recipe public class ShapedOreRecipeRenderer extends ShapedRecipesRenderer { public ShapedOreRecipeRenderer(ShapedOreRecipe recipe) { - super(new ShapedRecipes(recipe.getGroup(), recipe.getWidth(), recipe.getHeight(), recipe.getIngredients(), recipe.getRecipeOutput())); + super(new ShapedRecipe(recipe.getGroup(), recipe.getWidth(), recipe.getHeight(), recipe.getIngredients(), recipe.getRecipeOutput())); } } diff --git a/src/main/java/amerifrance/guideapi/page/reciperenderer/ShapedRecipesRenderer.java b/src/main/java/amerifrance/guideapi/page/reciperenderer/ShapedRecipesRenderer.java index b3c3781e..cf8b0a0b 100644 --- a/src/main/java/amerifrance/guideapi/page/reciperenderer/ShapedRecipesRenderer.java +++ b/src/main/java/amerifrance/guideapi/page/reciperenderer/ShapedRecipesRenderer.java @@ -4,31 +4,30 @@ import api.impl.abstraction.CategoryAbstract; import api.impl.abstraction.EntryAbstract; import api.util.GuiHelper; -import amerifrance.guideapi.gui.GuiBase; +import amerifrance.guideapi.gui.BaseScreen; import net.minecraft.client.gui.FontRenderer; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.Ingredient; -import net.minecraft.item.crafting.ShapedRecipes; -import net.minecraftforge.oredict.OreDictionary; +import net.minecraft.item.crafting.ShapedRecipe; import java.util.Arrays; import java.util.List; -public class ShapedRecipesRenderer extends BasicRecipeRenderer { +public class ShapedRecipesRenderer extends BasicRecipeRenderer { - public ShapedRecipesRenderer(ShapedRecipes recipe) { + public ShapedRecipesRenderer(ShapedRecipe recipe) { super(recipe); } @Override - public void draw(Book book, CategoryAbstract category, EntryAbstract entry, int guiLeft, int guiTop, int mouseX, int mouseY, GuiBase guiBase, FontRenderer fontRendererObj) { + public void draw(Book book, CategoryAbstract category, EntryAbstract entry, int guiLeft, int guiTop, int mouseX, int mouseY, BaseScreen guiBase, FontRenderer fontRendererObj) { super.draw(book, category, entry, guiLeft, guiTop, mouseX, mouseY, guiBase, fontRendererObj); - for (int y = 0; y < recipe.recipeHeight; y++) { - for (int x = 0; x < recipe.recipeWidth; x++) { + for (int y = 0; y < recipe.getRecipeHeight(); y++) { + for (int x = 0; x < recipe.getRecipeHeight(); x++) { int stackX = (x + 1) * 17 + (guiLeft + 27) + x; int stackY = (y + 1) * 17 + (guiTop + 38) + y; - Ingredient ingredient = recipe.getIngredients().get(y * recipe.recipeWidth + x); + Ingredient ingredient = recipe.getIngredients().get(y * recipe.getRecipeWidth() + x); List list = Arrays.asList(ingredient.getMatchingStacks()); if (!list.isEmpty()) { ItemStack stack = list.get(getRandomizedCycle(x + (y * 3), list.size())); diff --git a/src/main/java/amerifrance/guideapi/page/reciperenderer/ShapelessOreRecipeRenderer.java b/src/main/java/amerifrance/guideapi/page/reciperenderer/ShapelessOreRecipeRenderer.java index e4e25fce..e79243b9 100644 --- a/src/main/java/amerifrance/guideapi/page/reciperenderer/ShapelessOreRecipeRenderer.java +++ b/src/main/java/amerifrance/guideapi/page/reciperenderer/ShapelessOreRecipeRenderer.java @@ -1,7 +1,6 @@ package amerifrance.guideapi.page.reciperenderer; -import net.minecraft.item.crafting.ShapelessRecipes; -import net.minecraftforge.oredict.ShapelessOreRecipe; +import net.minecraft.item.crafting.ShapelessRecipe; public class ShapelessOreRecipeRenderer extends ShapelessRecipesRenderer { diff --git a/src/main/java/amerifrance/guideapi/page/reciperenderer/ShapelessRecipesRenderer.java b/src/main/java/amerifrance/guideapi/page/reciperenderer/ShapelessRecipesRenderer.java index a99a78c0..6103c778 100644 --- a/src/main/java/amerifrance/guideapi/page/reciperenderer/ShapelessRecipesRenderer.java +++ b/src/main/java/amerifrance/guideapi/page/reciperenderer/ShapelessRecipesRenderer.java @@ -5,24 +5,23 @@ import api.impl.abstraction.EntryAbstract; import api.util.GuiHelper; import api.util.TextHelper; -import amerifrance.guideapi.gui.GuiBase; +import amerifrance.guideapi.gui.BaseScreen; import net.minecraft.client.gui.FontRenderer; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.Ingredient; -import net.minecraft.item.crafting.ShapelessRecipes; -import net.minecraftforge.oredict.OreDictionary; +import net.minecraft.item.crafting.ShapelessRecipe; import java.util.Arrays; import java.util.List; -public class ShapelessRecipesRenderer extends BasicRecipeRenderer { +public class ShapelessRecipesRenderer extends BasicRecipeRenderer { - public ShapelessRecipesRenderer(ShapelessRecipes recipe) { + public ShapelessRecipesRenderer(ShapelessRecipe recipe) { super(recipe); } @Override - public void draw(Book book, CategoryAbstract category, EntryAbstract entry, int guiLeft, int guiTop, int mouseX, int mouseY, GuiBase guiBase, FontRenderer fontRendererObj) { + public void draw(Book book, CategoryAbstract category, EntryAbstract entry, int guiLeft, int guiTop, int mouseX, int mouseY, BaseScreen guiBase, FontRenderer fontRendererObj) { super.draw(book, category, entry, guiLeft, guiTop, mouseX, mouseY, guiBase, fontRendererObj); for (int y = 0; y < 3; y++) { for (int x = 0; x < 3; x++) { diff --git a/src/main/java/amerifrance/guideapi/proxy/ClientProxy.java b/src/main/java/amerifrance/guideapi/proxy/ClientProxy.java index 0989ba40..d55c8147 100644 --- a/src/main/java/amerifrance/guideapi/proxy/ClientProxy.java +++ b/src/main/java/amerifrance/guideapi/proxy/ClientProxy.java @@ -6,9 +6,9 @@ import api.impl.Book; import api.impl.abstraction.CategoryAbstract; import api.impl.abstraction.EntryAbstract; -import amerifrance.guideapi.gui.GuiEntry; +import amerifrance.guideapi.gui.EntryScreen; import net.minecraft.client.Minecraft; -import net.minecraft.client.audio.PositionedSoundRecord; +import net.minecraft.client.audio.SimpleSound; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.SoundEvent; @@ -18,7 +18,7 @@ public class ClientProxy extends CommonProxy { @Override public void playSound(SoundEvent sound) { - Minecraft.getMinecraft().getSoundHandler().playSound(PositionedSoundRecord.getMasterRecord(sound, 1.0F)); + Minecraft.getInstance().getSoundHandler().play(SimpleSound.master(sound,1)); } @Override @@ -29,13 +29,13 @@ public void openEntry(Book book, CategoryAbstract categoryAbstract, EntryAbstrac return; } - Minecraft.getMinecraft().displayGuiScreen(new GuiEntry(book, categoryAbstract, entryAbstract, player, stack)); + Minecraft.getInstance().displayGuiScreen(new EntryScreen(book, categoryAbstract, entryAbstract, player, stack)); } @Override public void initColors() { for (ItemStack bookStack : GuideAPI.getBookToStack().values()) { - Minecraft.getMinecraft().getItemColors().registerItemColorHandler((stack, tintIndex) -> { + Minecraft.getInstance().getItemColors().registerItemColorHandler((stack, tintIndex) -> { IGuideItem guideItem = (IGuideItem) stack.getItem(); if (guideItem.getBook(stack) != null && tintIndex == 0) return guideItem.getBook(stack).getColor().getRGB(); diff --git a/src/main/java/amerifrance/guideapi/proxy/CommonProxy.java b/src/main/java/amerifrance/guideapi/proxy/CommonProxy.java index 73c31602..a8ada50d 100644 --- a/src/main/java/amerifrance/guideapi/proxy/CommonProxy.java +++ b/src/main/java/amerifrance/guideapi/proxy/CommonProxy.java @@ -6,9 +6,9 @@ import api.impl.abstraction.CategoryAbstract; import api.impl.abstraction.EntryAbstract; import api.util.NBTBookTags; -import amerifrance.guideapi.gui.GuiCategory; -import amerifrance.guideapi.gui.GuiEntry; -import amerifrance.guideapi.gui.GuiHome; +import amerifrance.guideapi.gui.CategoryScreen; +import amerifrance.guideapi.gui.EntryScreen; +import amerifrance.guideapi.gui.HomeScreen; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; @@ -38,18 +38,18 @@ public Object getClientGuiElement(int ID, PlayerEntity player, World world, int CategoryAbstract category = book.getCategoryList().get(tagCompound.getInteger(NBTBookTags.CATEGORY_TAG)); EntryAbstract entry = category.entries.get(new ResourceLocation(tagCompound.getString(NBTBookTags.ENTRY_TAG))); int pageNumber = tagCompound.getInteger(NBTBookTags.PAGE_TAG); - GuiEntry guiEntry = new GuiEntry(book, category, entry, player, bookStack); + EntryScreen guiEntry = new EntryScreen(book, category, entry, player, bookStack); guiEntry.pageNumber = pageNumber; return guiEntry; } else if (tagCompound.hasKey(NBTBookTags.CATEGORY_TAG)) { CategoryAbstract category = book.getCategoryList().get(tagCompound.getInteger(NBTBookTags.CATEGORY_TAG)); int entryPage = tagCompound.getInteger(NBTBookTags.ENTRY_PAGE_TAG); - GuiCategory guiCategory = new GuiCategory(book, category, player, bookStack, null); + CategoryScreen guiCategory = new CategoryScreen(book, category, player, bookStack, null); guiCategory.entryPage = entryPage; return guiCategory; } else { int categoryNumber = tagCompound.getInteger(NBTBookTags.CATEGORY_PAGE_TAG); - GuiHome guiHome = new GuiHome(book, player, bookStack); + HomeScreen guiHome = new HomeScreen(book, player, bookStack); guiHome.categoryPage = categoryNumber; return guiHome; } @@ -58,7 +58,7 @@ public Object getClientGuiElement(int ID, PlayerEntity player, World world, int // No-op: If the linked content doesn't exist anymore } - return new GuiHome(book, player, bookStack); + return new HomeScreen(book, player, bookStack); } return null; diff --git a/src/main/java/amerifrance/guideapi/test/TestBook3.java b/src/main/java/amerifrance/guideapi/test/TestBook3.java index 5adcb6f5..b6155085 100644 --- a/src/main/java/amerifrance/guideapi/test/TestBook3.java +++ b/src/main/java/amerifrance/guideapi/test/TestBook3.java @@ -10,9 +10,10 @@ import amerifrance.guideapi.category.CategoryItemStack; import amerifrance.guideapi.entry.EntryItemStack; import amerifrance.guideapi.page.*; -import net.minecraft.creativetab.CreativeTabs; import net.minecraft.block.Blocks; +import net.minecraft.item.ItemGroup; import net.minecraft.item.Items; +import net.minecraft.item.crafting.Ingredient; import net.minecraft.potion.Potions; import net.minecraft.item.ItemStack; import net.minecraft.potion.PotionUtils; @@ -20,7 +21,7 @@ import net.minecraft.util.text.StringTextComponent; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.brewing.BrewingRecipe; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.eventbus.api.SubscribeEvent; import javax.annotation.Nullable; @@ -37,20 +38,18 @@ public Book buildBook() { BookBinder binder = new BookBinder(new ResourceLocation(GuideMod.ID, "test_book3")) .setAuthor("TunHet") .setColor(0x7EF67F) - .setCreativeTab(CreativeTabs.COMBAT) + .setCreativeTab(ItemGroup.COMBAT) .setGuideTitle("some.guide.title") .setHeader("some.header.text") .setSpawnWithBook(); - CategoryAbstract testCategory = new CategoryItemStack("test.category.name", new ItemStack(Items.BANNER)).withKeyBase("guideapi"); + CategoryAbstract testCategory = new CategoryItemStack("test.category.name", new ItemStack(Items.BLACK_BANNER)).withKeyBase("guideapi"); testCategory.addEntry("entry", new EntryItemStack("test.entry.name", new ItemStack(Items.POTATO))); testCategory.getEntry("entry").addPage(new PageText("Hello, this is\nsome text")); testCategory.getEntry("entry").addPage(new PageFurnaceRecipe(Blocks.COBBLESTONE)); - testCategory.getEntry("entry").addPage(PageIRecipe.newShaped(new ItemStack(Items.ACACIA_BOAT), "X X", "XXX", 'X', new ItemStack(Blocks.PLANKS, 1, 4))); - testCategory.getEntry("entry").addPage(new PageBrewingRecipe(new BrewingRecipe( - PotionUtils.addPotionToItemStack(new ItemStack(Items.POTIONITEM), Potions.AWKWARD), - new ItemStack(Items.SPECKLED_MELON), - PotionUtils.addPotionToItemStack(new ItemStack(Items.POTIONITEM), Potions.HEALING))) + testCategory.getEntry("entry").addPage(PageIRecipe.newShaped(new ItemStack(Items.ACACIA_BOAT), "X X", "XXX", 'X', new ItemStack(Blocks.ACACIA_PLANKS, 1, 4))); + testCategory.getEntry("entry").addPage(new PageBrewingRecipe(new BrewingRecipe(Ingredient.fromStacks( PotionUtils.addPotionToItemStack(new ItemStack(Items.POTION), Potions.AWKWARD)),Ingredient.fromStacks( new ItemStack(Items.GLISTERING_MELON_SLICE)), + PotionUtils.addPotionToItemStack(new ItemStack(Items.POTION), Potions.HEALING))) ); testCategory.getEntry("entry").addPage(new PageJsonRecipe(new ResourceLocation("bread"))); binder.addCategory(testCategory); diff --git a/src/main/java/amerifrance/guideapi/util/APISetter.java b/src/main/java/amerifrance/guideapi/util/APISetter.java index c8f06786..8f2cad62 100644 --- a/src/main/java/amerifrance/guideapi/util/APISetter.java +++ b/src/main/java/amerifrance/guideapi/util/APISetter.java @@ -6,8 +6,7 @@ import com.google.common.base.Throwables; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fml.common.Loader; -import net.minecraftforge.fml.common.ModContainer; +import net.minecraftforge.fml.ModLoadingContext; import java.lang.reflect.Field; import java.util.List; @@ -73,8 +72,8 @@ public static void setIndexedBooks(List books) { } private static void sanityCheck() throws IllegalAccessException { - ModContainer activeMod = Loader.instance().activeModContainer(); - if (!activeMod.getModId().equals(GuideMod.ID)) - throw new IllegalAccessException("Mod " + activeMod.getModId() + " tried to access an internal-only method in GuideAPI. Please report this."); + String activeMod = ModLoadingContext.get().getActiveNamespace(); + if (!GuideMod.ID.equals(activeMod)) + throw new IllegalAccessException("Mod " + activeMod + " tried to access an internal-only method in GuideAPI. Please report this."); } } diff --git a/src/main/java/amerifrance/guideapi/util/EventHandler.java b/src/main/java/amerifrance/guideapi/util/EventHandler.java index 5de2071f..05729bf4 100644 --- a/src/main/java/amerifrance/guideapi/util/EventHandler.java +++ b/src/main/java/amerifrance/guideapi/util/EventHandler.java @@ -15,21 +15,22 @@ import net.minecraft.block.BlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; -import net.minecraft.client.gui.ScaledResolution; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.Hand; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.BlockRayTraceResult; import net.minecraft.util.math.RayTraceResult; import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.client.event.RenderGameOverlayEvent; import net.minecraftforge.event.entity.EntityJoinWorldEvent; +import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.items.ItemHandlerHelper; import java.util.Collection; @@ -46,25 +47,25 @@ public static void onPlayerJoinWorld(EntityJoinWorldEvent event) { for (Book book : GuideAPI.getBooks().values()) { if (ConfigHandler.SPAWN_BOOKS.getOrDefault(book, false) && !tag.getBoolean("hasInitial" + book.getTitle())) { ItemHandlerHelper.giveItemToPlayer(player, GuideAPI.getStackFromBook(book)); - tag.setBoolean("hasInitial" + book.getTitle(), true); + tag.putBoolean("hasInitial" + book.getTitle(), true); } } } } } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @SubscribeEvent public static void renderOverlay(RenderGameOverlayEvent.Pre event) { if (event.getType() != RenderGameOverlayEvent.ElementType.CROSSHAIRS) return; - RayTraceResult rayTrace = Minecraft.getMinecraft().objectMouseOver; - if (rayTrace == null || rayTrace.typeOfHit != RayTraceResult.Type.BLOCK) + RayTraceResult rayTrace = Minecraft.getInstance().objectMouseOver; + if (rayTrace == null || rayTrace.getType() != RayTraceResult.Type.BLOCK) return; - PlayerEntity player = Minecraft.getMinecraft().player; - World world = Minecraft.getMinecraft().world; + PlayerEntity player = Minecraft.getInstance().player; + World world = Minecraft.getInstance().world; ItemStack held = ItemStack.EMPTY; Book book = null; for (Hand hand : Hand.values()) { @@ -78,12 +79,12 @@ public static void renderOverlay(RenderGameOverlayEvent.Pre event) { if (book == null) return; - - BlockState state = world.getBlockState(rayTrace.getBlockPos()); + BlockPos rayTracePos=((BlockRayTraceResult)rayTrace).getPos(); + BlockState state = world.getBlockState(rayTracePos); String linkedEntry = null; if (state.getBlock() instanceof IGuideLinked) { IGuideLinked linked = (IGuideLinked) state.getBlock(); - ResourceLocation entryKey = linked.getLinkedEntry(world, rayTrace.getBlockPos(), player, held); + ResourceLocation entryKey = linked.getLinkedEntry(world, rayTracePos, player, held); if (entryKey != null) { for (CategoryAbstract category : book.getCategoryList()) { if (category.entries.containsKey(entryKey)) { @@ -95,12 +96,12 @@ public static void renderOverlay(RenderGameOverlayEvent.Pre event) { } if (!Strings.isNullOrEmpty(linkedEntry)) { - FontRenderer fontRenderer = Minecraft.getMinecraft().fontRenderer; - ScaledResolution scaledResolution = new ScaledResolution(Minecraft.getMinecraft()); - int drawX = scaledResolution.getScaledWidth() / 2 + 10; - int drawY = scaledResolution.getScaledHeight() / 2 - 8; + FontRenderer fontRenderer = Minecraft.getInstance().fontRenderer; + + int drawX = Minecraft.getInstance().mainWindow.getScaledWidth() / 2 + 10; + int drawY = Minecraft.getInstance().mainWindow.getScaledHeight() / 2 - 8; - Minecraft.getMinecraft().getRenderItem().renderItemIntoGUI(held, drawX, drawY); + Minecraft.getInstance().getItemRenderer().renderItemIntoGUI(held, drawX, drawY); drawY -= 2; drawX += 20; @@ -109,9 +110,9 @@ public static void renderOverlay(RenderGameOverlayEvent.Pre event) { } if (state.getBlock() instanceof IInfoRenderer.Block) { - IInfoRenderer infoRenderer = ((IInfoRenderer.Block) state.getBlock()).getInfoRenderer(book, world, rayTrace.getBlockPos(), state, rayTrace, player); + IInfoRenderer infoRenderer = ((IInfoRenderer.Block) state.getBlock()).getInfoRenderer(book, world, rayTracePos, state, rayTrace, player); if (book == ((IInfoRenderer.Block) state.getBlock()).getBook() && infoRenderer != null) - infoRenderer.drawInformation(book, world, rayTrace.getBlockPos(), state, rayTrace, player); + infoRenderer.drawInformation(book, world, rayTracePos, state, rayTrace, player); } Multimap, IInfoRenderer> bookRenderers = GuideAPI.getInfoRenderers().get(book); @@ -120,26 +121,26 @@ public static void renderOverlay(RenderGameOverlayEvent.Pre event) { Collection renderers = bookRenderers.get(state.getBlock().getClass()); for (IInfoRenderer renderer : renderers) - renderer.drawInformation(book, world, rayTrace.getBlockPos(), state, rayTrace, player); + renderer.drawInformation(book, world, rayTracePos, state, rayTrace, player); } public static CompoundNBT getModTag(PlayerEntity player, String modName) { - CompoundNBT tag = player.getEntityData(); + CompoundNBT tag = player.getPersistentData(); CompoundNBT persistTag; - if (tag.hasKey(PlayerEntity.PERSISTED_NBT_TAG)) - persistTag = tag.getCompoundTag(PlayerEntity.PERSISTED_NBT_TAG); + if (tag.contains(PlayerEntity.PERSISTED_NBT_TAG)) + persistTag = tag.getCompound(PlayerEntity.PERSISTED_NBT_TAG); else { persistTag = new CompoundNBT(); - tag.setTag(PlayerEntity.PERSISTED_NBT_TAG, persistTag); + tag.put(PlayerEntity.PERSISTED_NBT_TAG, persistTag); } CompoundNBT modTag; - if (persistTag.hasKey(modName)) { - modTag = persistTag.getCompoundTag(modName); + if (persistTag.contains(modName)) { + modTag = persistTag.getCompound(modName); } else { modTag = new CompoundNBT(); - persistTag.setTag(modName, modTag); + persistTag.put(modName, modTag); } return modTag; } diff --git a/src/main/java/amerifrance/guideapi/wrapper/AbstractWrapper.java b/src/main/java/amerifrance/guideapi/wrapper/AbstractWrapper.java index c7f16578..059de800 100644 --- a/src/main/java/amerifrance/guideapi/wrapper/AbstractWrapper.java +++ b/src/main/java/amerifrance/guideapi/wrapper/AbstractWrapper.java @@ -1,6 +1,6 @@ package amerifrance.guideapi.wrapper; -import amerifrance.guideapi.gui.GuiBase; +import amerifrance.guideapi.gui.BaseScreen; public abstract class AbstractWrapper { @@ -8,9 +8,9 @@ public abstract class AbstractWrapper { public abstract boolean canPlayerSee(); - public abstract void draw(int mouseX, int mouseY, GuiBase gui); + public abstract void draw(int mouseX, int mouseY, BaseScreen gui); - public abstract void drawExtras(int mouseX, int mouseY, GuiBase gui); + public abstract void drawExtras(int mouseX, int mouseY, BaseScreen gui); public abstract boolean isMouseOnWrapper(int mouseX, int mouseY); } diff --git a/src/main/java/amerifrance/guideapi/wrapper/CategoryWrapper.java b/src/main/java/amerifrance/guideapi/wrapper/CategoryWrapper.java index d61b501b..ed1a503d 100644 --- a/src/main/java/amerifrance/guideapi/wrapper/CategoryWrapper.java +++ b/src/main/java/amerifrance/guideapi/wrapper/CategoryWrapper.java @@ -3,9 +3,9 @@ import api.impl.Book; import api.impl.abstraction.CategoryAbstract; import api.util.GuiHelper; -import amerifrance.guideapi.gui.GuiBase; +import amerifrance.guideapi.gui.BaseScreen; import net.minecraft.client.gui.FontRenderer; -import net.minecraft.client.renderer.RenderItem; +import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; @@ -16,11 +16,11 @@ public class CategoryWrapper extends AbstractWrapper { public int x, y, width, height; public PlayerEntity player; public FontRenderer renderer; - public RenderItem renderItem; + public ItemRenderer renderItem; public boolean drawOnLeft; public ItemStack bookStack; - public CategoryWrapper(Book book, CategoryAbstract category, int x, int y, int width, int height, PlayerEntity player, FontRenderer renderer, RenderItem renderItem, boolean drawOnLeft, ItemStack bookStack) { + public CategoryWrapper(Book book, CategoryAbstract category, int x, int y, int width, int height, PlayerEntity player, FontRenderer renderer, ItemRenderer renderItem, boolean drawOnLeft, ItemStack bookStack) { this.book = book; this.category = category; this.x = x; @@ -44,12 +44,12 @@ public boolean canPlayerSee() { } @Override - public void draw(int mouseX, int mouseY, GuiBase gui) { + public void draw(int mouseX, int mouseY, BaseScreen gui) { category.draw(book, x, y, width, height, mouseX, mouseY, gui, drawOnLeft, renderItem); } @Override - public void drawExtras(int mouseX, int mouseY, GuiBase gui) { + public void drawExtras(int mouseX, int mouseY, BaseScreen gui) { category.drawExtras(book, x, y, width, height, mouseX, mouseY, gui, drawOnLeft, renderItem); } diff --git a/src/main/java/amerifrance/guideapi/wrapper/EntryWrapper.java b/src/main/java/amerifrance/guideapi/wrapper/EntryWrapper.java index 9a8d2b6d..e574e179 100644 --- a/src/main/java/amerifrance/guideapi/wrapper/EntryWrapper.java +++ b/src/main/java/amerifrance/guideapi/wrapper/EntryWrapper.java @@ -4,8 +4,8 @@ import api.impl.abstraction.CategoryAbstract; import api.impl.abstraction.EntryAbstract; import api.util.GuiHelper; -import amerifrance.guideapi.gui.GuiBase; -import amerifrance.guideapi.gui.GuiCategory; +import amerifrance.guideapi.gui.BaseScreen; +import amerifrance.guideapi.gui.CategoryScreen; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.entity.player.PlayerEntity; @@ -19,10 +19,10 @@ public class EntryWrapper extends AbstractWrapper { public int x, y, width, height; public PlayerEntity player; public FontRenderer renderer; - public GuiCategory categoryGui; + public CategoryScreen categoryGui; public ItemStack bookStack; - public EntryWrapper(GuiCategory categoryGui, Book book, CategoryAbstract category, EntryAbstract entry, int x, int y, int width, int height, PlayerEntity player, FontRenderer renderer, ItemStack bookStack) { + public EntryWrapper(CategoryScreen categoryGui, Book book, CategoryAbstract category, EntryAbstract entry, int x, int y, int width, int height, PlayerEntity player, FontRenderer renderer, ItemStack bookStack) { this.book = book; this.category = category; this.entry = entry; @@ -46,12 +46,12 @@ public boolean canPlayerSee() { } @Override - public void draw(int mouseX, int mouseY, GuiBase gui) { + public void draw(int mouseX, int mouseY, BaseScreen gui) { entry.draw(book, category, x, y, width, height, mouseX, mouseY, gui, Minecraft.getMinecraft().fontRenderer); } @Override - public void drawExtras(int mouseX, int mouseY, GuiBase gui) { + public void drawExtras(int mouseX, int mouseY, BaseScreen gui) { entry.drawExtras(book, category, x, y, width, height, mouseX, mouseY, gui, Minecraft.getMinecraft().fontRenderer); } diff --git a/src/main/java/amerifrance/guideapi/wrapper/PageWrapper.java b/src/main/java/amerifrance/guideapi/wrapper/PageWrapper.java index e19843da..7bd90e05 100644 --- a/src/main/java/amerifrance/guideapi/wrapper/PageWrapper.java +++ b/src/main/java/amerifrance/guideapi/wrapper/PageWrapper.java @@ -4,8 +4,8 @@ import api.impl.Book; import api.impl.abstraction.CategoryAbstract; import api.impl.abstraction.EntryAbstract; -import amerifrance.guideapi.gui.GuiBase; -import amerifrance.guideapi.gui.GuiEntry; +import amerifrance.guideapi.gui.BaseScreen; +import amerifrance.guideapi.gui.EntryScreen; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.entity.player.PlayerEntity; @@ -13,7 +13,7 @@ public class PageWrapper extends AbstractWrapper { - public GuiEntry guiEntry; + public EntryScreen guiEntry; public Book book; public CategoryAbstract category; public EntryAbstract entry; @@ -23,7 +23,7 @@ public class PageWrapper extends AbstractWrapper { public FontRenderer renderer; public ItemStack bookStack; - public PageWrapper(GuiEntry guiEntry, Book book, CategoryAbstract category, EntryAbstract entry, IPage page, int guiLeft, int guiTop, PlayerEntity player, FontRenderer renderer, ItemStack bookStack) { + public PageWrapper(EntryScreen guiEntry, Book book, CategoryAbstract category, EntryAbstract entry, IPage page, int guiLeft, int guiTop, PlayerEntity player, FontRenderer renderer, ItemStack bookStack) { this.guiEntry = guiEntry; this.book = book; this.category = category; @@ -46,12 +46,12 @@ public boolean canPlayerSee() { } @Override - public void draw(int mouseX, int mouseY, GuiBase gui) { + public void draw(int mouseX, int mouseY, BaseScreen gui) { page.draw(book, category, entry, guiLeft, guiTop, mouseX, mouseY, gui, Minecraft.getMinecraft().fontRenderer); } @Override - public void drawExtras(int mouseX, int mouseY, GuiBase gui) { + public void drawExtras(int mouseX, int mouseY, BaseScreen gui) { page.drawExtras(book, category, entry, guiLeft, guiTop, mouseX, mouseY, gui, Minecraft.getMinecraft().fontRenderer); } diff --git a/src/main/java/api/IPage.java b/src/main/java/api/IPage.java index d869b193..185462de 100644 --- a/src/main/java/api/IPage.java +++ b/src/main/java/api/IPage.java @@ -1,5 +1,7 @@ package api; +import amerifrance.guideapi.gui.BaseScreen; +import amerifrance.guideapi.gui.EntryScreen; import api.impl.Book; import api.impl.abstraction.CategoryAbstract; import api.impl.abstraction.EntryAbstract; @@ -12,19 +14,19 @@ public interface IPage { @OnlyIn(Dist.CLIENT) - void draw(Book book, CategoryAbstract category, EntryAbstract entry, int guiLeft, int guiTop, int mouseX, int mouseY, GuiBase guiBase, FontRenderer fontRendererObj); + void draw(Book book, CategoryAbstract category, EntryAbstract entry, int guiLeft, int guiTop, int mouseX, int mouseY, BaseScreen guiBase, FontRenderer fontRendererObj); @OnlyIn(Dist.CLIENT) - void drawExtras(Book book, CategoryAbstract category, EntryAbstract entry, int guiLeft, int guiTop, int mouseX, int mouseY, GuiBase guiBase, FontRenderer fontRendererObj); + void drawExtras(Book book, CategoryAbstract category, EntryAbstract entry, int guiLeft, int guiTop, int mouseX, int mouseY, BaseScreen guiBase, FontRenderer fontRendererObj); - boolean canSee(Book book, CategoryAbstract category, EntryAbstract entry, PlayerEntity player, ItemStack bookStack, GuiEntry guiEntry); + boolean canSee(Book book, CategoryAbstract category, EntryAbstract entry, PlayerEntity player, ItemStack bookStack, EntryScreen guiEntry); @OnlyIn(Dist.CLIENT) - void onLeftClicked(Book book, CategoryAbstract category, EntryAbstract entry, int mouseX, int mouseY, PlayerEntity player, GuiEntry guiEntry); + void onLeftClicked(Book book, CategoryAbstract category, EntryAbstract entry, int mouseX, int mouseY, PlayerEntity player, EntryScreen guiEntry); @OnlyIn(Dist.CLIENT) - void onRightClicked(Book book, CategoryAbstract category, EntryAbstract entry, int mouseX, int mouseY, PlayerEntity player, GuiEntry guiEntry); + void onRightClicked(Book book, CategoryAbstract category, EntryAbstract entry, int mouseX, int mouseY, PlayerEntity player, EntryScreen guiEntry); @OnlyIn(Dist.CLIENT) - void onInit(Book book, CategoryAbstract category, EntryAbstract entry, PlayerEntity player, ItemStack bookStack, GuiEntry guiEntry); + void onInit(Book book, CategoryAbstract category, EntryAbstract entry, PlayerEntity player, ItemStack bookStack, EntryScreen guiEntry); } diff --git a/src/main/java/api/IRecipeRenderer.java b/src/main/java/api/IRecipeRenderer.java index b9de4f17..f4fab7fd 100644 --- a/src/main/java/api/IRecipeRenderer.java +++ b/src/main/java/api/IRecipeRenderer.java @@ -1,5 +1,6 @@ package api; +import amerifrance.guideapi.gui.BaseScreen; import api.impl.Book; import api.impl.abstraction.CategoryAbstract; import api.impl.abstraction.EntryAbstract; @@ -14,10 +15,10 @@ public interface IRecipeRenderer { @OnlyIn(Dist.CLIENT) - void draw(Book book, CategoryAbstract category, EntryAbstract entry, int guiLeft, int guiTop, int mouseX, int mouseY, GuiBase guiBase, FontRenderer fontRendererObj); + void draw(Book book, CategoryAbstract category, EntryAbstract entry, int guiLeft, int guiTop, int mouseX, int mouseY, BaseScreen guiBase, FontRenderer fontRendererObj); @OnlyIn(Dist.CLIENT) - void drawExtras(Book book, CategoryAbstract category, EntryAbstract entry, int guiLeft, int guiTop, int mouseX, int mouseY, GuiBase guiBase, FontRenderer fontRendererObj); + void drawExtras(Book book, CategoryAbstract category, EntryAbstract entry, int guiLeft, int guiTop, int mouseX, int mouseY, BaseScreen guiBase, FontRenderer fontRendererObj); abstract class RecipeRendererBase implements IRecipeRenderer { @@ -29,7 +30,7 @@ public RecipeRendererBase(T recipe) { } @Override - public void drawExtras(Book book, CategoryAbstract category, EntryAbstract entry, int guiLeft, int guiTop, int mouseX, int mouseY, GuiBase guiBase, FontRenderer fontRendererObj) { + public void drawExtras(Book book, CategoryAbstract category, EntryAbstract entry, int guiLeft, int guiTop, int mouseX, int mouseY, BaseScreen guiBase, FontRenderer fontRendererObj) { guiBase.drawHoveringText(tooltips, mouseX, mouseY); tooltips.clear(); } diff --git a/src/main/java/api/SubTexture.java b/src/main/java/api/SubTexture.java index 03fa136a..f576fa0e 100644 --- a/src/main/java/api/SubTexture.java +++ b/src/main/java/api/SubTexture.java @@ -3,14 +3,11 @@ import com.mojang.blaze3d.platform.GlStateManager; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.BufferBuilder; -import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.util.ResourceLocation; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class SubTexture { @@ -62,7 +59,7 @@ public SubTexture(ResourceLocation textureLocation, int xPos, int yPos, int widt public void draw(int drawX, int drawY, double zLevel) { final float someMagicValueFromMojang = 0.00390625F; - Minecraft.getInstance().renderEngine.bindTexture(textureLocation); + Minecraft.getInstance().getTextureManager().bindTexture(textureLocation); GlStateManager.color4f(1.0F, 1.0F, 1.0F, 1.0F); Tessellator tessellator = Tessellator.getInstance(); BufferBuilder vertexbuffer = tessellator.getBuffer(); diff --git a/src/main/java/api/button/ButtonGuideAPI.java b/src/main/java/api/button/ButtonGuideAPI.java index fa9d775d..de46bd99 100644 --- a/src/main/java/api/button/ButtonGuideAPI.java +++ b/src/main/java/api/button/ButtonGuideAPI.java @@ -1,13 +1,13 @@ package api.button; -import amerifrance.guideapi.gui.GuiBase; +import amerifrance.guideapi.gui.BaseScreen; import net.minecraft.client.gui.widget.button.Button; public class ButtonGuideAPI extends Button { - public GuiBase guiBase; + public BaseScreen guiBase; - public ButtonGuideAPI(int id, int x, int y, GuiBase guiBase) { + public ButtonGuideAPI(int id, int x, int y, BaseScreen guiBase) { super(id, x, y, ""); this.guiBase = guiBase; } diff --git a/src/main/java/api/impl/Book.java b/src/main/java/api/impl/Book.java index 24715a29..f95c3c97 100644 --- a/src/main/java/api/impl/Book.java +++ b/src/main/java/api/impl/Book.java @@ -4,7 +4,7 @@ import api.util.TextHelper; import com.google.common.base.Joiner; import com.google.common.collect.Lists; -import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.ItemGroup; import net.minecraft.util.ResourceLocation; import org.apache.commons.lang3.builder.ToStringBuilder; @@ -26,13 +26,13 @@ public class Book { private Color color = new Color(171, 70, 30); private boolean spawnWithBook; private ResourceLocation registryName; - private CreativeTabs creativeTab = CreativeTabs.MISC; + private ItemGroup creativeTab = ItemGroup.MISC; /** * @deprecated see {@link BookBinder}. To be made package private in 1.13. */ @Deprecated - public Book(List categoryList, String title, String header, String displayName, String author, ResourceLocation pageTexture, ResourceLocation outlineTexture, boolean customModel, Color color, boolean spawnWithBook, ResourceLocation registryName, CreativeTabs creativeTab) { + public Book(List categoryList, String title, String header, String displayName, String author, ResourceLocation pageTexture, ResourceLocation outlineTexture, boolean customModel, Color color, boolean spawnWithBook, ResourceLocation registryName, ItemGroup creativeTab) { this.categories = categoryList; this.title = title; this.header = header; @@ -98,7 +98,7 @@ public ResourceLocation getRegistryName() { return this.registryName; } - public CreativeTabs getCreativeTab() { + public ItemGroup getCreativeTab() { return this.creativeTab; } @@ -223,10 +223,10 @@ public void setRegistryName(ResourceLocation registryName) { } /** - * @deprecated see {@link BookBinder#setCreativeTab(CreativeTabs)}. To be removed in 1.13. + * @deprecated see {@link BookBinder#setCreativeTab(ItemGroup)}. To be removed in 1.13. */ @Deprecated - public void setCreativeTab(CreativeTabs creativeTab) { + public void setCreativeTab(ItemGroup creativeTab) { this.creativeTab = creativeTab; } diff --git a/src/main/java/api/impl/BookBinder.java b/src/main/java/api/impl/BookBinder.java index 58ed5523..4aa27e14 100644 --- a/src/main/java/api/impl/BookBinder.java +++ b/src/main/java/api/impl/BookBinder.java @@ -3,9 +3,13 @@ import api.impl.abstraction.CategoryAbstract; import com.google.common.base.Strings; import com.google.common.collect.Lists; -import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.ItemGroup; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fml.common.Loader; +import net.minecraftforge.fml.ModContainer; +import net.minecraftforge.fml.ModList; +import net.minecraftforge.fml.ModLoadingContext; +import net.minecraftforge.fml.loading.moddiscovery.ModInfo; +import net.minecraftforge.forgespi.language.IModInfo; import java.awt.Color; import java.util.List; @@ -23,7 +27,7 @@ public class BookBinder { private boolean hasCustomModel; private Color color = new Color(171, 70, 30); private boolean spawnWithBook; - private CreativeTabs creativeTab = CreativeTabs.MISC; + private ItemGroup creativeTab = ItemGroup.MISC; /** * Creates a new {@link Book} builder which will provide a much more user-friendly interface for creating books. @@ -180,12 +184,12 @@ public BookBinder setSpawnWithBook() { /** * Sets the Creative Tab this book should appear in. * - * By default, all books will appear in {@link CreativeTabs#MISC}. + * By default, all books will appear in {@link ItemGroup#MISC}. * * @param creativeTab The creative tab this book should display in. * @return the builder instance for chaining. */ - public BookBinder setCreativeTab(CreativeTabs creativeTab) { + public BookBinder setCreativeTab(ItemGroup creativeTab) { this.creativeTab = creativeTab; return this; } @@ -196,7 +200,7 @@ public BookBinder setCreativeTab(CreativeTabs creativeTab) { */ public Book build() { if (Strings.isNullOrEmpty(author)) - this.author = Loader.instance().getIndexedModList().getOrDefault(registryName.getResourceDomain(), Loader.instance().getMinecraftModContainer()).getName(); + this.author = ModList.get().getModContainerById(registryName.getNamespace()).map(ModContainer::getModInfo).map(IModInfo::getDisplayName).orElse("Unknown"); if (header == null) this.header = guideTitle; diff --git a/src/main/java/api/impl/Category.java b/src/main/java/api/impl/Category.java index 01094425..014e379b 100644 --- a/src/main/java/api/impl/Category.java +++ b/src/main/java/api/impl/Category.java @@ -2,14 +2,16 @@ import api.impl.abstraction.CategoryAbstract; import api.impl.abstraction.EntryAbstract; -import amerifrance.guideapi.gui.GuiBase; -import amerifrance.guideapi.gui.GuiCategory; -import amerifrance.guideapi.gui.GuiHome; +import amerifrance.guideapi.gui.BaseScreen; +import amerifrance.guideapi.gui.CategoryScreen; +import amerifrance.guideapi.gui.HomeScreen; import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.RenderItem; +import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import java.util.Map; @@ -24,13 +26,13 @@ public Category(String name) { } @Override - @SideOnly(Side.CLIENT) - public void draw(Book book, int categoryX, int categoryY, int categoryWidth, int categoryHeight, int mouseX, int mouseY, GuiBase guiBase, boolean drawOnLeft, RenderItem renderItem) { + @OnlyIn(Dist.CLIENT) + public void draw(Book book, int categoryX, int categoryY, int categoryWidth, int categoryHeight, int mouseX, int mouseY, BaseScreen guiBase, boolean drawOnLeft, ItemRenderer renderItem) { } @Override - @SideOnly(Side.CLIENT) - public void drawExtras(Book book, int categoryX, int categoryY, int categoryWidth, int categoryHeight, int mouseX, int mouseY, GuiBase guiBase, boolean drawOnLeft, RenderItem renderItem) { + @OnlyIn(Dist.CLIENT) + public void drawExtras(Book book, int categoryX, int categoryY, int categoryWidth, int categoryHeight, int mouseX, int mouseY, BaseScreen guiBase, boolean drawOnLeft, ItemRenderer renderItem) { } @Override @@ -39,18 +41,18 @@ public boolean canSee(PlayerEntity player, ItemStack bookStack) { } @Override - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public void onLeftClicked(Book book, int mouseX, int mouseY, PlayerEntity player, ItemStack bookStack) { - Minecraft.getMinecraft().displayGuiScreen(new GuiCategory(book, this, player, bookStack, null)); + Minecraft.getInstance().displayGuiScreen(new CategoryScreen(book, this, player, bookStack, null)); } @Override - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public void onRightClicked(Book book, int mouseX, int mouseY, PlayerEntity player, ItemStack bookStack) { } @Override - @SideOnly(Side.CLIENT) - public void onInit(Book book, GuiHome guiHome, PlayerEntity player, ItemStack bookStack) { + @OnlyIn(Dist.CLIENT) + public void onInit(Book book, HomeScreen guiHome, PlayerEntity player, ItemStack bookStack) { } } diff --git a/src/main/java/api/impl/Entry.java b/src/main/java/api/impl/Entry.java index 1c79a34a..79832ec8 100644 --- a/src/main/java/api/impl/Entry.java +++ b/src/main/java/api/impl/Entry.java @@ -4,15 +4,15 @@ import api.impl.abstraction.CategoryAbstract; import api.impl.abstraction.EntryAbstract; import api.util.GuiHelper; -import amerifrance.guideapi.gui.GuiBase; -import amerifrance.guideapi.gui.GuiCategory; -import amerifrance.guideapi.gui.GuiEntry; +import amerifrance.guideapi.gui.BaseScreen; +import amerifrance.guideapi.gui.CategoryScreen; +import amerifrance.guideapi.gui.EntryScreen; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.entity.player.PlayerEntity; 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 java.awt.Color; import java.util.Collections; @@ -37,8 +37,8 @@ public Entry(String name) { } @Override - @SideOnly(Side.CLIENT) - public void draw(Book book, CategoryAbstract category, int entryX, int entryY, int entryWidth, int entryHeight, int mouseX, int mouseY, GuiBase guiBase, FontRenderer fontRendererObj) { + @OnlyIn(Dist.CLIENT) + public void draw(Book book, CategoryAbstract category, int entryX, int entryY, int entryWidth, int entryHeight, int mouseX, int mouseY, BaseScreen guiBase, FontRenderer fontRendererObj) { boolean startFlag = fontRendererObj.getUnicodeFlag(); @@ -65,8 +65,8 @@ public void draw(Book book, CategoryAbstract category, int entryX, int entryY, i } @Override - @SideOnly(Side.CLIENT) - public void drawExtras(Book book, CategoryAbstract category, int entryX, int entryY, int entryWidth, int entryHeight, int mouseX, int mouseY, GuiBase guiBase, FontRenderer fontRendererObj) { + @OnlyIn(Dist.CLIENT) + public void drawExtras(Book book, CategoryAbstract category, int entryX, int entryY, int entryWidth, int entryHeight, int mouseX, int mouseY, BaseScreen guiBase, FontRenderer fontRendererObj) { boolean startFlag = fontRendererObj.getUnicodeFlag(); fontRendererObj.setUnicodeFlag(false); @@ -92,18 +92,18 @@ public boolean canSee(PlayerEntity player, ItemStack bookStack) { } @Override - @SideOnly(Side.CLIENT) - public void onLeftClicked(Book book, CategoryAbstract category, int mouseX, int mouseY, PlayerEntity player, GuiCategory guiCategory) { - Minecraft.getMinecraft().displayGuiScreen(new GuiEntry(book, category, this, player, guiCategory.bookStack)); + @OnlyIn(Dist.CLIENT) + public void onLeftClicked(Book book, CategoryAbstract category, int mouseX, int mouseY, PlayerEntity player, CategoryScreen guiCategory) { + Minecraft.getInstance().displayGuiScreen(new EntryScreen(book, category, this, player, guiCategory.bookStack)); } @Override - @SideOnly(Side.CLIENT) - public void onRightClicked(Book book, CategoryAbstract category, int mouseX, int mouseY, PlayerEntity player, GuiCategory guiCategory) { + @OnlyIn(Dist.CLIENT) + public void onRightClicked(Book book, CategoryAbstract category, int mouseX, int mouseY, PlayerEntity player, CategoryScreen guiCategory) { } @Override - @SideOnly(Side.CLIENT) - public void onInit(Book book, CategoryAbstract category, GuiCategory guiCategory, PlayerEntity player, ItemStack bookStack) { + @OnlyIn(Dist.CLIENT) + public void onInit(Book book, CategoryAbstract category, CategoryScreen guiCategory, PlayerEntity player, ItemStack bookStack) { } } \ No newline at end of file diff --git a/src/main/java/api/impl/Page.java b/src/main/java/api/impl/Page.java index 97f853c0..88a007c8 100644 --- a/src/main/java/api/impl/Page.java +++ b/src/main/java/api/impl/Page.java @@ -3,44 +3,46 @@ import api.IPage; import api.impl.abstraction.CategoryAbstract; import api.impl.abstraction.EntryAbstract; -import amerifrance.guideapi.gui.GuiBase; -import amerifrance.guideapi.gui.GuiEntry; +import amerifrance.guideapi.gui.BaseScreen; +import amerifrance.guideapi.gui.EntryScreen; import net.minecraft.client.gui.FontRenderer; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; public class Page implements IPage { protected boolean unicode; @Override - @SideOnly(Side.CLIENT) - public void draw(Book book, CategoryAbstract category, EntryAbstract entry, int guiLeft, int guiTop, int mouseX, int mouseY, GuiBase guiBase, FontRenderer fontRendererObj) { + @OnlyIn(Dist.CLIENT) + public void draw(Book book, CategoryAbstract category, EntryAbstract entry, int guiLeft, int guiTop, int mouseX, int mouseY, BaseScreen guiBase, FontRenderer fontRendererObj) { } @Override - @SideOnly(Side.CLIENT) - public void drawExtras(Book book, CategoryAbstract category, EntryAbstract entry, int guiLeft, int guiTop, int mouseX, int mouseY, GuiBase guiBase, FontRenderer fontRendererObj) { + @OnlyIn(Dist.CLIENT) + public void drawExtras(Book book, CategoryAbstract category, EntryAbstract entry, int guiLeft, int guiTop, int mouseX, int mouseY, BaseScreen guiBase, FontRenderer fontRendererObj) { } @Override - public boolean canSee(Book book, CategoryAbstract category, EntryAbstract entry, PlayerEntity player, ItemStack bookStack, GuiEntry guiEntry) { + public boolean canSee(Book book, CategoryAbstract category, EntryAbstract entry, PlayerEntity player, ItemStack bookStack, EntryScreen guiEntry) { return true; } @Override - @SideOnly(Side.CLIENT) - public void onLeftClicked(Book book, CategoryAbstract category, EntryAbstract entry, int mouseX, int mouseY, PlayerEntity player, GuiEntry guiEntry) { + @OnlyIn(Dist.CLIENT) + public void onLeftClicked(Book book, CategoryAbstract category, EntryAbstract entry, int mouseX, int mouseY, PlayerEntity player, EntryScreen guiEntry) { } @Override - @SideOnly(Side.CLIENT) - public void onRightClicked(Book book, CategoryAbstract category, EntryAbstract entry, int mouseX, int mouseY, PlayerEntity player, GuiEntry guiEntry) { + @OnlyIn(Dist.CLIENT) + public void onRightClicked(Book book, CategoryAbstract category, EntryAbstract entry, int mouseX, int mouseY, PlayerEntity player, EntryScreen guiEntry) { } @Override - @SideOnly(Side.CLIENT) - public void onInit(Book book, CategoryAbstract category, EntryAbstract entry, PlayerEntity player, ItemStack bookStack, GuiEntry guiEntry) { + @OnlyIn(Dist.CLIENT) + public void onInit(Book book, CategoryAbstract category, EntryAbstract entry, PlayerEntity player, ItemStack bookStack, EntryScreen guiEntry) { } public void setUnicodeFlag(boolean flag) { diff --git a/src/main/java/api/impl/abstraction/CategoryAbstract.java b/src/main/java/api/impl/abstraction/CategoryAbstract.java index 96678e0c..6700278d 100644 --- a/src/main/java/api/impl/abstraction/CategoryAbstract.java +++ b/src/main/java/api/impl/abstraction/CategoryAbstract.java @@ -2,15 +2,17 @@ import api.impl.Book; import api.util.TextHelper; -import amerifrance.guideapi.gui.GuiBase; -import amerifrance.guideapi.gui.GuiHome; +import amerifrance.guideapi.gui.BaseScreen; +import amerifrance.guideapi.gui.HomeScreen; import com.google.common.base.Strings; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import net.minecraft.client.renderer.RenderItem; +import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import java.util.List; import java.util.Map; @@ -132,10 +134,10 @@ public List getTooltip() { } @OnlyIn(Dist.CLIENT) - public abstract void draw(Book book, int categoryX, int categoryY, int categoryWidth, int categoryHeight, int mouseX, int mouseY, GuiBase guiBase, boolean drawOnLeft, RenderItem renderItem); + public abstract void draw(Book book, int categoryX, int categoryY, int categoryWidth, int categoryHeight, int mouseX, int mouseY, BaseScreen guiBase, boolean drawOnLeft, ItemRenderer renderItem); @OnlyIn(Dist.CLIENT) - public abstract void drawExtras(Book book, int categoryX, int categoryY, int categoryWidth, int categoryHeight, int mouseX, int mouseY, GuiBase guiBase, boolean drawOnLeft, RenderItem renderItem); + public abstract void drawExtras(Book book, int categoryX, int categoryY, int categoryWidth, int categoryHeight, int mouseX, int mouseY, BaseScreen guiBase, boolean drawOnLeft, ItemRenderer renderItem); public abstract boolean canSee(PlayerEntity player, ItemStack bookStack); @@ -146,7 +148,7 @@ public List getTooltip() { public abstract void onRightClicked(Book book, int mouseX, int mouseY, PlayerEntity player, ItemStack bookStack); @OnlyIn(Dist.CLIENT) - public abstract void onInit(Book book, GuiHome guiHome, PlayerEntity player, ItemStack bookStack); + public abstract void onInit(Book book, HomeScreen guiHome, PlayerEntity player, ItemStack bookStack); @Override public boolean equals(Object o) { diff --git a/src/main/java/api/impl/abstraction/EntryAbstract.java b/src/main/java/api/impl/abstraction/EntryAbstract.java index 71d8a66a..fcf47a58 100644 --- a/src/main/java/api/impl/abstraction/EntryAbstract.java +++ b/src/main/java/api/impl/abstraction/EntryAbstract.java @@ -3,12 +3,14 @@ import api.IPage; import api.impl.Book; import api.util.TextHelper; -import amerifrance.guideapi.gui.GuiBase; -import amerifrance.guideapi.gui.GuiCategory; +import amerifrance.guideapi.gui.BaseScreen; +import amerifrance.guideapi.gui.CategoryScreen; import com.google.common.collect.Lists; import net.minecraft.client.gui.FontRenderer; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import java.util.List; @@ -57,21 +59,21 @@ public String getLocalizedName() { } @OnlyIn(Dist.CLIENT) - public abstract void draw(Book book, CategoryAbstract category, int entryX, int entryY, int entryWidth, int entryHeight, int mouseX, int mouseY, GuiBase guiBase, FontRenderer renderer); + public abstract void draw(Book book, CategoryAbstract category, int entryX, int entryY, int entryWidth, int entryHeight, int mouseX, int mouseY, BaseScreen guiBase, FontRenderer renderer); @OnlyIn(Dist.CLIENT) - public abstract void drawExtras(Book book, CategoryAbstract category, int entryX, int entryY, int entryWidth, int entryHeight, int mouseX, int mouseY, GuiBase guiBase, FontRenderer renderer); + public abstract void drawExtras(Book book, CategoryAbstract category, int entryX, int entryY, int entryWidth, int entryHeight, int mouseX, int mouseY, BaseScreen guiBase, FontRenderer renderer); public abstract boolean canSee(PlayerEntity player, ItemStack bookStack); @OnlyIn(Dist.CLIENT) - public abstract void onLeftClicked(Book book, CategoryAbstract category, int mouseX, int mouseY, PlayerEntity player, GuiCategory guiCategory); + public abstract void onLeftClicked(Book book, CategoryAbstract category, int mouseX, int mouseY, PlayerEntity player, CategoryScreen guiCategory); @OnlyIn(Dist.CLIENT) - public abstract void onRightClicked(Book book, CategoryAbstract category, int mouseX, int mouseY, PlayerEntity player, GuiCategory guiCategory); + public abstract void onRightClicked(Book book, CategoryAbstract category, int mouseX, int mouseY, PlayerEntity player, CategoryScreen guiCategory); @OnlyIn(Dist.CLIENT) - public abstract void onInit(Book book, CategoryAbstract category, GuiCategory guiCategory, PlayerEntity player, ItemStack bookStack); + public abstract void onInit(Book book, CategoryAbstract category, CategoryScreen guiCategory, PlayerEntity player, ItemStack bookStack); @Override public boolean equals(Object o) { diff --git a/src/main/java/api/package-info.java b/src/main/java/api/package-info.java index aa8728bd..e165a207 100644 --- a/src/main/java/api/package-info.java +++ b/src/main/java/api/package-info.java @@ -1,4 +1,2 @@ -@API(owner = "guideapi", apiVersion = "@API_VERSION@", provides = "Guide-API|API") package api; -import net.minecraftforge.fml.common.API; \ No newline at end of file diff --git a/src/main/java/api/util/GuiHelper.java b/src/main/java/api/util/GuiHelper.java index fcf6b150..db91361b 100644 --- a/src/main/java/api/util/GuiHelper.java +++ b/src/main/java/api/util/GuiHelper.java @@ -1,22 +1,25 @@ package api.util; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.RenderHelper; -import net.minecraft.client.renderer.RenderItem; +import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.client.util.ITooltipFlag.TooltipFlags; import net.minecraft.item.ItemStack; +import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.TextFormatting; import org.lwjgl.opengl.GL11; import java.awt.Color; import java.util.List; -import static net.minecraft.client.renderer.GlStateManager.*; +import static com.mojang.blaze3d.platform.GlStateManager.*; + public class GuiHelper { - private static final RenderItem render = Minecraft.getMinecraft().getRenderItem(); + private static final ItemRenderer render = Minecraft.getInstance().getItemRenderer(); /** * @param mouseX - Position of the mouse on the x-axiq @@ -46,7 +49,7 @@ public static void drawItemStack(ItemStack stack, int x, int y) { enableRescaleNormal(); enableDepth(); render.renderItemAndEffectIntoGUI(stack, x, y); - render.renderItemOverlayIntoGUI(Minecraft.getMinecraft().fontRenderer, stack, x, y, null); + render.renderItemOverlayIntoGUI(Minecraft.getInstance().fontRenderer, stack, x, y, null); RenderHelper.disableStandardItemLighting(); popMatrix(); disableLighting(); @@ -62,10 +65,10 @@ public static void drawScaledItemStack(ItemStack stack, int x, int y, float scal pushMatrix(); enableBlend(); blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - scale(scale, scale, 1.0F); + scalef(scale, scale, 1.0F); RenderHelper.enableGUIStandardItemLighting(); enableRescaleNormal(); - enableDepth(); + enableDepthTest();//enableDepth? render.renderItemAndEffectIntoGUI(stack, (int) (x / scale), (int) (y / scale)); RenderHelper.disableStandardItemLighting(); popMatrix(); @@ -85,7 +88,7 @@ public static void drawIconWithoutColor(int x, int y, int width, int height, flo RenderHelper.enableGUIStandardItemLighting(); disableLighting(); enableRescaleNormal(); - enableDepth(); + enableDepthTest(); Tessellator tessellator = Tessellator.getInstance(); tessellator.getBuffer().begin(7, DefaultVertexFormats.POSITION_TEX); tessellator.getBuffer().pos(x, y + height, zLevel).tex(0D, 1D).endVertex(); @@ -112,8 +115,8 @@ public static void drawIconWithColor(int x, int y, int width, int height, float RenderHelper.enableGUIStandardItemLighting(); disableLighting(); enableRescaleNormal(); - enableDepth(); - color((float) color.getRed() / 255F, (float) color.getGreen() / 255F, (float) color.getBlue() / 255F, (float) color.getAlpha() / 255F); + enableDepthTest(); + color4f((float) color.getRed() / 255F, (float) color.getGreen() / 255F, (float) color.getBlue() / 255F, (float) color.getAlpha() / 255F); Tessellator tessellator = Tessellator.getInstance(); tessellator.getBuffer().begin(7, DefaultVertexFormats.POSITION_TEX); tessellator.getBuffer().pos(x, y + height, zLevel).tex(0D, 1D).endVertex(); @@ -122,7 +125,7 @@ public static void drawIconWithColor(int x, int y, int width, int height, float tessellator.getBuffer().pos(x, y, zLevel).tex(0D, 0D).endVertex(); tessellator.draw(); RenderHelper.disableStandardItemLighting(); - color(1.0F, 1.0F, 1.0F, 1.0F); + color4f(1.0F, 1.0F, 1.0F, 1.0F); popMatrix(); } @@ -137,13 +140,13 @@ public static void drawSizedIconWithoutColor(int x, int y, int width, int height pushMatrix(); enableBlend(); blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - color(1F, 1F, 1F, 1F); - scale(0.5D, 0.5D, 0.5D); - translate(x, y, zLevel); + color4f(1F, 1F, 1F, 1F); + scaled(0.5D, 0.5D, 0.5D); + translated(x, y, zLevel); RenderHelper.enableGUIStandardItemLighting(); disableLighting(); enableRescaleNormal(); - enableDepth(); + enableDepthTest(); Tessellator tessellator = Tessellator.getInstance(); tessellator.getBuffer().begin(7, DefaultVertexFormats.POSITION_TEX); tessellator.getBuffer().pos(x, y + height, zLevel).tex(0D, 1D).endVertex(); @@ -166,13 +169,13 @@ public static void drawSizedIconWithColor(int x, int y, int width, int height, f pushMatrix(); enableBlend(); blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - scale(0.5D, 0.5D, 0.5D); - color((float) color.getRed() / 255F, (float) color.getGreen() / 255F, (float) color.getBlue() / 255F, (float) color.getAlpha() / 255F); - translate(x, y, zLevel); + scaled(0.5D, 0.5D, 0.5D); + color4f((float) color.getRed() / 255F, (float) color.getGreen() / 255F, (float) color.getBlue() / 255F, (float) color.getAlpha() / 255F); + translated(x, y, zLevel); RenderHelper.enableGUIStandardItemLighting(); disableLighting(); enableRescaleNormal(); - enableDepth(); + enableDepthTest(); Tessellator tessellator = Tessellator.getInstance(); tessellator.getBuffer().begin(7, DefaultVertexFormats.POSITION_TEX); tessellator.getBuffer().pos(x, y + height, zLevel).tex(0D, 1D).endVertex(); @@ -185,14 +188,14 @@ public static void drawSizedIconWithColor(int x, int y, int width, int height, f } @SuppressWarnings("unchecked") - public static List getTooltip(ItemStack stack) { - Minecraft mc = Minecraft.getMinecraft(); - List list = stack.getTooltip(mc.player, mc.gameSettings.advancedItemTooltips ? TooltipFlags.ADVANCED : TooltipFlags.NORMAL); + public static List getTooltip(ItemStack stack) { + Minecraft mc = Minecraft.getInstance(); + List list = stack.getTooltip(mc.player, mc.gameSettings.advancedItemTooltips ? TooltipFlags.ADVANCED : TooltipFlags.NORMAL); for (int k = 0; k < list.size(); ++k) { if (k == 0) { - list.set(k, stack.getRarity().rarityColor + list.get(k)); + list.get(k).applyTextStyle(stack.getRarity().color); } else { - list.set(k, TextFormatting.GRAY + list.get(k)); + list.get(k).applyTextStyle(TextFormatting.GRAY); } } return list; diff --git a/src/main/java/api/util/PageHelper.java b/src/main/java/api/util/PageHelper.java index a57f9425..b7ff08ae 100644 --- a/src/main/java/api/util/PageHelper.java +++ b/src/main/java/api/util/PageHelper.java @@ -2,7 +2,7 @@ import api.IPage; import api.impl.Page; -import amerifrance.guideapi.gui.GuiBase; +import amerifrance.guideapi.gui.BaseScreen; import amerifrance.guideapi.page.PageItemStack; import amerifrance.guideapi.page.PageText; import net.minecraft.block.Block; @@ -51,7 +51,7 @@ public static List pagesForLongText(String locText, ItemStack stack) { return pageList; } - public static void drawFormattedText(int x, int y, GuiBase guiBase, String toDraw) { + public static void drawFormattedText(int x, int y, BaseScreen guiBase, String toDraw) { FontRenderer fontRenderer = Minecraft.getMinecraft().fontRenderer; toDraw = StringEscapeUtils.unescapeJava(toDraw).replaceAll("\\t", " "); String[] lines = toDraw.split("\n"); diff --git a/src/main/java/api/util/TextHelper.java b/src/main/java/api/util/TextHelper.java index 70c06a1d..03c9ad1b 100644 --- a/src/main/java/api/util/TextHelper.java +++ b/src/main/java/api/util/TextHelper.java @@ -1,6 +1,6 @@ package api.util; -import net.minecraft.util.text.translation.I18n; +import net.minecraft.client.resources.I18n; import org.apache.commons.lang3.text.WordUtils; import java.util.ArrayList; @@ -13,7 +13,7 @@ public static String getFormattedText(String string) { } public static String localize(String input, Object... format) { - return Il8n.translateToLocalFormatted(input, format); + return I18n.format(input, format); } public static String localizeEffect(String input, Object... format) { From 15faf44a756a318f3f19a1b636eee71c6f781149 Mon Sep 17 00:00:00 2001 From: maxanier Date: Sat, 21 Mar 2020 13:25:41 +0100 Subject: [PATCH 04/28] More updates II Still very much in progress --- .../java/amerifrance/guideapi/GuideMod.java | 55 ++++++++-------- .../guideapi/network/IMessage.java | 9 --- .../guideapi/network/PacketHandler.java | 4 +- .../guideapi/network/PacketSyncCategory.java | 62 +++++++++++-------- .../guideapi/network/PacketSyncEntry.java | 2 +- .../guideapi/network/PacketSyncHome.java | 56 ++++++++++------- .../guideapi/page/PageBrewingRecipe.java | 12 ++-- .../guideapi/page/PageIRecipe.java | 27 ++------ .../guideapi/page/PageItemStack.java | 16 +---- .../reciperenderer/BasicRecipeRenderer.java | 22 +++---- .../ShapedOreRecipeRenderer.java | 12 ---- .../reciperenderer/ShapedRecipesRenderer.java | 2 - .../ShapelessOreRecipeRenderer.java | 10 --- .../ShapelessRecipesRenderer.java | 3 - .../guideapi/proxy/ClientProxy.java | 2 +- .../guideapi/proxy/CommonProxy.java | 18 +++--- .../amerifrance/guideapi/test/TestBook.java | 14 +++-- src/main/java/api/IGuideBook.java | 2 +- src/main/java/api/IRecipeRenderer.java | 3 +- src/main/java/api/util/GuiHelper.java | 2 +- src/main/java/api/util/PageHelper.java | 2 +- 21 files changed, 146 insertions(+), 189 deletions(-) delete mode 100644 src/main/java/amerifrance/guideapi/network/IMessage.java delete mode 100644 src/main/java/amerifrance/guideapi/page/reciperenderer/ShapedOreRecipeRenderer.java delete mode 100644 src/main/java/amerifrance/guideapi/page/reciperenderer/ShapelessOreRecipeRenderer.java diff --git a/src/main/java/amerifrance/guideapi/GuideMod.java b/src/main/java/amerifrance/guideapi/GuideMod.java index 152d3336..097eb0cf 100644 --- a/src/main/java/amerifrance/guideapi/GuideMod.java +++ b/src/main/java/amerifrance/guideapi/GuideMod.java @@ -1,64 +1,63 @@ package amerifrance.guideapi; +import amerifrance.guideapi.proxy.ClientProxy; import api.GuideAPI; import api.IGuideBook; import api.impl.Book; import amerifrance.guideapi.network.PacketHandler; import amerifrance.guideapi.proxy.CommonProxy; import amerifrance.guideapi.util.AnnotationHandler; -import net.minecraft.launchwrapper.Launch; +import net.minecraftforge.fml.DistExecutor; import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.SidedProxy; -import net.minecraftforge.fml.common.discovery.ASMDataTable; -import net.minecraftforge.fml.common.event.FMLInitializationEvent; -import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; -import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; -import net.minecraftforge.fml.common.network.NetworkRegistry; +import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; +import net.minecraftforge.fml.event.lifecycle.FMLLoadCompleteEvent; +import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; import org.apache.commons.lang3.tuple.Pair; import java.io.File; -@Mod(modid = GuideMod.ID, name = GuideMod.NAME, version = GuideMod.VERSION) +@Mod(value = GuideMod.ID) public class GuideMod { public static final String NAME = "Guide-API"; public static final String ID = "guideapi"; public static final String CHANNEL = "GuideAPI"; public static final String VERSION = "@VERSION@"; - public static final boolean IS_DEV = (Boolean) Launch.blackboard.get("fml.deobfuscatedEnvironment"); + public static boolean inDev = false; - @Mod.Instance(ID) public static GuideMod INSTANCE; - @SidedProxy(clientSide = "amerifrance.guideapi.proxy.ClientProxy", serverSide = "amerifrance.guideapi.proxy.CommonProxy") - public static CommonProxy PROXY; + public static CommonProxy PROXY = DistExecutor.runForDist(() -> ClientProxy::new, () -> CommonProxy::new); - public static File configDir; - public static ASMDataTable dataTable; + public GuideMod(){ + INSTANCE=this; + checkDevEnv(); + GuideAPI.initialize(); + FMLJavaModLoadingContext.get().getModEventBus().addListener(this::setup); + FMLJavaModLoadingContext.get().getModEventBus().addListener(this::loadComplete); - @Mod.EventHandler - public void preInit(FMLPreInitializationEvent event) { - configDir = new File(event.getModConfigurationDirectory(), NAME); - configDir.mkdirs(); - ConfigHandler.init(new File(configDir, NAME + ".cfg")); - GuideAPI.initialize(); - dataTable = event.getAsmData(); + } - NetworkRegistry.INSTANCE.registerGuiHandler(this, PROXY); + private void setup(final FMLCommonSetupEvent event){ PacketHandler.registerPackets(); } - @Mod.EventHandler - public void init(FMLInitializationEvent event) { + private void loadComplete(final FMLLoadCompleteEvent event){ PROXY.initColors(); - } - - @Mod.EventHandler - public void postInit(FMLPostInitializationEvent event) { ConfigHandler.handleBookConfigs(); for (Pair guide : AnnotationHandler.BOOK_CLASSES) guide.getRight().handlePost(GuideAPI.getStackFromBook(guide.getLeft())); } + + + + + private void checkDevEnv() { + String launchTarget = System.getenv().get("target"); + if (launchTarget != null && launchTarget.contains("dev")) { + inDev = true; + } + } } diff --git a/src/main/java/amerifrance/guideapi/network/IMessage.java b/src/main/java/amerifrance/guideapi/network/IMessage.java deleted file mode 100644 index 170ae6f1..00000000 --- a/src/main/java/amerifrance/guideapi/network/IMessage.java +++ /dev/null @@ -1,9 +0,0 @@ -package amerifrance.guideapi.network; - -/** - * Guide-API - * - * @author maxanier - */ -public interface IMessage { -} diff --git a/src/main/java/amerifrance/guideapi/network/PacketHandler.java b/src/main/java/amerifrance/guideapi/network/PacketHandler.java index 28eaa06f..7ca012f6 100644 --- a/src/main/java/amerifrance/guideapi/network/PacketHandler.java +++ b/src/main/java/amerifrance/guideapi/network/PacketHandler.java @@ -17,8 +17,8 @@ public class PacketHandler { public static void registerPackets() { INSTANCE.registerMessage(nextID(),PacketSyncEntry.class,PacketSyncEntry::encode,PacketSyncEntry::decode,PacketSyncEntry::handle); - INSTANCE.registerMessage(PacketSyncHome.class, PacketSyncHome.class, 0, Side.SERVER); - INSTANCE.registerMessage(PacketSyncCategory.class, PacketSyncCategory.class, 1, Side.SERVER); + INSTANCE.registerMessage(nextID(),PacketSyncCategory.class,PacketSyncCategory::encode,PacketSyncCategory::decode,PacketSyncCategory::handle); + INSTANCE.registerMessage(nextID(),PacketSyncHome.class,PacketSyncHome::encode,PacketSyncHome::decode,PacketSyncHome::handle); } protected static int nextID() { diff --git a/src/main/java/amerifrance/guideapi/network/PacketSyncCategory.java b/src/main/java/amerifrance/guideapi/network/PacketSyncCategory.java index 9be201d6..72cddf9f 100644 --- a/src/main/java/amerifrance/guideapi/network/PacketSyncCategory.java +++ b/src/main/java/amerifrance/guideapi/network/PacketSyncCategory.java @@ -3,13 +3,18 @@ import api.IGuideItem; import api.util.NBTBookTags; import io.netty.buffer.ByteBuf; +import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; -import net.minecraftforge.fml.common.network.simpleimpl.IMessage; -import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; -import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; +import net.minecraft.network.PacketBuffer; +import net.minecraft.util.ResourceLocation; -public class PacketSyncCategory implements IMessage, IMessageHandler { +import net.minecraftforge.fml.network.NetworkEvent; +import org.apache.commons.lang3.Validate; + +import java.util.function.Supplier; + +public class PacketSyncCategory { public int category; public int page; @@ -24,34 +29,39 @@ public PacketSyncCategory(int category, int page) { this.page = page; } - @Override - public void fromBytes(ByteBuf buf) { - this.category = buf.readInt(); - this.page = buf.readInt(); + static void encode(PacketSyncCategory msg, PacketBuffer buf){ + buf.writeInt(msg.category); + buf.writeInt(msg.page); } - @Override - public void toBytes(ByteBuf buf) { - buf.writeInt(category); - buf.writeInt(page); + static PacketSyncCategory decode(PacketBuffer buf){ + PacketSyncCategory msg=new PacketSyncCategory(); + msg.category=buf.readInt(); + msg.page = buf.readInt(); + return msg; } - @Override - public IMessage onMessage(PacketSyncCategory message, MessageContext ctx) { - ItemStack book = ctx.getServerHandler().player.getHeldItemOffhand(); - if (book.isEmpty() || !(book.getItem() instanceof IGuideItem)) - book = ctx.getServerHandler().player.getHeldItemMainhand(); + public static void handle(final PacketSyncCategory msg, Supplier contextSupplier){ + final NetworkEvent.Context ctx=contextSupplier.get(); + ServerPlayerEntity player = ctx.getSender(); + Validate.notNull(player); + ctx.enqueueWork(()->{ + ItemStack book = player.getHeldItemOffhand(); + if (book.isEmpty() || !(book.getItem() instanceof IGuideItem)) + book = player.getHeldItemMainhand(); - if (!book.isEmpty() && book.getItem() instanceof IGuideItem) { - if (message.category != -1 && message.page != -1) { - if (!book.hasTagCompound()) - book.setTagCompound(new CompoundNBT()); + if (!book.isEmpty() && book.getItem() instanceof IGuideItem) { + if (msg.category != -1 && msg.page != -1) { + if (!book.hasTag()) + book.setTag(new CompoundNBT()); - book.getTagCompound().setInteger(NBTBookTags.CATEGORY_TAG, message.category); - book.getTagCompound().setInteger(NBTBookTags.ENTRY_PAGE_TAG, message.page); - book.getTagCompound().removeTag(NBTBookTags.ENTRY_TAG); + book.getTag().putInt(NBTBookTags.CATEGORY_TAG, msg.category); + book.getTag().putInt(NBTBookTags.ENTRY_PAGE_TAG, msg.page); + book.getTag().remove(NBTBookTags.ENTRY_TAG); + } } - } - return null; + }); + ctx.setPacketHandled(true); } + } diff --git a/src/main/java/amerifrance/guideapi/network/PacketSyncEntry.java b/src/main/java/amerifrance/guideapi/network/PacketSyncEntry.java index a45fad70..64b942fb 100644 --- a/src/main/java/amerifrance/guideapi/network/PacketSyncEntry.java +++ b/src/main/java/amerifrance/guideapi/network/PacketSyncEntry.java @@ -14,7 +14,7 @@ import java.util.function.Supplier; -public class PacketSyncEntry implements IMessage { +public class PacketSyncEntry{ public int category; public ResourceLocation entry; diff --git a/src/main/java/amerifrance/guideapi/network/PacketSyncHome.java b/src/main/java/amerifrance/guideapi/network/PacketSyncHome.java index 9e2a4070..9635eff6 100644 --- a/src/main/java/amerifrance/guideapi/network/PacketSyncHome.java +++ b/src/main/java/amerifrance/guideapi/network/PacketSyncHome.java @@ -3,13 +3,17 @@ import api.IGuideItem; import api.util.NBTBookTags; import io.netty.buffer.ByteBuf; +import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; -import net.minecraftforge.fml.common.network.simpleimpl.IMessage; -import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; -import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; +import net.minecraft.network.PacketBuffer; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fml.network.NetworkEvent; +import org.apache.commons.lang3.Validate; -public class PacketSyncHome implements IMessage, IMessageHandler { +import java.util.function.Supplier; + +public class PacketSyncHome { public int page; @@ -21,29 +25,33 @@ public PacketSyncHome(int page) { this.page = page; } - @Override - public void fromBytes(ByteBuf buf) { - this.page = buf.readInt(); + static void encode(PacketSyncHome msg, PacketBuffer buf){ + buf.writeInt(msg.page); } - @Override - public void toBytes(ByteBuf buf) { - buf.writeInt(page); + static PacketSyncHome decode(PacketBuffer buf){ + PacketSyncHome msg=new PacketSyncHome(); + msg.page = buf.readInt(); + return msg; } - @Override - public IMessage onMessage(PacketSyncHome message, MessageContext ctx) { - ItemStack book = ctx.getServerHandler().player.getHeldItemOffhand(); - if (book.isEmpty() || !(book.getItem() instanceof IGuideItem)) - book = ctx.getServerHandler().player.getHeldItemMainhand(); - - if (!book.isEmpty() && book.getItem() instanceof IGuideItem && message.page != -1) { - if (!book.hasTagCompound()) - book.setTagCompound(new CompoundNBT()); - book.getTagCompound().setInteger(NBTBookTags.CATEGORY_PAGE_TAG, message.page); - book.getTagCompound().removeTag(NBTBookTags.CATEGORY_TAG); - book.getTagCompound().removeTag(NBTBookTags.ENTRY_TAG); - } - return null; + public static void handle(final PacketSyncHome msg, Supplier contextSupplier){ + final NetworkEvent.Context ctx=contextSupplier.get(); + ServerPlayerEntity player = ctx.getSender(); + Validate.notNull(player); + ctx.enqueueWork(()->{ + ItemStack book = player.getHeldItemOffhand(); + if (book.isEmpty() || !(book.getItem() instanceof IGuideItem)) + book = player.getHeldItemMainhand(); + + if (!book.isEmpty() && book.getItem() instanceof IGuideItem && msg.page != -1) { + if (!book.hasTag()) + book.setTag(new CompoundNBT()); + book.getTag().putInt(NBTBookTags.CATEGORY_PAGE_TAG, msg.page); + book.getTag().remove(NBTBookTags.CATEGORY_TAG); + book.getTag().remove(NBTBookTags.ENTRY_TAG); + } + }); + ctx.setPacketHandled(true); } } diff --git a/src/main/java/amerifrance/guideapi/page/PageBrewingRecipe.java b/src/main/java/amerifrance/guideapi/page/PageBrewingRecipe.java index 47b67961..17f7ba93 100644 --- a/src/main/java/amerifrance/guideapi/page/PageBrewingRecipe.java +++ b/src/main/java/amerifrance/guideapi/page/PageBrewingRecipe.java @@ -12,6 +12,10 @@ import net.minecraft.client.gui.FontRenderer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.Ingredient; +import net.minecraft.util.text.ITextComponent; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.common.brewing.BrewingRecipe; import java.util.ArrayList; @@ -20,8 +24,8 @@ public class PageBrewingRecipe extends Page { public BrewingRecipe recipe; - public ItemStack ingredient; - public ItemStack input; + public Ingredient ingredient; + public Ingredient input; public ItemStack output; /** @@ -48,7 +52,7 @@ public PageBrewingRecipe(ItemStack input, ItemStack ingredient, ItemStack output } @Override - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public void draw(Book book, CategoryAbstract category, EntryAbstract entry, int guiLeft, int guiTop, int mouseX, int mouseY, BaseScreen guiBase, FontRenderer fontRendererObj) { int xStart = guiLeft + 62; @@ -67,7 +71,7 @@ public void draw(Book book, CategoryAbstract category, EntryAbstract entry, int //start input GuiHelper.drawItemStack(ingredient, x, y); - List tooltip = null; + List tooltip = null; if (GuiHelper.isMouseBetween(mouseX, mouseY, x, y, 15, 15)) tooltip = GuiHelper.getTooltip(ingredient); diff --git a/src/main/java/amerifrance/guideapi/page/PageIRecipe.java b/src/main/java/amerifrance/guideapi/page/PageIRecipe.java index e45ea187..94b36bee 100644 --- a/src/main/java/amerifrance/guideapi/page/PageIRecipe.java +++ b/src/main/java/amerifrance/guideapi/page/PageIRecipe.java @@ -7,9 +7,7 @@ import api.impl.abstraction.EntryAbstract; import amerifrance.guideapi.gui.BaseScreen; import amerifrance.guideapi.gui.EntryScreen; -import amerifrance.guideapi.page.reciperenderer.ShapedOreRecipeRenderer; import amerifrance.guideapi.page.reciperenderer.ShapedRecipesRenderer; -import amerifrance.guideapi.page.reciperenderer.ShapelessOreRecipeRenderer; import amerifrance.guideapi.page.reciperenderer.ShapelessRecipesRenderer; import amerifrance.guideapi.util.LogHelper; import net.minecraft.client.gui.FontRenderer; @@ -24,7 +22,7 @@ public class PageIRecipe extends Page { - public IRecipe recipe; + public IRecipe recipe; public IRecipeRenderer iRecipeRenderer; protected boolean isValid; @@ -32,15 +30,13 @@ public class PageIRecipe extends Page { * Use this if you are creating a page for a standard recipe, one of: *

*

    - *
  • {@link ShapedRecipes}
    • - *
  • {@link ShapelessRecipes}
    • - *
  • {@link ShapedOreRecipe}
    • - *
  • {@link ShapelessOreRecipe}
    • + *
  • {@link ShapedRecipe}
    • + *
  • {@link ShapelessRecipe}
    • *
* * @param recipe - Recipe to draw */ - public PageIRecipe(IRecipe recipe) { + public PageIRecipe(IRecipe recipe) { this(recipe, getRenderer(recipe)); } @@ -48,7 +44,7 @@ public PageIRecipe(IRecipe recipe) { * @param recipe - Recipe to draw * @param iRecipeRenderer - Your custom Recipe drawer */ - public PageIRecipe(IRecipe recipe, IRecipeRenderer iRecipeRenderer) { + public PageIRecipe(IRecipe recipe, IRecipeRenderer iRecipeRenderer) { this.recipe = recipe; this.iRecipeRenderer = iRecipeRenderer; isValid = recipe != null && iRecipeRenderer != null; @@ -77,15 +73,8 @@ public boolean canSee(Book book, CategoryAbstract category, EntryAbstract entry, return isValid; } - public static PageIRecipe newShaped(ItemStack output, Object... input) { - return new PageIRecipe(new ShapedOreRecipe(null, output, input)); - } - - public static PageIRecipe newShapeless(ItemStack output, Object... input) { - return new PageIRecipe(new ShapelessOreRecipe(null, output, input)); - } - static IRecipeRenderer getRenderer(IRecipe recipe) { + static IRecipeRenderer getRenderer(IRecipe recipe) { if (recipe == null) { LogHelper.error("Cannot get renderer for null recipe."); return null; @@ -93,10 +82,6 @@ static IRecipeRenderer getRenderer(IRecipe recipe) { return new ShapedRecipesRenderer((ShapedRecipe) recipe); } else if (recipe instanceof ShapelessRecipe) { return new ShapelessRecipesRenderer((ShapelessRecipe) recipe); - } else if (recipe instanceof ShapedOreRecipe) { - return new ShapedOreRecipeRenderer((ShapedOreRecipe) recipe); - } else if (recipe instanceof ShapelessOreRecipe) { - return new ShapelessOreRecipeRenderer((ShapelessOreRecipe) recipe); } else { LogHelper.error("Cannot get renderer for recipe type "+recipe.getClass().toString()); return null; diff --git a/src/main/java/amerifrance/guideapi/page/PageItemStack.java b/src/main/java/amerifrance/guideapi/page/PageItemStack.java index 7d9c8a76..4218463a 100644 --- a/src/main/java/amerifrance/guideapi/page/PageItemStack.java +++ b/src/main/java/amerifrance/guideapi/page/PageItemStack.java @@ -10,6 +10,7 @@ import net.minecraft.block.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.Ingredient; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; @@ -42,21 +43,6 @@ public PageItemStack(String draw, Block block) { this(draw, new ItemStack(block)); } - /** - * @param draw - Unlocalized text to draw - * @param entry - OreDict entry to render - */ - public PageItemStack(String draw, String entry) { - super(draw, 60); - this.stack = new ItemStack(Blocks.FIRE); - - if (!OreDictionary.getOres(entry).isEmpty()) { - for (int i = 0; i < OreDictionary.getOres(entry).size(); i++) { - ItemStack stack = OreDictionary.getOres(entry).get(i); - this.stack = stack; - } - } - } @Override @OnlyIn(Dist.CLIENT) diff --git a/src/main/java/amerifrance/guideapi/page/reciperenderer/BasicRecipeRenderer.java b/src/main/java/amerifrance/guideapi/page/reciperenderer/BasicRecipeRenderer.java index 83dc4d0e..8ec2a1c1 100644 --- a/src/main/java/amerifrance/guideapi/page/reciperenderer/BasicRecipeRenderer.java +++ b/src/main/java/amerifrance/guideapi/page/reciperenderer/BasicRecipeRenderer.java @@ -15,11 +15,10 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.util.NonNullList; -import net.minecraftforge.oredict.OreDictionary; import java.util.Random; -public class BasicRecipeRenderer extends RecipeRendererBase { +public class BasicRecipeRenderer> extends RecipeRendererBase { private long lastCycle = -1; private int cycleIdx = 0; @@ -32,15 +31,15 @@ public BasicRecipeRenderer(T recipe) { @Override public void draw(Book book, CategoryAbstract category, EntryAbstract entry, int guiLeft, int guiTop, int mouseX, int mouseY, BaseScreen guiBase, FontRenderer fontRendererObj) { - Minecraft mc = Minecraft.getMinecraft(); + Minecraft mc = Minecraft.getInstance(); - long time = mc.world.getTotalWorldTime(); + long time = mc.world.getGameTime(); if (lastCycle < 0 || lastCycle < time - 20) { if (lastCycle > 0) { cycleIdx++; cycleIdx = Math.max(0, cycleIdx); } - lastCycle = mc.world.getTotalWorldTime(); + lastCycle = mc.world.getGameTime(); } SubTexture.CRAFTING_GRID.draw(guiLeft + 42, guiTop + 53); @@ -53,19 +52,16 @@ public void draw(Book book, CategoryAbstract category, EntryAbstract entry, int ItemStack stack = recipe.getRecipeOutput(); - if (!stack.isEmpty() && stack.getItemDamage() == OreDictionary.WILDCARD_VALUE) - stack = getNextItem(stack, 0); - GuiHelper.drawItemStack(stack, outputX, outputY); if (GuiHelper.isMouseBetween(mouseX, mouseY, outputX, outputY, 15, 15)) tooltips = GuiHelper.getTooltip(recipe.getRecipeOutput()); } - protected ItemStack getNextItem(ItemStack stack, int position) { - NonNullList subItems = NonNullList.create(); - stack.getItem().getSubItems(ItemGroup.SEARCH, subItems); - return subItems.get(getRandomizedCycle(position, subItems.size())); - } +// protected ItemStack getNextItem(ItemStack stack, int position) { +// NonNullList subItems = NonNullList.create(); +// stack.getItem().fillItemGroup(ItemGroup.SEARCH, subItems); +// return subItems.get(getRandomizedCycle(position, subItems.size())); +// } protected int getRandomizedCycle(int index, int max) { rand.setSeed(index); diff --git a/src/main/java/amerifrance/guideapi/page/reciperenderer/ShapedOreRecipeRenderer.java b/src/main/java/amerifrance/guideapi/page/reciperenderer/ShapedOreRecipeRenderer.java deleted file mode 100644 index 787a1fc6..00000000 --- a/src/main/java/amerifrance/guideapi/page/reciperenderer/ShapedOreRecipeRenderer.java +++ /dev/null @@ -1,12 +0,0 @@ -package amerifrance.guideapi.page.reciperenderer; - -import net.minecraft.item.crafting.ShapedRecipe; -import net.minecraftforge.oredict.ShapedOreRecipe; - -// TODO: Fix rendering of recipe -public class ShapedOreRecipeRenderer extends ShapedRecipesRenderer { - - public ShapedOreRecipeRenderer(ShapedOreRecipe recipe) { - super(new ShapedRecipe(recipe.getGroup(), recipe.getWidth(), recipe.getHeight(), recipe.getIngredients(), recipe.getRecipeOutput())); - } -} diff --git a/src/main/java/amerifrance/guideapi/page/reciperenderer/ShapedRecipesRenderer.java b/src/main/java/amerifrance/guideapi/page/reciperenderer/ShapedRecipesRenderer.java index cf8b0a0b..850f0ac2 100644 --- a/src/main/java/amerifrance/guideapi/page/reciperenderer/ShapedRecipesRenderer.java +++ b/src/main/java/amerifrance/guideapi/page/reciperenderer/ShapedRecipesRenderer.java @@ -31,8 +31,6 @@ public void draw(Book book, CategoryAbstract category, EntryAbstract entry, int List list = Arrays.asList(ingredient.getMatchingStacks()); if (!list.isEmpty()) { ItemStack stack = list.get(getRandomizedCycle(x + (y * 3), list.size())); - if (stack.getItemDamage() == OreDictionary.WILDCARD_VALUE) - stack = getNextItem(stack, x); GuiHelper.drawItemStack(stack, stackX, stackY); if (GuiHelper.isMouseBetween(mouseX, mouseY, stackX, stackY, 15, 15)) tooltips = GuiHelper.getTooltip(stack); diff --git a/src/main/java/amerifrance/guideapi/page/reciperenderer/ShapelessOreRecipeRenderer.java b/src/main/java/amerifrance/guideapi/page/reciperenderer/ShapelessOreRecipeRenderer.java deleted file mode 100644 index e79243b9..00000000 --- a/src/main/java/amerifrance/guideapi/page/reciperenderer/ShapelessOreRecipeRenderer.java +++ /dev/null @@ -1,10 +0,0 @@ -package amerifrance.guideapi.page.reciperenderer; - -import net.minecraft.item.crafting.ShapelessRecipe; - -public class ShapelessOreRecipeRenderer extends ShapelessRecipesRenderer { - - public ShapelessOreRecipeRenderer(ShapelessOreRecipe recipe) { - super(new ShapelessRecipes(recipe.getGroup(), recipe.getRecipeOutput(), recipe.getIngredients())); - } -} diff --git a/src/main/java/amerifrance/guideapi/page/reciperenderer/ShapelessRecipesRenderer.java b/src/main/java/amerifrance/guideapi/page/reciperenderer/ShapelessRecipesRenderer.java index 6103c778..860d80aa 100644 --- a/src/main/java/amerifrance/guideapi/page/reciperenderer/ShapelessRecipesRenderer.java +++ b/src/main/java/amerifrance/guideapi/page/reciperenderer/ShapelessRecipesRenderer.java @@ -33,9 +33,6 @@ public void draw(Book book, CategoryAbstract category, EntryAbstract entry, int List list = Arrays.asList(ingredient.getMatchingStacks()); if (!list.isEmpty()) { ItemStack stack = list.get(getRandomizedCycle(x + (y * 3), list.size())); - if (stack.getItemDamage() == OreDictionary.WILDCARD_VALUE) - stack = getNextItem(stack, x); - GuiHelper.drawItemStack(stack, stackX, stackY); if (GuiHelper.isMouseBetween(mouseX, mouseY, stackX, stackY, 15, 15)) tooltips = GuiHelper.getTooltip(stack); diff --git a/src/main/java/amerifrance/guideapi/proxy/ClientProxy.java b/src/main/java/amerifrance/guideapi/proxy/ClientProxy.java index d55c8147..a90c2f19 100644 --- a/src/main/java/amerifrance/guideapi/proxy/ClientProxy.java +++ b/src/main/java/amerifrance/guideapi/proxy/ClientProxy.java @@ -35,7 +35,7 @@ public void openEntry(Book book, CategoryAbstract categoryAbstract, EntryAbstrac @Override public void initColors() { for (ItemStack bookStack : GuideAPI.getBookToStack().values()) { - Minecraft.getInstance().getItemColors().registerItemColorHandler((stack, tintIndex) -> { + Minecraft.getInstance().getItemColors().register((stack, tintIndex) -> { IGuideItem guideItem = (IGuideItem) stack.getItem(); if (guideItem.getBook(stack) != null && tintIndex == 0) return guideItem.getBook(stack).getColor().getRGB(); diff --git a/src/main/java/amerifrance/guideapi/proxy/CommonProxy.java b/src/main/java/amerifrance/guideapi/proxy/CommonProxy.java index a8ada50d..cc0502c7 100644 --- a/src/main/java/amerifrance/guideapi/proxy/CommonProxy.java +++ b/src/main/java/amerifrance/guideapi/proxy/CommonProxy.java @@ -32,23 +32,23 @@ public Object getClientGuiElement(int ID, PlayerEntity player, World world, int if (!bookStack.isEmpty() && bookStack.getItem() instanceof IGuideItem) { Book book = GuideAPI.getIndexedBooks().get(ID); try { - if (bookStack.hasTagCompound()) { - CompoundNBT tagCompound = bookStack.getTagCompound(); - if (tagCompound.hasKey(NBTBookTags.ENTRY_TAG) && tagCompound.hasKey(NBTBookTags.CATEGORY_TAG)) { - CategoryAbstract category = book.getCategoryList().get(tagCompound.getInteger(NBTBookTags.CATEGORY_TAG)); + if (bookStack.hasTag()) { + CompoundNBT tagCompound = bookStack.getTag(); + if (tagCompound.contains(NBTBookTags.ENTRY_TAG) && tagCompound.contains(NBTBookTags.CATEGORY_TAG)) { + CategoryAbstract category = book.getCategoryList().get(tagCompound.getInt(NBTBookTags.CATEGORY_TAG)); EntryAbstract entry = category.entries.get(new ResourceLocation(tagCompound.getString(NBTBookTags.ENTRY_TAG))); - int pageNumber = tagCompound.getInteger(NBTBookTags.PAGE_TAG); + int pageNumber = tagCompound.getInt(NBTBookTags.PAGE_TAG); EntryScreen guiEntry = new EntryScreen(book, category, entry, player, bookStack); guiEntry.pageNumber = pageNumber; return guiEntry; - } else if (tagCompound.hasKey(NBTBookTags.CATEGORY_TAG)) { - CategoryAbstract category = book.getCategoryList().get(tagCompound.getInteger(NBTBookTags.CATEGORY_TAG)); - int entryPage = tagCompound.getInteger(NBTBookTags.ENTRY_PAGE_TAG); + } else if (tagCompound.contains(NBTBookTags.CATEGORY_TAG)) { + CategoryAbstract category = book.getCategoryList().get(tagCompound.getInt(NBTBookTags.CATEGORY_TAG)); + int entryPage = tagCompound.getInt(NBTBookTags.ENTRY_PAGE_TAG); CategoryScreen guiCategory = new CategoryScreen(book, category, player, bookStack, null); guiCategory.entryPage = entryPage; return guiCategory; } else { - int categoryNumber = tagCompound.getInteger(NBTBookTags.CATEGORY_PAGE_TAG); + int categoryNumber = tagCompound.getInt(NBTBookTags.CATEGORY_PAGE_TAG); HomeScreen guiHome = new HomeScreen(book, player, bookStack); guiHome.categoryPage = categoryNumber; return guiHome; diff --git a/src/main/java/amerifrance/guideapi/test/TestBook.java b/src/main/java/amerifrance/guideapi/test/TestBook.java index 78df4bd0..b5ddd9cd 100644 --- a/src/main/java/amerifrance/guideapi/test/TestBook.java +++ b/src/main/java/amerifrance/guideapi/test/TestBook.java @@ -16,11 +16,15 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import net.minecraft.block.Blocks; +import net.minecraft.item.ItemGroup; import net.minecraft.item.Items; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; +import net.minecraft.item.crafting.Ingredient; +import net.minecraft.item.crafting.ShapedRecipe; +import net.minecraft.util.NonNullList; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.oredict.ShapedOreRecipe; +import net.minecraftforge.common.Tags; import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -55,16 +59,16 @@ public Book buildBook() { entries.put(new ResourceLocation("guideapi", "entry"), entry); pages.add(PageIRecipe.newShapeless(new ItemStack(Blocks.IRON_BLOCK), "ingotIron", "ingotIron", "ingotIron", "ingotIron", "ingotIron", "ingotIron", "ingotIron", "ingotIron", "ingotIron")); - pages.add(PageIRecipe.newShapeless(new ItemStack(Blocks.PLANKS, 4), new ItemStack(Blocks.LOG))); + pages.add(PageIRecipe.newShapeless(new ItemStack(Blocks.OAK_PLANKS, 4), new ItemStack(Blocks.OAK_LOG))); - categories.add(new CategoryItemStack(entries, "test.category.name", new ItemStack(Items.BANNER))); + categories.add(new CategoryItemStack(entries, "test.category.name", new ItemStack(Items.BLUE_BANNER))); book.setCategoryList(categories); book.setRegistryName(new ResourceLocation("guideapi", "test_book")); return book; } @Override - public IRecipe getRecipe(@Nonnull ItemStack bookStack) { - return new ShapedOreRecipe(null, bookStack, " X ", "X X", " X ", 'X', "ingotIron").setRegistryName(book.getRegistryName()); + public IRecipe getRecipe(@Nonnull ItemStack bookStack) { + return new ShapedRecipe(book.getRegistryName(), "", 3,1,NonNullList.from(Ingredient.EMPTY,Ingredient.EMPTY,Ingredient.fromTag(Tags.Items.INGOTS_IRON),Ingredient.EMPTY),bookStack); } } diff --git a/src/main/java/api/IGuideBook.java b/src/main/java/api/IGuideBook.java index 401c6b90..ce205265 100644 --- a/src/main/java/api/IGuideBook.java +++ b/src/main/java/api/IGuideBook.java @@ -35,7 +35,7 @@ default void handleModel(@Nonnull ItemStack bookStack) { * @return an IRecipe to register for your book or null to not include one. */ @Nullable - default IRecipe getRecipe(@Nonnull ItemStack bookStack) { + default IRecipe getRecipe(@Nonnull ItemStack bookStack) { return null; } diff --git a/src/main/java/api/IRecipeRenderer.java b/src/main/java/api/IRecipeRenderer.java index f4fab7fd..3207b2ae 100644 --- a/src/main/java/api/IRecipeRenderer.java +++ b/src/main/java/api/IRecipeRenderer.java @@ -7,6 +7,7 @@ import com.google.common.collect.Lists; import net.minecraft.client.gui.FontRenderer; import net.minecraft.item.crafting.IRecipe; +import net.minecraft.util.text.ITextComponent; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; @@ -23,7 +24,7 @@ public interface IRecipeRenderer { abstract class RecipeRendererBase implements IRecipeRenderer { protected T recipe; - protected List tooltips = Lists.newArrayList(); + protected List tooltips = Lists.newArrayList(); public RecipeRendererBase(T recipe) { this.recipe = recipe; diff --git a/src/main/java/api/util/GuiHelper.java b/src/main/java/api/util/GuiHelper.java index db91361b..e5caff1e 100644 --- a/src/main/java/api/util/GuiHelper.java +++ b/src/main/java/api/util/GuiHelper.java @@ -47,7 +47,7 @@ public static void drawItemStack(ItemStack stack, int x, int y) { blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); RenderHelper.enableGUIStandardItemLighting(); enableRescaleNormal(); - enableDepth(); + enableDepthTest(); render.renderItemAndEffectIntoGUI(stack, x, y); render.renderItemOverlayIntoGUI(Minecraft.getInstance().fontRenderer, stack, x, y, null); RenderHelper.disableStandardItemLighting(); diff --git a/src/main/java/api/util/PageHelper.java b/src/main/java/api/util/PageHelper.java index b7ff08ae..753ffcab 100644 --- a/src/main/java/api/util/PageHelper.java +++ b/src/main/java/api/util/PageHelper.java @@ -52,7 +52,7 @@ public static List pagesForLongText(String locText, ItemStack stack) { } public static void drawFormattedText(int x, int y, BaseScreen guiBase, String toDraw) { - FontRenderer fontRenderer = Minecraft.getMinecraft().fontRenderer; + FontRenderer fontRenderer = Minecraft.getInstance().fontRenderer; toDraw = StringEscapeUtils.unescapeJava(toDraw).replaceAll("\\t", " "); String[] lines = toDraw.split("\n"); for (String line : lines) { From 00fea41c48f71cb35f834bcd3fd17a039d2357c1 Mon Sep 17 00:00:00 2001 From: maxanier Date: Sun, 22 Mar 2020 01:18:38 +0100 Subject: [PATCH 05/28] Almost ready to compile --- .../amerifrance/guideapi/ConfigHandler.java | 47 ------- .../amerifrance/guideapi/GuideConfig.java | 74 +++++++++++ .../java/amerifrance/guideapi/GuideMod.java | 1 - .../guideapi/RegistrarGuideAPI.java | 35 ++--- .../guideapi/button/ButtonBack.java | 21 +-- .../guideapi/button/ButtonNext.java | 24 ++-- .../guideapi/button/ButtonPrev.java | 21 +-- .../guideapi/button/ButtonSearch.java | 15 ++- .../guideapi/category/CategoryItemStack.java | 3 +- .../category/CategoryResourceLocation.java | 3 +- .../amerifrance/guideapi/gui/BaseScreen.java | 53 +++----- .../guideapi/gui/CategoryScreen.java | 83 ++++++------ .../amerifrance/guideapi/gui/EntryScreen.java | 113 +++++++++------- .../amerifrance/guideapi/gui/HomeScreen.java | 98 +++++++------- .../guideapi/gui/SearchScreen.java | 122 +++++++++--------- .../guideapi/info/InfoRendererImage.java | 4 +- .../guideapi/item/ItemGuideBook.java | 60 +++++---- .../guideapi/page/PageBrewingRecipe.java | 29 +++-- .../guideapi/page/PageFurnaceRecipe.java | 5 +- .../amerifrance/guideapi/page/PageSound.java | 4 +- .../guideapi/proxy/ClientProxy.java | 40 ++++++ .../guideapi/proxy/CommonProxy.java | 44 +------ .../amerifrance/guideapi/test/TestBook2.java | 12 +- .../guideapi/util/AnnotationHandler.java | 44 +++++-- .../guideapi/util/EventHandler.java | 8 +- .../amerifrance/guideapi/util/LogHelper.java | 8 +- .../guideapi/wrapper/AbstractWrapper.java | 2 +- .../guideapi/wrapper/CategoryWrapper.java | 2 +- .../guideapi/wrapper/EntryWrapper.java | 6 +- .../guideapi/wrapper/PageWrapper.java | 6 +- src/main/java/api/IPage.java | 4 +- src/main/java/api/IRecipeRenderer.java | 4 +- src/main/java/api/button/ButtonGuideAPI.java | 4 +- src/main/java/api/impl/Category.java | 4 +- src/main/java/api/impl/Entry.java | 20 +-- src/main/java/api/impl/Page.java | 4 +- .../impl/abstraction/CategoryAbstract.java | 4 +- .../api/impl/abstraction/EntryAbstract.java | 4 +- src/main/java/api/util/GuiHelper.java | 2 +- 39 files changed, 556 insertions(+), 481 deletions(-) delete mode 100644 src/main/java/amerifrance/guideapi/ConfigHandler.java create mode 100644 src/main/java/amerifrance/guideapi/GuideConfig.java diff --git a/src/main/java/amerifrance/guideapi/ConfigHandler.java b/src/main/java/amerifrance/guideapi/ConfigHandler.java deleted file mode 100644 index c70f8176..00000000 --- a/src/main/java/amerifrance/guideapi/ConfigHandler.java +++ /dev/null @@ -1,47 +0,0 @@ -package amerifrance.guideapi; - -import api.GuideAPI; -import api.impl.Book; -import com.google.common.collect.Maps; -import net.minecraftforge.common.config.Configuration; - -import java.io.File; -import java.util.Map; - -public class ConfigHandler { - - public static final Map SPAWN_BOOKS = Maps.newHashMap(); - - public static Configuration config; - - // Settings - public static boolean enableLogging; - public static boolean canSpawnWithBooks; - - public static void init(File file) { - config = new Configuration(file); - syncConfig(); - } - - public static void syncConfig() { - String category; - - category = "Books"; - config.addCustomCategoryComment(category, "All settings related to Books."); - canSpawnWithBooks = config.getBoolean("canSpawnWithBooks", category, true, "Allows books to spawn with new players.\nThis is a global override for all books."); - - category = "General"; - config.addCustomCategoryComment(category, "Miscellaneous settings."); - enableLogging = config.getBoolean("enableLogging", category, true, "Enables extra information being printed to the console."); - - config.save(); - } - - public static void handleBookConfigs() { - for (Book book : GuideAPI.getBooks().values()) - SPAWN_BOOKS.put(book, config.getBoolean(book.getRegistryName().toString(), "Books.Spawn", book.shouldSpawnWithBook(), "")); - - config.setCategoryComment("Books.Spawn", "If true, the user will spawn with the book.\nThis defaults to the value the book owner has set and is overridden by this config."); - config.save(); - } -} diff --git a/src/main/java/amerifrance/guideapi/GuideConfig.java b/src/main/java/amerifrance/guideapi/GuideConfig.java new file mode 100644 index 00000000..13c84162 --- /dev/null +++ b/src/main/java/amerifrance/guideapi/GuideConfig.java @@ -0,0 +1,74 @@ +package amerifrance.guideapi; + + +import api.GuideAPI; +import api.impl.Book; +import net.minecraftforge.common.ForgeConfigSpec; +import net.minecraftforge.fml.ModLoadingContext; +import net.minecraftforge.fml.config.ModConfig; +import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; +import org.apache.commons.lang3.tuple.Pair; + +public class GuideConfig { + /** + * Synced to clients. + * Only loaded on world load + */ + public static final Server SERVER; + /** + * For side independent configuration. Not synced. + * Loaded after registry events but before setup + */ + public static final Common COMMON; + + private static final ForgeConfigSpec serverSpec; + private static final ForgeConfigSpec commonSpec; + + + static { + final Pair specPair = new ForgeConfigSpec.Builder().configure(Server::new); + serverSpec = specPair.getRight(); + SERVER = specPair.getLeft(); + } + + static { + final Pair specPair = new ForgeConfigSpec.Builder().configure(Common::new); + commonSpec = specPair.getRight(); + COMMON = specPair.getLeft(); + } + + public static void registerConfigs() { + ModLoadingContext.get().registerConfig(ModConfig.Type.COMMON, commonSpec); + ModLoadingContext.get().registerConfig(ModConfig.Type.SERVER, serverSpec); + FMLJavaModLoadingContext.get().getModEventBus().register(GuideConfig.class); + } + + public static class Server { + + public final ForgeConfigSpec.BooleanValue canSpawnWithBook; + + Server(ForgeConfigSpec.Builder builder) { + builder.comment("Server configuration settings").push("server"); + canSpawnWithBook = builder.comment("Allows books to spawn with new players.\nThis is a global override for all books.").define("canSpawnWithBook",true); + builder.pop(); + } + +// for ( Book book : GuideAPI.getBooks().values()) TODO +// SPAWN_BOOKS.put(book, config.getBoolean(book.getRegistryName().toString(), "Books.Spawn", book.shouldSpawnWithBook(), "")); +// +// config.setCategoryComment("Books.Spawn", "If true, the user will spawn with the book.\nThis defaults to the value the book owner has set and is overridden by this config."); + } + + public static class Common { + + public final ForgeConfigSpec.BooleanValue enableLogging; + + + Common(ForgeConfigSpec.Builder builder) { + builder.comment("Common configurations settings").comment("common"); + enableLogging = builder.comment("Enables extra information being printed to the console.").define("enableLogging",true); + builder.pop(); + } + } + +} diff --git a/src/main/java/amerifrance/guideapi/GuideMod.java b/src/main/java/amerifrance/guideapi/GuideMod.java index 097eb0cf..51175a53 100644 --- a/src/main/java/amerifrance/guideapi/GuideMod.java +++ b/src/main/java/amerifrance/guideapi/GuideMod.java @@ -45,7 +45,6 @@ private void setup(final FMLCommonSetupEvent event){ private void loadComplete(final FMLLoadCompleteEvent event){ PROXY.initColors(); - ConfigHandler.handleBookConfigs(); for (Pair guide : AnnotationHandler.BOOK_CLASSES) guide.getRight().handlePost(GuideAPI.getStackFromBook(guide.getLeft())); diff --git a/src/main/java/amerifrance/guideapi/RegistrarGuideAPI.java b/src/main/java/amerifrance/guideapi/RegistrarGuideAPI.java index 42d18cd0..bba0fa53 100644 --- a/src/main/java/amerifrance/guideapi/RegistrarGuideAPI.java +++ b/src/main/java/amerifrance/guideapi/RegistrarGuideAPI.java @@ -32,10 +32,11 @@ public class RegistrarGuideAPI { * using @ObjectHolder will not have their Item fields populated. Thus, we must use an event that fires *after* * Item object holders are populated, but *before* the recipe registry. Since the events are fired in alphabetical order, * we just pick one that starts with a letter before "r". + * TODO check */ @SubscribeEvent public static void registerItemsInADifferentRegistryEventBecauseLoadOrderingAndObjectHoldersAreImportant(RegistryEvent.Register event) { - AnnotationHandler.gatherBooks(GuideMod.dataTable); + AnnotationHandler.gatherBooks(); for (Book book : GuideAPI.getBooks().values()) { Item guideBook = new ItemGuideBook(book); @@ -44,22 +45,22 @@ public static void registerItemsInADifferentRegistryEventBecauseLoadOrderingAndO APISetter.setBookForStack(book, new ItemStack(guideBook)); } } - - @SubscribeEvent(priority = EventPriority.LOWEST) - public static void registerRecipes(RegistryEvent.Register event) { - for (Pair guide : AnnotationHandler.BOOK_CLASSES) { - IRecipe recipe = guide.getRight().getRecipe(GuideAPI.getStackFromBook(guide.getLeft())); - if (recipe != null) - event.getRegistry().register(recipe); - } - - for (Book book : GuideAPI.getBooks().values()) - for (CategoryAbstract cat : book.getCategoryList()) - for (EntryAbstract entry : cat.entries.values()) - for (IPage page : entry.pageList) - if (page instanceof PageJsonRecipe) - ((PageJsonRecipe) page).init(); - } +// TODO +// @SubscribeEvent(priority = EventPriority.LOWEST) +// public static void registerRecipes(RegistryEvent.Register event) { +// for (Pair guide : AnnotationHandler.BOOK_CLASSES) { +// IRecipe recipe = guide.getRight().getRecipe(GuideAPI.getStackFromBook(guide.getLeft())); +// if (recipe != null) +// event.getRegistry().register(recipe); +// } +// +// for (Book book : GuideAPI.getBooks().values()) +// for (CategoryAbstract cat : book.getCategoryList()) +// for (EntryAbstract entry : cat.entries.values()) +// for (IPage page : entry.pageList) +// if (page instanceof PageJsonRecipe) +// ((PageJsonRecipe) page).init(); +// } @SubscribeEvent public static void registerModels(ModelRegistryEvent event) { diff --git a/src/main/java/amerifrance/guideapi/button/ButtonBack.java b/src/main/java/amerifrance/guideapi/button/ButtonBack.java index ff4a67db..20682ddc 100644 --- a/src/main/java/amerifrance/guideapi/button/ButtonBack.java +++ b/src/main/java/amerifrance/guideapi/button/ButtonBack.java @@ -5,34 +5,35 @@ import api.util.GuiHelper; import api.util.TextHelper; import amerifrance.guideapi.gui.BaseScreen; +import com.mojang.blaze3d.platform.GlStateManager; import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.widget.button.Button; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fml.client.config.GuiUtils; import java.util.ArrayList; import java.util.List; public class ButtonBack extends ButtonGuideAPI { - public ButtonBack(int id, int x, int y, BaseScreen guiBase) { - super(id, x, y, guiBase); - width = 18; - height = 10; + public ButtonBack(int widthIn, int heightIn, Button.IPressable onPress, BaseScreen guiBase) { + super(widthIn, heightIn, 18, 10, onPress,guiBase); } @Override - public void drawButton(Minecraft minecraft, int mouseX, int mouseY, float partialTicks) { + public void renderButton(int mouseX, int mouseY, float partialTicks) { if (this.visible) { RenderHelper.enableGUIStandardItemLighting(); GlStateManager.enableBlend(); GlStateManager.disableLighting(); - GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); - minecraft.getTextureManager().bindTexture(new ResourceLocation(GuideMod.ID, "textures/gui/book_colored.png")); + GlStateManager.color4f(1.0F, 1.0F, 1.0F, 1.0F); + Minecraft.getInstance().getTextureManager().bindTexture(new ResourceLocation(GuideMod.ID, "textures/gui/book_colored.png")); if (GuiHelper.isMouseBetween(mouseX, mouseY, x, y, width, height)) { - this.drawTexturedModalRect(x, y + 1, 70, 201, 18, 10); - guiBase.drawHoveringText(getHoveringText(), mouseX, mouseY, Minecraft.getMinecraft().fontRenderer); + this.blit(x,y+1,70,201,18,10); + GuiUtils.drawHoveringText(getHoveringText(),mouseX,mouseY,width,height,width,Minecraft.getInstance().fontRenderer); } else { - this.drawTexturedModalRect(x, y, 94, 201, 18, 10); + this.blit(x,y,94,201,18,10); } GlStateManager.disableBlend(); RenderHelper.disableStandardItemLighting(); diff --git a/src/main/java/amerifrance/guideapi/button/ButtonNext.java b/src/main/java/amerifrance/guideapi/button/ButtonNext.java index a808c176..a07f79e9 100644 --- a/src/main/java/amerifrance/guideapi/button/ButtonNext.java +++ b/src/main/java/amerifrance/guideapi/button/ButtonNext.java @@ -5,38 +5,38 @@ import api.util.GuiHelper; import api.util.TextHelper; import amerifrance.guideapi.gui.BaseScreen; +import com.mojang.blaze3d.platform.GlStateManager; import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.widget.button.Button; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fml.client.config.GuiUtils; import java.util.ArrayList; import java.util.List; public class ButtonNext extends ButtonGuideAPI { - public ButtonNext(int id, int x, int y, BaseScreen guiBase) { - super(id, x, y, guiBase); - width = 18; - height = 10; + public ButtonNext(int widthIn, int heightIn, Button.IPressable onPress, BaseScreen guiBase) { + super(widthIn, heightIn, 18, 10, onPress,guiBase); } @Override - public void drawButton(Minecraft minecraft, int mouseX, int mouseY, float partialTicks) { - if (this.visible) { + public void renderButton( int mouseX, int mouseY, float partialTicks) { RenderHelper.enableGUIStandardItemLighting(); GlStateManager.enableBlend(); - GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); + GlStateManager.color4f(1.0F, 1.0F, 1.0F, 1.0F); GlStateManager.disableLighting(); - minecraft.getTextureManager().bindTexture(new ResourceLocation(GuideMod.ID, "textures/gui/book_colored.png")); + Minecraft.getInstance().getTextureManager().bindTexture(new ResourceLocation(GuideMod.ID, "textures/gui/book_colored.png")); if (GuiHelper.isMouseBetween(mouseX, mouseY, x, y, width, height)) { - this.drawTexturedModalRect(x, y + 1, 47, 201, 18, 10); - guiBase.drawHoveringText(getHoveringText(), mouseX, mouseY, Minecraft.getMinecraft().fontRenderer); + this.blit(x,y+1,47,201,18,10); + GuiUtils.drawHoveringText(getHoveringText(),mouseX,mouseY,width,height,width,Minecraft.getInstance().fontRenderer); } else { - this.drawTexturedModalRect(x, y, 24, 201, 18, 10); + this.blit(x,y,24,201,18,10); } GlStateManager.disableBlend(); RenderHelper.disableStandardItemLighting(); - } + } public List getHoveringText() { diff --git a/src/main/java/amerifrance/guideapi/button/ButtonPrev.java b/src/main/java/amerifrance/guideapi/button/ButtonPrev.java index e1204756..adbbf873 100644 --- a/src/main/java/amerifrance/guideapi/button/ButtonPrev.java +++ b/src/main/java/amerifrance/guideapi/button/ButtonPrev.java @@ -5,34 +5,35 @@ import api.util.GuiHelper; import api.util.TextHelper; import amerifrance.guideapi.gui.BaseScreen; +import com.mojang.blaze3d.platform.GlStateManager; import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.widget.button.Button; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fml.client.config.GuiUtils; import java.util.ArrayList; import java.util.List; public class ButtonPrev extends ButtonGuideAPI { - public ButtonPrev(int id, int x, int y, BaseScreen guiBase) { - super(id, x, y, guiBase); - width = 18; - height = 10; + public ButtonPrev(int widthIn, int heightIn, Button.IPressable onPress, BaseScreen guiBase) { + super(widthIn, heightIn, 18, 10, onPress,guiBase); } @Override - public void drawButton(Minecraft minecraft, int mouseX, int mouseY, float partialTicks) { + public void renderButton(int mouseX, int mouseY, float partialTicks) { if (this.visible) { RenderHelper.enableGUIStandardItemLighting(); GlStateManager.enableBlend(); - GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); + GlStateManager.color4f(1.0F, 1.0F, 1.0F, 1.0F); GlStateManager.disableLighting(); - minecraft.getTextureManager().bindTexture(new ResourceLocation(GuideMod.ID, "textures/gui/book_colored.png")); + Minecraft.getInstance().getTextureManager().bindTexture(new ResourceLocation(GuideMod.ID, "textures/gui/book_colored.png")); if (GuiHelper.isMouseBetween(mouseX, mouseY, x, y, width, height)) { - this.drawTexturedModalRect(x, y + 1, 47, 214, 18, 10); - guiBase.drawHoveringText(getHoveringText(), mouseX, mouseY, Minecraft.getMinecraft().fontRenderer); + this.blit(x,y+1,47,214,18,10); + GuiUtils.drawHoveringText(getHoveringText(),mouseX,mouseY,width,height,width,Minecraft.getInstance().fontRenderer); } else { - this.drawTexturedModalRect(x, y, 24, 214, 18, 10); + this.blit(x,y,24,214,18,10); } GlStateManager.disableBlend(); RenderHelper.disableStandardItemLighting(); diff --git a/src/main/java/amerifrance/guideapi/button/ButtonSearch.java b/src/main/java/amerifrance/guideapi/button/ButtonSearch.java index 3f2c262d..912c9332 100644 --- a/src/main/java/amerifrance/guideapi/button/ButtonSearch.java +++ b/src/main/java/amerifrance/guideapi/button/ButtonSearch.java @@ -5,30 +5,31 @@ import api.util.GuiHelper; import api.util.TextHelper; import amerifrance.guideapi.gui.BaseScreen; +import com.mojang.blaze3d.platform.GlStateManager; import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.widget.button.Button; import net.minecraft.client.renderer.RenderHelper; +import net.minecraftforge.fml.client.config.GuiUtils; import java.util.ArrayList; import java.util.List; public class ButtonSearch extends ButtonGuideAPI { - public ButtonSearch(int id, int x, int y, BaseScreen guiBase) { - super(id, x, y, guiBase); - width = 15; - height = 15; + public ButtonSearch(int widthIn, int heightIn, Button.IPressable onPress, BaseScreen guiBase) { + super(widthIn, heightIn, 15, 15, onPress,guiBase); } @Override - public void drawButton(Minecraft mc, int mouseX, int mouseY, float partialTicks) { + public void renderButton(int mouseX, int mouseY, float partialTicks) { if (this.visible) { RenderHelper.enableGUIStandardItemLighting(); GlStateManager.enableBlend(); - GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); + GlStateManager.color4f(1.0F, 1.0F, 1.0F, 1.0F); GlStateManager.disableLighting(); if (GuiHelper.isMouseBetween(mouseX, mouseY, x, y, width, height)) { SubTexture.MAGNIFYING_GLASS.draw(x, y + 1); - guiBase.drawHoveringText(getHoveringText(), mouseX, mouseY, Minecraft.getMinecraft().fontRenderer); + GuiUtils.drawHoveringText(getHoveringText(),mouseX,mouseY,width,height,width,Minecraft.getInstance().fontRenderer); } else { SubTexture.MAGNIFYING_GLASS.draw(x, y); } diff --git a/src/main/java/amerifrance/guideapi/category/CategoryItemStack.java b/src/main/java/amerifrance/guideapi/category/CategoryItemStack.java index 2844edec..6c58af3f 100644 --- a/src/main/java/amerifrance/guideapi/category/CategoryItemStack.java +++ b/src/main/java/amerifrance/guideapi/category/CategoryItemStack.java @@ -11,6 +11,7 @@ import net.minecraft.util.ResourceLocation; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; +import net.minecraftforge.fml.client.config.GuiUtils; import java.util.Map; @@ -38,7 +39,7 @@ public void draw(Book book, int categoryX, int categoryY, int categoryWidth, int @OnlyIn(Dist.CLIENT) public void drawExtras(Book book, int categoryX, int categoryY, int categoryWidth, int categoryHeight, int mouseX, int mouseY, BaseScreen guiBase, boolean drawOnLeft, ItemRenderer renderItem) { if (canSee(guiBase.player, guiBase.bookStack) && GuiHelper.isMouseBetween(mouseX, mouseY, categoryX, categoryY, categoryWidth, categoryHeight)) - guiBase.drawHoveringText(this.getTooltip(), mouseX, mouseY, Minecraft.getInstance().fontRenderer); + GuiUtils.drawHoveringText(this.getTooltip(), mouseX, mouseY, categoryWidth,categoryHeight,-1,Minecraft.getInstance().fontRenderer); } @Override diff --git a/src/main/java/amerifrance/guideapi/category/CategoryResourceLocation.java b/src/main/java/amerifrance/guideapi/category/CategoryResourceLocation.java index dbc4a723..a6b3d04b 100644 --- a/src/main/java/amerifrance/guideapi/category/CategoryResourceLocation.java +++ b/src/main/java/amerifrance/guideapi/category/CategoryResourceLocation.java @@ -10,6 +10,7 @@ import net.minecraft.util.ResourceLocation; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; +import net.minecraftforge.fml.client.config.GuiUtils; import java.util.Map; @@ -38,7 +39,7 @@ public void draw(Book book, int categoryX, int categoryY, int categoryWidth, int @OnlyIn(Dist.CLIENT) public void drawExtras(Book book, int categoryX, int categoryY, int categoryWidth, int categoryHeight, int mouseX, int mouseY, BaseScreen guiBase, boolean drawOnLeft, ItemRenderer renderItem) { if (canSee(guiBase.player, guiBase.bookStack) && GuiHelper.isMouseBetween(mouseX, mouseY, categoryX, categoryY, categoryWidth, categoryHeight)) - guiBase.drawHoveringText(this.getTooltip(), mouseX, mouseY, Minecraft.getInstance().fontRenderer); + GuiUtils.drawHoveringText(this.getTooltip(), mouseX, mouseY, categoryWidth,categoryHeight,-1,Minecraft.getInstance().fontRenderer); } @Override diff --git a/src/main/java/amerifrance/guideapi/gui/BaseScreen.java b/src/main/java/amerifrance/guideapi/gui/BaseScreen.java index bbf5b3e8..8783404e 100644 --- a/src/main/java/amerifrance/guideapi/gui/BaseScreen.java +++ b/src/main/java/amerifrance/guideapi/gui/BaseScreen.java @@ -8,10 +8,13 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.text.ITextComponent; +import net.minecraftforge.fml.client.config.GuiUtils; +import org.lwjgl.glfw.GLFW; import org.lwjgl.opengl.GL11; import java.awt.Color; import java.util.List; +import java.util.stream.Collectors; import static com.mojang.blaze3d.platform.GlStateManager.*; @@ -33,15 +36,19 @@ public BaseScreen(ITextComponent title, PlayerEntity player, ItemStack bookStack } @Override - public boolean doesGuiPauseGame() { + public boolean isPauseScreen() { return false; } @Override - public void keyTyped(char typedChar, int keyCode) { - if (keyCode == Keyboard.KEY_ESCAPE || keyCode == this.minecraft.gameSettings.keyBindInventory.getKeyCode()) { - this.minecraft.displayGuiScreen(null); - this.minecraft.setIngameFocus(); + public boolean keyPressed(int p_keyPressed_1_, int p_keyPressed_2_, int p_keyPressed_3_) { + if (minecraft!=null&&(p_keyPressed_1_ == GLFW.GLFW_KEY_ESCAPE || p_keyPressed_1_==this.minecraft.gameSettings.keyBindInventory.getKey().getKeyCode())) { + this.onClose(); + this.minecraft.setGameFocused(true); + return true; + } + else{ + return super.keyPressed(p_keyPressed_1_, p_keyPressed_2_, p_keyPressed_3_); } } @@ -67,7 +74,7 @@ public void drawTexturedModalRectWithColor(int x, int y, int textureX, int textu @Override public void drawCenteredString(FontRenderer fontRendererObj, String string, int x, int y, int color) { RenderHelper.disableStandardItemLighting(); - fontRendererObj.drawString(string, x - fontRendererObj.getStringWidth(string) / 2, y, color); + fontRendererObj.drawString(string, x - fontRendererObj.getStringWidth(string) / 2f, y, color); RenderHelper.disableStandardItemLighting(); } @@ -75,39 +82,13 @@ public void drawCenteredStringWithShadow(FontRenderer fontRendererObj, String st super.drawCenteredString(fontRendererObj, string, x, y, color); } - @Override - public void drawTexturedModalRect(int x, int y, int textureX, int textureY, int width, int height) { - pushMatrix(); - color4f(1.0F, 1.0F, 1.0F, 1.0F); - super.drawTexturedModalRect(x, y, textureX, textureY, width, height); - popMatrix(); - } - - @Override - public void drawHoveringText(List list, int x, int y, FontRenderer font) { - disableLighting(); - RenderHelper.disableStandardItemLighting(); - super.drawHoveringText(list, x, y, font); - RenderHelper.enableStandardItemLighting(); - enableLighting(); + public void drawHoveringTextComponents(List tooltip , int mouseX, int mouseY){ + this.drawHoveringText(tooltip.stream().map(ITextComponent::getFormattedText).collect(Collectors.toList()), mouseX,mouseY); } - @Override - public void drawHoveringText(List list, int x, int y) { - disableLighting(); - RenderHelper.disableStandardItemLighting(); - super.drawHoveringText(list, x, y); - RenderHelper.enableStandardItemLighting(); - enableLighting(); + public void drawHoveringText(List tooltip , int mouseX, int mouseY){ + GuiUtils.drawHoveringText(tooltip,mouseX,mouseY,width,height,-1,font); } - @Override - public void renderToolTip(ItemStack stack, int x, int y) { - super.renderToolTip(stack, x, y); - } - @Override - public void onGuiClosed() { - super.onGuiClosed(); - } } diff --git a/src/main/java/amerifrance/guideapi/gui/CategoryScreen.java b/src/main/java/amerifrance/guideapi/gui/CategoryScreen.java index 7eb84f0f..ab4ecdd6 100644 --- a/src/main/java/amerifrance/guideapi/gui/CategoryScreen.java +++ b/src/main/java/amerifrance/guideapi/gui/CategoryScreen.java @@ -18,6 +18,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.MathHelper; +import net.minecraft.util.text.StringTextComponent; +import net.minecraft.util.text.TranslationTextComponent; +import org.lwjgl.glfw.GLFW; import java.awt.Color; import java.io.IOException; @@ -40,7 +43,7 @@ public class CategoryScreen extends BaseScreen { @Nullable public EntryAbstract startEntry; public CategoryScreen(Book book, CategoryAbstract category, PlayerEntity player, ItemStack bookStack, @Nullable EntryAbstract startEntry) { - super(player, bookStack); + super(new TranslationTextComponent(category.name),player, bookStack); this.book = book; this.category = category; this.pageTexture = book.getPageTexture(); @@ -50,18 +53,28 @@ public CategoryScreen(Book book, CategoryAbstract category, PlayerEntity player, } @Override - public void initGui() { - super.initGui(); - this.buttonList.clear(); + public void init() { this.entryWrapperMap.clear(); guiLeft = (this.width - this.xSize) / 2; guiTop = (this.height - this.ySize) / 2; - this.buttonList.add(buttonBack = new ButtonBack(0, guiLeft + xSize / 6, guiTop, this)); - this.buttonList.add(buttonNext = new ButtonNext(1, guiLeft + 4 * xSize / 6, guiTop + 5 * ySize / 6, this)); - this.buttonList.add(buttonPrev = new ButtonPrev(2, guiLeft + xSize / 5, guiTop + 5 * ySize / 6, this)); - this.buttonList.add(buttonSearch = new ButtonSearch(3, (guiLeft + xSize / 6) - 25, guiTop + 5, this)); + addButton(buttonBack = new ButtonBack( guiLeft + xSize / 6, guiTop, (btn) ->{ + this.minecraft.displayGuiScreen(new HomeScreen(book, player, bookStack)); + },this)); + addButton(buttonNext = new ButtonNext( guiLeft + 4 * xSize / 6, guiTop + 5 * ySize / 6, (btn) -> { + if(entryPage+1{ + if(entryPage>0){ + prevPage(); + } + },this)); + addButton(buttonSearch = new ButtonSearch( (guiLeft + xSize / 6) - 25, guiTop + 5, (btn) -> { + this.minecraft.displayGuiScreen(new SearchScreen(book, player, bookStack, this)); + },this)); int eX = guiLeft + 37; int eY = guiTop + 15; @@ -87,9 +100,9 @@ public void initGui() { } @Override - public void drawScreen(int mouseX, int mouseY, float renderPartialTicks) { + public void render(int mouseX, int mouseY, float renderPartialTicks) { minecraft.getTextureManager().bindTexture(pageTexture); - drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize); + blit(guiLeft, guiTop, 0, 0, xSize, ySize); minecraft.getTextureManager().bindTexture(outlineTexture); drawTexturedModalRectWithColor(guiLeft, guiTop, 0, 0, xSize, ySize, book.getColor()); @@ -111,12 +124,12 @@ public void drawScreen(int mouseX, int mouseY, float renderPartialTicks) { buttonPrev.visible = entryPage != 0; buttonNext.visible = entryPage != entryWrapperMap.asMap().size() - 1 && !entryWrapperMap.asMap().isEmpty(); - super.drawScreen(mouseX, mouseY, renderPartialTicks); + super.render(mouseX, mouseY, renderPartialTicks); } @Override - public void mouseClicked(int mouseX, int mouseY, int typeofClick) throws IOException { - super.mouseClicked(mouseX, mouseY, typeofClick); + public boolean mouseClicked(double mouseX, double mouseY, int typeofClick) { + boolean ret = super.mouseClicked(mouseX, mouseY, typeofClick); for (EntryWrapper wrapper : this.entryWrapperMap.get(entryPage)) { if (wrapper.isMouseOnWrapper(mouseX, mouseY) && wrapper.canPlayerSee()) { @@ -127,46 +140,44 @@ else if (typeofClick == 1) } if (typeofClick == 1) - this.mc.displayGuiScreen(new HomeScreen(book, player, bookStack)); + this.minecraft.displayGuiScreen(new HomeScreen(book, player, bookStack)); + return ret; } @Override - public void handleMouseInput() throws IOException { - super.handleMouseInput(); - - int movement = Mouse.getEventDWheel(); + public boolean mouseScrolled(double p_mouseScrolled_1_, double p_mouseScrolled_3_, double movement) { if (movement < 0) nextPage(); else if (movement > 0) prevPage(); - } - @Override - public void keyTyped(char typedChar, int keyCode) { - super.keyTyped(typedChar, keyCode); - if (keyCode == Keyboard.KEY_BACK || keyCode == this.mc.gameSettings.keyBindUseItem.getKeyCode()) - this.minecraft.displayGuiScreen(new HomeScreen(book, player, bookStack)); - if ((keyCode == Keyboard.KEY_UP || keyCode == Keyboard.KEY_RIGHT) && entryPage + 1 < entryWrapperMap.asMap().size()) - nextPage(); - if ((keyCode == Keyboard.KEY_DOWN || keyCode == Keyboard.KEY_LEFT) && entryPage > 0) - prevPage(); + return movement!=0||super.mouseScrolled(p_mouseScrolled_1_, p_mouseScrolled_3_, movement); } @Override - public void actionPerformed(Button button) { - if (button.id == 0) + public boolean keyPressed(int keyCode, int p_keyPressed_2_, int p_keyPressed_3_) { + if (keyCode == GLFW.GLFW_KEY_BACKSPACE || keyCode == this.minecraft.gameSettings.keyBindUseItem.getKey().getKeyCode()) { this.minecraft.displayGuiScreen(new HomeScreen(book, player, bookStack)); - else if (button.id == 1 && entryPage + 1 < entryWrapperMap.asMap().size()) + return true; + } + else if ((keyCode == GLFW.GLFW_KEY_UP || keyCode == GLFW.GLFW_KEY_RIGHT) && entryPage + 1 < entryWrapperMap.asMap().size()) { + + nextPage(); - else if (button.id == 2 && entryPage > 0) + return true; + } + else if ((keyCode == GLFW.GLFW_KEY_DOWN|| keyCode == GLFW.GLFW_KEY_LEFT) && entryPage > 0){ prevPage(); - else if (button.id == 3) - this.minecraft.displayGuiScreen(new SearchScreen(book, player, bookStack, this)); + return true; + } + return super.keyPressed(keyCode, p_keyPressed_2_, p_keyPressed_3_); } + + @Override - public void onGuiClosed() { - super.onGuiClosed(); + public void onClose() { + super.onClose(); PacketHandler.INSTANCE.sendToServer(new PacketSyncCategory(book.getCategoryList().indexOf(category), entryPage)); } diff --git a/src/main/java/amerifrance/guideapi/gui/EntryScreen.java b/src/main/java/amerifrance/guideapi/gui/EntryScreen.java index 6042a429..fabd9d28 100644 --- a/src/main/java/amerifrance/guideapi/gui/EntryScreen.java +++ b/src/main/java/amerifrance/guideapi/gui/EntryScreen.java @@ -17,6 +17,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.MathHelper; +import net.minecraft.util.text.StringTextComponent; +import net.minecraft.util.text.TranslationTextComponent; +import org.lwjgl.glfw.GLFW; import java.awt.Color; import java.io.IOException; @@ -39,7 +42,7 @@ public class EntryScreen extends BaseScreen { public int pageNumber; public EntryScreen(Book book, CategoryAbstract category, EntryAbstract entry, PlayerEntity player, ItemStack bookStack) { - super(player, bookStack); + super(new TranslationTextComponent(entry.name),player, bookStack); this.book = book; this.category = category; this.entry = entry; @@ -47,21 +50,34 @@ public EntryScreen(Book book, CategoryAbstract category, EntryAbstract entry, Pl this.outlineTexture = book.getOutlineTexture(); this.pageNumber = 0; } + @Override - public void initGui() { - super.initGui(); + public void init() { + super.init(); entry.onInit(book, category, null, player, bookStack); - this.buttonList.clear(); this.pageWrapperList.clear(); guiLeft = (this.width - this.xSize) / 2; guiTop = (this.height - this.ySize) / 2; - this.buttonList.add(buttonBack = new ButtonBack(0, guiLeft + xSize / 6, guiTop, this)); - this.buttonList.add(buttonNext = new ButtonNext(1, guiLeft + 4 * xSize / 6, guiTop + 5 * ySize / 6, this)); - this.buttonList.add(buttonPrev = new ButtonPrev(2, guiLeft + xSize / 5, guiTop + 5 * ySize / 6, this)); - this.buttonList.add(buttonSearch = new ButtonSearch(3, (guiLeft + xSize / 6) - 25, guiTop + 5, this)); + addButton(buttonBack = new ButtonBack( guiLeft + xSize / 6, guiTop, (btn)-> { + this.minecraft.displayGuiScreen(new CategoryScreen(book, category, player, bookStack, entry)); + + },this)); + addButton(buttonNext = new ButtonNext( guiLeft + 4 * xSize / 6, guiTop + 5 * ySize / 6, (btn)->{ + if(pageNumber+1 { + if(pageNumber>0){ + prevPage(); + } + },this)); + addButton(buttonSearch = new ButtonSearch( (guiLeft + xSize / 6) - 25, guiTop + 5, (btn)->{ + this.minecraft.displayGuiScreen(new SearchScreen(book, player, bookStack, this)); + },this)); for (IPage page : this.entry.pageList) { page.onInit(book, category, entry, player, bookStack, this); @@ -70,10 +86,10 @@ public void initGui() { } @Override - public void drawScreen(int mouseX, int mouseY, float renderPartialTicks) { - Minecraft.getMinecraft().getTextureManager().bindTexture(pageTexture); - drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize); - Minecraft.getMinecraft().getTextureManager().bindTexture(outlineTexture); + public void render(int mouseX, int mouseY, float renderPartialTicks) { + Minecraft.getInstance().getTextureManager().bindTexture(pageTexture); + blit(guiLeft, guiTop, 0, 0, xSize, ySize); + Minecraft.getInstance().getTextureManager().bindTexture(outlineTexture); drawTexturedModalRectWithColor(guiLeft, guiTop, 0, 0, xSize, ySize, book.getColor()); pageNumber = MathHelper.clamp(pageNumber, 0, pageWrapperList.size() - 1); @@ -91,65 +107,70 @@ public void drawScreen(int mouseX, int mouseY, float renderPartialTicks) { buttonPrev.visible = pageNumber != 0; buttonNext.visible = pageNumber != pageWrapperList.size() - 1 && !pageWrapperList.isEmpty(); - super.drawScreen(mouseX, mouseY, renderPartialTicks); + super.render(mouseX, mouseY, renderPartialTicks); } @Override - public void mouseClicked(int mouseX, int mouseY, int typeofClick) throws IOException { - super.mouseClicked(mouseX, mouseY, typeofClick); - for (PageWrapper wrapper : this.pageWrapperList) { - if (wrapper.isMouseOnWrapper(mouseX, mouseY) && wrapper.canPlayerSee()) { - if (typeofClick == 0) { - pageWrapperList.get(pageNumber).page.onLeftClicked(book, category, entry, mouseX, mouseY, player, this); - } - if (typeofClick == 1) { - pageWrapperList.get(pageNumber).page.onRightClicked(book, category, entry, mouseX, mouseY, player, this); + public boolean mouseClicked(double mouseX, double mouseY, int typeofClick) { + if(!super.mouseClicked(mouseX, mouseY, typeofClick)){ + for (PageWrapper wrapper : this.pageWrapperList) { + if (wrapper.isMouseOnWrapper(mouseX, mouseY) && wrapper.canPlayerSee()) { + if (typeofClick == 0) { + pageWrapperList.get(pageNumber).page.onLeftClicked(book, category, entry, mouseX, mouseY, player, this); + return true; + } + if (typeofClick == 1) { + pageWrapperList.get(pageNumber).page.onRightClicked(book, category, entry, mouseX, mouseY, player, this); + return true; + } } } - } - if (typeofClick == 1) { - this.mc.displayGuiScreen(new CategoryScreen(book, category, player, bookStack, entry)); + if (typeofClick == 1) { + this.minecraft.displayGuiScreen(new CategoryScreen(book, category, player, bookStack, entry)); + return true; + } + return false; } + return true; + } @Override - public void handleMouseInput() throws IOException { - super.handleMouseInput(); + public boolean mouseScrolled(double p_mouseScrolled_1_, double p_mouseScrolled_3_, double movement) { - int movement = Mouse.getEventDWheel(); if (movement < 0) nextPage(); else if (movement > 0) prevPage(); - } - @Override - public void keyTyped(char typedChar, int keyCode) { - super.keyTyped(typedChar, keyCode); - if (keyCode == Keyboard.KEY_BACK || keyCode == this.mc.gameSettings.keyBindUseItem.getKeyCode()) - this.minecraft.displayGuiScreen(new CategoryScreen(book, category, player, bookStack, entry)); - if ((keyCode == Keyboard.KEY_UP || keyCode == Keyboard.KEY_RIGHT) && pageNumber + 1 < pageWrapperList.size()) - nextPage(); - if ((keyCode == Keyboard.KEY_DOWN || keyCode == Keyboard.KEY_LEFT) && pageNumber > 0) - prevPage(); + + return movement!=0||super.mouseScrolled(p_mouseScrolled_1_, p_mouseScrolled_3_, movement); + } @Override - public void actionPerformed(Button button) { - if (button.id == 0) + public boolean keyPressed(int keyCode, int p_keyPressed_2_, int p_keyPressed_3_) { + if (keyCode == GLFW.GLFW_KEY_BACKSPACE || keyCode == this.minecraft.gameSettings.keyBindUseItem.getKey().getKeyCode()) { this.minecraft.displayGuiScreen(new CategoryScreen(book, category, player, bookStack, entry)); - else if (button.id == 1 && pageNumber + 1 < pageWrapperList.size()) + return true; + } + else if ((keyCode == GLFW.GLFW_KEY_UP || keyCode == GLFW.GLFW_KEY_RIGHT) && pageNumber + 1 < pageWrapperList.size()){ nextPage(); - else if (button.id == 2 && pageNumber > 0) + return true; + } + else if ((keyCode == GLFW.GLFW_KEY_DOWN || keyCode == GLFW.GLFW_KEY_LEFT) && pageNumber > 0){ prevPage(); - else if (button.id == 3) - this.mc.displayGuiScreen(new SearchScreen(book, player, bookStack, this)); + return true; + } + return super.keyPressed(keyCode, p_keyPressed_2_, p_keyPressed_3_); + } + @Override - public void onGuiClosed() { - super.onGuiClosed(); + public void onClose() { + super.onClose(); ResourceLocation key = null; for (Map.Entry mapEntry : category.entries.entrySet()) diff --git a/src/main/java/amerifrance/guideapi/gui/HomeScreen.java b/src/main/java/amerifrance/guideapi/gui/HomeScreen.java index b4644113..50718dfe 100644 --- a/src/main/java/amerifrance/guideapi/gui/HomeScreen.java +++ b/src/main/java/amerifrance/guideapi/gui/HomeScreen.java @@ -9,12 +9,15 @@ import amerifrance.guideapi.network.PacketSyncHome; import amerifrance.guideapi.wrapper.CategoryWrapper; import com.google.common.collect.HashMultimap; +import net.minecraft.client.gui.widget.Widget; import net.minecraft.client.gui.widget.button.Button; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.MathHelper; +import net.minecraft.util.text.StringTextComponent; +import org.lwjgl.glfw.GLFW; import java.awt.Color; import java.io.IOException; @@ -31,7 +34,7 @@ public class HomeScreen extends BaseScreen { public int categoryPage; public HomeScreen(Book book, PlayerEntity player, ItemStack bookStack) { - super(player, bookStack); + super(new StringTextComponent(book.getTitle()),player, bookStack); this.book = book; this.pageTexture = book.getPageTexture(); this.outlineTexture = book.getOutlineTexture(); @@ -39,16 +42,25 @@ public HomeScreen(Book book, PlayerEntity player, ItemStack bookStack) { } @Override - public void initGui() { - this.buttonList.clear(); + public void init() { this.categoryWrapperMap.clear(); guiLeft = (this.width - this.xSize) / 2; guiTop = (this.height - this.ySize) / 2; - addButton(buttonNext = new ButtonNext(0, guiLeft + 4 * xSize / 6, guiTop + 5 * ySize / 6, this)); - addButton(buttonPrev = new ButtonPrev(1, guiLeft + xSize / 5, guiTop + 5 * ySize / 6, this)); - addButton(buttonSearch = new ButtonSearch(2, (guiLeft + xSize / 6) - 25, guiTop + 5, this)); + addButton(buttonNext = new ButtonNext( guiLeft + 4 * xSize / 6, guiTop + 5 * ySize / 6, (btn)->{ + if(categoryPage+1 < categoryWrapperMap.asMap().size()){ + nextPage(); + } + },this)); + addButton(buttonPrev = new ButtonPrev( guiLeft + xSize / 5, guiTop + 5 * ySize / 6, (btn)->{ + if(categoryPage>0){ + prevPage(); + } + },this)); + addButton(buttonSearch = new ButtonSearch( (guiLeft + xSize / 6) - 25, guiTop + 5, (btn)->{ + minecraft.displayGuiScreen(new SearchScreen(book, player, bookStack, this)); + },this)); int cX = guiLeft + 45; int cY = guiTop + 40; @@ -100,9 +112,9 @@ public void initGui() { } @Override - public void drawScreen(int mouseX, int mouseY, float renderPartialTicks) { + public void render(int mouseX, int mouseY, float renderPartialTicks) { minecraft.getTextureManager().bindTexture(pageTexture); - drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize); + blit(guiLeft, guiTop, 0, 0, xSize, ySize); minecraft.getTextureManager().bindTexture(outlineTexture); drawTexturedModalRectWithColor(guiLeft, guiTop, 0, 0, xSize, ySize, book.getColor()); drawCenteredString(font, I18n.format(book.getHeader()).replace("\\n", "\n").replace("&", "\u00a7"), guiLeft + xSize / 2 + 1, guiTop + 15, 0); @@ -123,74 +135,60 @@ public void drawScreen(int mouseX, int mouseY, float renderPartialTicks) { buttonPrev.visible = categoryPage != 0; buttonNext.visible = categoryPage != categoryWrapperMap.asMap().size() - 1 && !categoryWrapperMap.asMap().isEmpty(); - for (Button button : this.buttonList) - button.drawButton(this.mc, mouseX, mouseY, renderPartialTicks); + super.render(mouseX, mouseY, renderPartialTicks); } @Override - public void mouseClicked(int mouseX, int mouseY, int typeofClick) throws IOException { - super.mouseClicked(mouseX, mouseY, typeofClick); + public boolean mouseClicked(double mouseX, double mouseY, int typeofClick) { + if(!super.mouseClicked(mouseX, mouseY, typeofClick)){ + for (CategoryWrapper wrapper : this.categoryWrapperMap.get(categoryPage)) { + if (wrapper.isMouseOnWrapper(mouseX, mouseY) && wrapper.canPlayerSee()) { + if (typeofClick == 0) + wrapper.category.onLeftClicked(book, mouseX, mouseY, player, bookStack); + - for (CategoryWrapper wrapper : this.categoryWrapperMap.get(categoryPage)) { - if (wrapper.isMouseOnWrapper(mouseX, mouseY) && wrapper.canPlayerSee()) { - if (typeofClick == 0) - wrapper.category.onLeftClicked(book, mouseX, mouseY, player, bookStack); + else if (typeofClick == 1) + wrapper.category.onRightClicked(book, mouseX, mouseY, player, bookStack); - else if (typeofClick == 1) - wrapper.category.onRightClicked(book, mouseX, mouseY, player, bookStack); + return true; + } } + return false; } + return true; + } @Override - public void handleMouseInput() throws IOException { - super.handleMouseInput(); + public boolean mouseScrolled(double p_mouseScrolled_1_, double p_mouseScrolled_3_, double movement) { - int movement = Mouse.getEventDWheel(); if (movement < 0) nextPage(); else if (movement > 0) prevPage(); + + return movement!=0 || super.mouseScrolled(p_mouseScrolled_1_, p_mouseScrolled_3_, movement); } @Override - public void keyTyped(char typedChar, int keyCode) { - super.keyTyped(typedChar, keyCode); - if ((keyCode == Keyboard.KEY_UP || keyCode == Keyboard.KEY_RIGHT) && categoryPage + 1 < categoryWrapperMap.asMap().size()) + public boolean keyPressed(int keyCode, int p_keyPressed_2_, int p_keyPressed_3_) { + if ((keyCode == GLFW.GLFW_KEY_UP || keyCode == GLFW.GLFW_KEY_RIGHT) && categoryPage + 1 < categoryWrapperMap.asMap().size()) + { nextPage(); + } - if ((keyCode == Keyboard.KEY_DOWN || keyCode == Keyboard.KEY_LEFT) && categoryPage > 0) + else if ((keyCode == GLFW.GLFW_KEY_DOWN || keyCode == GLFW.GLFW_KEY_LEFT) && categoryPage > 0){ prevPage(); + } + + return super.keyPressed(keyCode, p_keyPressed_2_, p_keyPressed_3_); } - @Override - public void actionPerformed(Button button) { - if (button.id == 0 && categoryPage + 1 < categoryWrapperMap.asMap().size()) - nextPage(); - else if (button.id == 1 && categoryPage > 0) - prevPage(); - switch (button.id) { - case 0: { - if (categoryPage + 1 < categoryWrapperMap.asMap().size()) - nextPage(); - break; - } - case 1: { - if (categoryPage > 0) - nextPage(); - break; - } - case 2: { - minecraft.displayGuiScreen(new SearchScreen(book, player, bookStack, this)); - break; - } - } - } @Override - public void onGuiClosed() { - super.onGuiClosed(); + public void onClose() { + super.onClose(); PacketHandler.INSTANCE.sendToServer(new PacketSyncHome(categoryPage)); } diff --git a/src/main/java/amerifrance/guideapi/gui/SearchScreen.java b/src/main/java/amerifrance/guideapi/gui/SearchScreen.java index 16b78ed6..0b0e9ea2 100644 --- a/src/main/java/amerifrance/guideapi/gui/SearchScreen.java +++ b/src/main/java/amerifrance/guideapi/gui/SearchScreen.java @@ -10,14 +10,17 @@ import amerifrance.guideapi.button.ButtonPrev; import com.google.common.base.Strings; import com.google.common.collect.Lists; +import net.minecraft.client.MouseHelper; import net.minecraft.client.gui.widget.button.Button; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.widget.TextFieldWidget; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.text.TranslationTextComponent; import net.minecraftforge.fml.client.config.GuiUtils; import org.apache.commons.lang3.tuple.Pair; +import org.lwjgl.glfw.GLFW; import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -40,7 +43,7 @@ public class SearchScreen extends BaseScreen { private String lastQuery = ""; public SearchScreen(Book book, PlayerEntity player, ItemStack bookStack, Screen parent) { - super(player, bookStack); + super(new TranslationTextComponent(book.getTitle()),player, bookStack); this.book = book; this.pageTexture = book.getPageTexture(); @@ -49,33 +52,42 @@ public SearchScreen(Book book, PlayerEntity player, ItemStack bookStack, Screen this.searchResults = getMatches(book, null, player, bookStack); } + @Override - public void initGui() { - buttonList.clear(); + public void init() { guiLeft = (this.width - this.xSize) / 2; guiTop = (this.height - this.ySize) / 2; - addButton(new ButtonBack(0, guiLeft + xSize / 6, guiTop, this)); - addButton(buttonNext = new ButtonNext(1, guiLeft + 4 * xSize / 6, guiTop + 5 * ySize / 6, this)); - addButton(buttonPrev = new ButtonPrev(2, guiLeft + xSize / 5, guiTop + 5 * ySize / 6, this)); + addButton(new ButtonBack( guiLeft + xSize / 6, guiTop, (btn)->{ + minecraft.displayGuiScreen(parent); + + },this)); + addButton(buttonNext = new ButtonNext( guiLeft + 4 * xSize / 6, guiTop + 5 * ySize / 6, (btn)->{ + if (currentPage <= searchResults.size() - 1) + currentPage++; + },this)); + addButton(buttonPrev = new ButtonPrev( guiLeft + xSize / 5, guiTop + 5 * ySize / 6, (btn)->{ + if (currentPage > 0) + currentPage--; + },this)); - searchField = new TextFieldWidget(3, font, guiLeft + 43, guiTop + 12, 100, 10); + searchField = new TextFieldWidget( font, guiLeft + 43, guiTop + 12, 100, 10,""); searchField.setEnableBackgroundDrawing(false); - searchField.setFocused(true); + searchField.changeFocus(true); searchResults = getMatches(book, null, player, bookStack); } @Override - public void drawScreen(int mouseX, int mouseY, float partialTicks) { + public void render(int mouseX, int mouseY, float partialTicks) { minecraft.getTextureManager().bindTexture(pageTexture); - drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize); + blit(guiLeft, guiTop, 0, 0, xSize, ySize); minecraft.getTextureManager().bindTexture(outlineTexture); drawTexturedModalRectWithColor(guiLeft, guiTop, 0, 0, xSize, ySize, book.getColor()); - drawRect(searchField.x - 1, searchField.y - 1, searchField.x + searchField.width + 1, searchField.y + searchField.height + 1, new Color(166, 166, 166, 128).getRGB()); - drawRect(searchField.x, searchField.y, searchField.x + searchField.width, searchField.y + searchField.height, new Color(58, 58, 58, 128).getRGB()); - searchField.drawTextBox(); + fill(searchField.x - 1, searchField.y - 1, searchField.x + searchField.getAdjustedWidth() + 1, searchField.y + searchField.getHeight() + 1, new Color(166, 166, 166, 128).getRGB()); + fill(searchField.x, searchField.y, searchField.x + searchField.getAdjustedWidth(), searchField.y + searchField.getHeight(), new Color(58, 58, 58, 128).getRGB()); + searchField.render(mouseX, mouseY, partialTicks); int entryX = guiLeft + 37; int entryY = guiTop + 30; @@ -83,14 +95,14 @@ public void drawScreen(int mouseX, int mouseY, float partialTicks) { if (searchResults.size() != 0 && currentPage >= 0 && currentPage < searchResults.size()) { List> pageResults = searchResults.get(currentPage); for (Pair entry : pageResults) { - entry.getLeft().draw(book, entry.getRight(), entryX, entryY, 4 * xSize / 6, 10, mouseX, mouseY, this, fontRenderer); - entry.getLeft().drawExtras(book, entry.getRight(), entryX, entryY, 4 * xSize / 6, 10, mouseX, mouseY, this, fontRenderer); + entry.getLeft().draw(book, entry.getRight(), entryX, entryY, 4 * xSize / 6, 10, mouseX, mouseY, this, font); + entry.getLeft().drawExtras(book, entry.getRight(), entryX, entryY, 4 * xSize / 6, 10, mouseX, mouseY, this, font); if (GuiHelper.isMouseBetween(mouseX, mouseY, entryX, entryY, 4 * xSize / 6, 10)) { - if (Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) - GuiUtils.drawHoveringText(Lists.newArrayList(entry.getRight().getLocalizedName()), mouseX, mouseY, width, height, 300, fontRenderer); + if (GLFW.glfwGetKey(minecraft.mainWindow.getHandle(), GLFW.GLFW_KEY_LEFT_SHIFT) == GLFW.GLFW_PRESS) + GuiUtils.drawHoveringText(Lists.newArrayList(entry.getRight().getLocalizedName()), mouseX, mouseY, width, height, 300, font); - if (Mouse.isButtonDown(0)) { + if (minecraft.mouseHelper.isLeftDown()) { GuideMod.PROXY.openEntry(book, entry.getRight(), entry.getLeft(), player, bookStack); return; } @@ -103,73 +115,65 @@ public void drawScreen(int mouseX, int mouseY, float partialTicks) { buttonPrev.visible = currentPage != 0; buttonNext.visible = currentPage != searchResults.size() - 1 && !searchResults.isEmpty(); - super.drawScreen(mouseX, mouseY, partialTicks); + super.render(mouseX, mouseY, partialTicks); } @Override - public void mouseClicked(int mouseX, int mouseY, int mouseButton) throws IOException { - super.mouseClicked(mouseX, mouseY, mouseButton); - - if (mouseButton == 1) { - if (GuiHelper.isMouseBetween(mouseX, mouseY, searchField.x, searchField.y, searchField.getAdjustedWidth(), searchField.getHeight())) { - searchField.setText(""); - lastQuery = ""; - searchResults = getMatches(book, "", player, bookStack); - return; - } else - minecraft.displayGuiScreen(parent); + public boolean mouseClicked(double mouseX, double mouseY, int typeofClick) { + if(!super.mouseClicked(mouseX, mouseY, typeofClick)){ + if (typeofClick == 1) { + if (GuiHelper.isMouseBetween(mouseX, mouseY, searchField.x, searchField.y, searchField.getAdjustedWidth(), searchField.getHeight())) { + searchField.setText(""); + lastQuery = ""; + searchResults = getMatches(book, "", player, bookStack); + return true; + } else{ + minecraft.displayGuiScreen(parent); + return true; + } + } + + + return searchField.mouseClicked(mouseX, mouseY, typeofClick); } + return true; + - searchField.mouseClicked(mouseX, mouseY, mouseButton); } @Override - public void handleMouseInput() throws IOException { - super.handleMouseInput(); + public boolean mouseScrolled(double p_mouseScrolled_1_, double p_mouseScrolled_3_, double movement) { + - int movement = Mouse.getEventDWheel(); if (movement < 0 && buttonNext.visible && currentPage <= searchResults.size()) currentPage++; else if (movement > 0 && buttonPrev.visible && currentPage > 0) currentPage--; + + return movement!=0 || super.mouseScrolled(p_mouseScrolled_1_, p_mouseScrolled_3_, movement); + } @Override - public void keyTyped(char typedChar, int keyCode) { - if (!searchField.isFocused()) - super.keyTyped(typedChar, keyCode); + public boolean keyPressed(int keyCode, int p_keyPressed_2_, int p_keyPressed_3_) { + if (!searchField.isFocused()){ + return super.keyPressed(keyCode, p_keyPressed_2_, p_keyPressed_3_); + } - if (keyCode == Keyboard.KEY_ESCAPE) - searchField.setFocused(false); + if (keyCode == GLFW.GLFW_KEY_ESCAPE) + searchField.changeFocus(false); - searchField.textboxKeyTyped(typedChar, keyCode); + searchField.keyPressed(keyCode, p_keyPressed_2_, p_keyPressed_3_); if (!searchField.getText().equalsIgnoreCase(lastQuery)) { lastQuery = searchField.getText(); searchResults = getMatches(book, searchField.getText(), player, bookStack); if (currentPage > searchResults.size()) currentPage = searchResults.size() - 1; } + return true; } - @Override - public void actionPerformed(Button button) { - switch (button.id) { - case 0: { - minecraft.displayGuiScreen(parent); - break; - } - case 1: { - if (currentPage <= searchResults.size() - 1) - currentPage++; - break; - } - case 2: { - if (currentPage > 0) - currentPage--; - break; - } - } - } + @Nonnull static List>> getMatches(Book book, @Nullable String query, PlayerEntity player, ItemStack bookStack) { diff --git a/src/main/java/amerifrance/guideapi/info/InfoRendererImage.java b/src/main/java/amerifrance/guideapi/info/InfoRendererImage.java index ebbf2897..b4d9c429 100644 --- a/src/main/java/amerifrance/guideapi/info/InfoRendererImage.java +++ b/src/main/java/amerifrance/guideapi/info/InfoRendererImage.java @@ -29,7 +29,7 @@ public InfoRendererImage(ResourceLocation image, int imageX, int imageY, int ima @Override public void drawInformation(Book book, World world, BlockPos pos, BlockState state, RayTraceResult rayTrace, PlayerEntity player) { - Minecraft.getInstance().renderEngine.bindTexture(image); - AbstractGui.drawModalRectWithCustomSizedTexture(Minecraft.getInstance().mainWindow.getScaledWidth() / 2 + 20, Minecraft.getInstance().mainWindow.getScaledHeight() / 2 - imageHeight / 2, imageX, imageY, imageWidth, imageHeight, imageWidth, imageHeight); + Minecraft.getInstance().textureManager.bindTexture(image); + AbstractGui.blit(Minecraft.getInstance().mainWindow.getScaledWidth() / 2 + 20, Minecraft.getInstance().mainWindow.getScaledHeight() / 2 - imageHeight / 2, imageX, imageY, imageWidth, imageHeight, imageWidth, imageHeight); } } diff --git a/src/main/java/amerifrance/guideapi/item/ItemGuideBook.java b/src/main/java/amerifrance/guideapi/item/ItemGuideBook.java index c98c1fad..2694d80f 100644 --- a/src/main/java/amerifrance/guideapi/item/ItemGuideBook.java +++ b/src/main/java/amerifrance/guideapi/item/ItemGuideBook.java @@ -16,8 +16,13 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.item.ItemUseContext; import net.minecraft.util.*; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.registry.Registry; +import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.StringTextComponent; +import net.minecraft.util.text.TranslationTextComponent; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; @@ -29,13 +34,31 @@ public class ItemGuideBook extends Item implements IGuideItem { @Nonnull private final Book book; + private String translation_key; + public ItemGuideBook(@Nonnull Book book) { + super(new Item.Properties().maxStackSize(1).group(book.getCreativeTab())); this.book = book; - setMaxStackSize(1); - setCreativeTab(book.getCreativeTab()); - setUnlocalizedName(GuideMod.ID + ".book." + book.getRegistryName().getResourceDomain() + "." + book.getRegistryName().getResourcePath()); + + setTranslation_key(GuideMod.ID + ".book." + book.getRegistryName().getNamespace() + "." + book.getRegistryName().getPath()); + } + + @Override + protected String getDefaultTranslationKey() { + if (this.translation_key == null) { + this.translation_key = Util.makeTranslationKey("item", Registry.ITEM.getKey(this)); + } + + return this.translation_key; + } + + /** + * Set a custom translation key + */ + protected void setTranslation_key(String name) { + this.translation_key = Util.makeTranslationKey("item", new ResourceLocation(GuideMod.ID, name)); } @Override @@ -47,28 +70,27 @@ public ActionResult onItemRightClick(World world, PlayerEntity player player.sendStatusMessage(event.getCanceledText(), true); return ActionResult.newResult(ActionResultType.FAIL, heldStack); } - - player.openGui(GuideMod.INSTANCE, GuideAPI.getIndexedBooks().indexOf(book), world, hand.ordinal(), 0, 0); + GuideMod.PROXY.openGuidebook(player,world,book,heldStack); return ActionResult.newResult(ActionResultType.SUCCESS, heldStack); } @Override - public ActionResultType onItemUse(PlayerEntity player, World world, BlockPos pos, Hand hand, Direction facing, float hitX, float hitY, float hitZ) { - if (!world.isRemote || !player.isSneaking()) + public ActionResultType onItemUse(ItemUseContext context) { + if (!context.getWorld().isRemote || !context.isPlacerSneaking()) return ActionResultType.PASS; - ItemStack stack = player.getHeldItem(hand); - BlockState state = world.getBlockState(pos); + ItemStack stack = context.getItem(); + BlockState state = context.getWorld().getBlockState(context.getPos()); if (state.getBlock() instanceof IGuideLinked) { IGuideLinked guideLinked = (IGuideLinked) state.getBlock(); - ResourceLocation entryKey = guideLinked.getLinkedEntry(world, pos, player, stack); + ResourceLocation entryKey = guideLinked.getLinkedEntry(context.getWorld(), context.getPos(),context.getPlayer(), stack); if (entryKey == null) return ActionResultType.FAIL; for (CategoryAbstract category : book.getCategoryList()) { if (category.entries.containsKey(entryKey)) { - GuideMod.PROXY.openEntry(book, category, category.entries.get(entryKey), player, stack); + GuideMod.PROXY.openEntry(book, category, category.entries.get(entryKey), context.getPlayer(), stack); return ActionResultType.SUCCESS; } } @@ -78,22 +100,16 @@ public ActionResultType onItemUse(PlayerEntity player, World world, BlockPos pos } @Override - public String getItemStackDisplayName(ItemStack stack) { - return !Strings.isNullOrEmpty(book.getItemName()) ? I18n.format(getBook(stack).getItemName()) : super.getItemStackDisplayName(stack); + public ITextComponent getDisplayName(ItemStack stack) { + return !Strings.isNullOrEmpty(book.getItemName()) ? new TranslationTextComponent(getBook(stack).getItemName()) : super.getDisplayName(stack); } @Override - public void addInformation(ItemStack stack, World playerIn, List tooltip, ITooltipFlag advanced) { + public void addInformation(ItemStack stack, World playerIn, List tooltip, ITooltipFlag advanced) { if (!Strings.isNullOrEmpty(book.getAuthor())) - tooltip.add(TextHelper.localizeEffect(book.getAuthor())); + tooltip.add(new StringTextComponent(TextHelper.localizeEffect(book.getAuthor()))); if (!Strings.isNullOrEmpty(book.getAuthor()) && (advanced == TooltipFlags.ADVANCED)) - tooltip.add(book.getRegistryName().toString()); - } - - @Nullable -// @Override TODO - Soft override because this hasn't been merged into Forge yet. https://github.com/MinecraftForge/MinecraftForge/pull/4330 - public String getCreatorModId(ItemStack stack) { - return book.getRegistryName().getResourceDomain(); + tooltip.add(new StringTextComponent(book.getRegistryName().toString())); } // IGuideItem diff --git a/src/main/java/amerifrance/guideapi/page/PageBrewingRecipe.java b/src/main/java/amerifrance/guideapi/page/PageBrewingRecipe.java index 17f7ba93..2fd72a2d 100644 --- a/src/main/java/amerifrance/guideapi/page/PageBrewingRecipe.java +++ b/src/main/java/amerifrance/guideapi/page/PageBrewingRecipe.java @@ -14,6 +14,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.Ingredient; import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.TranslationTextComponent; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.common.brewing.BrewingRecipe; @@ -45,10 +46,10 @@ public PageBrewingRecipe(BrewingRecipe recipe) { * @param ingredient - What goes in the three bottle slots * @param output - Result of recipe */ - public PageBrewingRecipe(ItemStack input, ItemStack ingredient, ItemStack output) { + public PageBrewingRecipe(Ingredient input, Ingredient ingredient, ItemStack output) { this.input = input; - this.output = ingredient; - this.ingredient = output; + this.output = output; + this.ingredient = ingredient; } @Override @@ -60,8 +61,8 @@ public void draw(Book book, CategoryAbstract category, EntryAbstract entry, int SubTexture.POTION_GRID.draw(xStart, yStart); - List badTip = new ArrayList(); - badTip.add(TextHelper.localizeEffect("text.brewing.error")); + List badTip = new ArrayList<>(); + badTip.add(new TranslationTextComponent("text.brewing.error")); guiBase.drawCenteredString(fontRendererObj, TextHelper.localizeEffect("text.brewing.brew"), guiLeft + guiBase.xSize / 2, guiTop + 12, 0); @@ -69,27 +70,27 @@ public void draw(Book book, CategoryAbstract category, EntryAbstract entry, int int x = xStart + 25;//since item stack is approx 16 wide int y = yStart + 1; //start input - GuiHelper.drawItemStack(ingredient, x, y); + GuiHelper.drawItemStack(ingredient.getMatchingStacks()[0], x, y); //TODO do proper and safe ingredient cycling List tooltip = null; if (GuiHelper.isMouseBetween(mouseX, mouseY, x, y, 15, 15)) - tooltip = GuiHelper.getTooltip(ingredient); + tooltip = GuiHelper.getTooltip(ingredient.getMatchingStacks()[0]); //the three bottles y += 39; - GuiHelper.drawItemStack(input, x, y); + GuiHelper.drawItemStack(input.getMatchingStacks()[0], x, y); if (GuiHelper.isMouseBetween(mouseX, mouseY, x, y, 15, 15)) - tooltip = GuiHelper.getTooltip(input); + tooltip = GuiHelper.getTooltip(input.getMatchingStacks()[0]); int hSpacing = 24; x -= hSpacing; y -= 8; - GuiHelper.drawItemStack(input, x, y); + GuiHelper.drawItemStack(input.getMatchingStacks()[0], x, y); if (GuiHelper.isMouseBetween(mouseX, mouseY, x, y, 15, 15)) - tooltip = GuiHelper.getTooltip(input); + tooltip = GuiHelper.getTooltip(input.getMatchingStacks()[0]); x += hSpacing * 2; - GuiHelper.drawItemStack(input, x, y); + GuiHelper.drawItemStack(input.getMatchingStacks()[0], x, y); if (GuiHelper.isMouseBetween(mouseX, mouseY, x, y, 15, 15)) - tooltip = GuiHelper.getTooltip(input); + tooltip = GuiHelper.getTooltip(input.getMatchingStacks()[0]); if (output.isEmpty()) output = new ItemStack(Blocks.BARRIER); @@ -105,7 +106,7 @@ public void draw(Book book, CategoryAbstract category, EntryAbstract entry, int guiBase.drawCenteredString(fontRendererObj, TextHelper.localizeEffect("text.brewing.error"), guiLeft + guiBase.xSize / 2, guiTop + 4 * guiBase.ySize / 6, 0xED073D); if (tooltip != null) - guiBase.drawHoveringText(tooltip, mouseX, mouseY); + guiBase.drawHoveringTextComponents(tooltip, mouseX, mouseY); } } diff --git a/src/main/java/amerifrance/guideapi/page/PageFurnaceRecipe.java b/src/main/java/amerifrance/guideapi/page/PageFurnaceRecipe.java index 92b23c07..99bbb732 100644 --- a/src/main/java/amerifrance/guideapi/page/PageFurnaceRecipe.java +++ b/src/main/java/amerifrance/guideapi/page/PageFurnaceRecipe.java @@ -14,6 +14,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.FurnaceRecipe; +import net.minecraft.util.text.ITextComponent; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; @@ -81,7 +82,7 @@ public void draw(Book book, CategoryAbstract category, EntryAbstract entry, int int y = guiTop + 77; GuiHelper.drawItemStack(input, x, y); - List tooltip = null; + List tooltip = null; if (GuiHelper.isMouseBetween(mouseX, mouseY, x, y, 15, 15)) tooltip = GuiHelper.getTooltip(input); @@ -97,7 +98,7 @@ public void draw(Book book, CategoryAbstract category, EntryAbstract entry, int guiBase.drawCenteredString(fontRendererObj, TextHelper.localizeEffect("text.furnace.error"), guiLeft + guiBase.xSize / 2, guiTop + 4 * guiBase.ySize / 6, 0xED073D); if (tooltip != null) - guiBase.drawHoveringText(tooltip, mouseX, mouseY); + guiBase.drawHoveringTextComponents(tooltip, mouseX, mouseY); } @Override diff --git a/src/main/java/amerifrance/guideapi/page/PageSound.java b/src/main/java/amerifrance/guideapi/page/PageSound.java index 65d13500..c1c34005 100644 --- a/src/main/java/amerifrance/guideapi/page/PageSound.java +++ b/src/main/java/amerifrance/guideapi/page/PageSound.java @@ -48,14 +48,14 @@ public boolean canSee(Book book, CategoryAbstract category, EntryAbstract entry, @Override @OnlyIn(Dist.CLIENT) - public void onLeftClicked(Book book, CategoryAbstract category, EntryAbstract entry, int mouseX, int mouseY, PlayerEntity player, EntryScreen guiEntry) { + public void onLeftClicked(Book book, CategoryAbstract category, EntryAbstract entry, double mouseX, double mouseY, PlayerEntity player, EntryScreen guiEntry) { GuideMod.PROXY.playSound(sound); pageToEmulate.onLeftClicked(book, category, entry, mouseX, mouseY, player, guiEntry); } @Override @OnlyIn(Dist.CLIENT) - public void onRightClicked(Book book, CategoryAbstract category, EntryAbstract entry, int mouseX, int mouseY, PlayerEntity player, EntryScreen guiEntry) { + public void onRightClicked(Book book, CategoryAbstract category, EntryAbstract entry, double mouseX, double mouseY, PlayerEntity player, EntryScreen guiEntry) { pageToEmulate.onRightClicked(book, category, entry, mouseX, mouseY, player, guiEntry); } diff --git a/src/main/java/amerifrance/guideapi/proxy/ClientProxy.java b/src/main/java/amerifrance/guideapi/proxy/ClientProxy.java index a90c2f19..d80d6764 100644 --- a/src/main/java/amerifrance/guideapi/proxy/ClientProxy.java +++ b/src/main/java/amerifrance/guideapi/proxy/ClientProxy.java @@ -1,5 +1,7 @@ package amerifrance.guideapi.proxy; +import amerifrance.guideapi.gui.CategoryScreen; +import amerifrance.guideapi.gui.HomeScreen; import api.BookEvent; import api.GuideAPI; import api.IGuideItem; @@ -7,11 +9,15 @@ import api.impl.abstraction.CategoryAbstract; import api.impl.abstraction.EntryAbstract; import amerifrance.guideapi.gui.EntryScreen; +import api.util.NBTBookTags; import net.minecraft.client.Minecraft; import net.minecraft.client.audio.SimpleSound; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; +import net.minecraft.nbt.CompoundNBT; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.SoundEvent; +import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; public class ClientProxy extends CommonProxy { @@ -44,4 +50,38 @@ public void initColors() { }, bookStack.getItem()); } } + + @Override + public void openGuidebook(PlayerEntity player, World world, Book book, ItemStack bookStack) { + if (!bookStack.isEmpty() && bookStack.getItem() instanceof IGuideItem) { + try { + if (bookStack.hasTag()) { + CompoundNBT tagCompound = bookStack.getTag(); + if (tagCompound.contains(NBTBookTags.ENTRY_TAG) && tagCompound.contains(NBTBookTags.CATEGORY_TAG)) { + CategoryAbstract category = book.getCategoryList().get(tagCompound.getInt(NBTBookTags.CATEGORY_TAG)); + EntryAbstract entry = category.entries.get(new ResourceLocation(tagCompound.getString(NBTBookTags.ENTRY_TAG))); + int pageNumber = tagCompound.getInt(NBTBookTags.PAGE_TAG); + EntryScreen guiEntry = new EntryScreen(book, category, entry, player, bookStack); + guiEntry.pageNumber = pageNumber; + Minecraft.getInstance().displayGuiScreen( guiEntry); + } else if (tagCompound.contains(NBTBookTags.CATEGORY_TAG)) { + CategoryAbstract category = book.getCategoryList().get(tagCompound.getInt(NBTBookTags.CATEGORY_TAG)); + int entryPage = tagCompound.getInt(NBTBookTags.ENTRY_PAGE_TAG); + CategoryScreen guiCategory = new CategoryScreen(book, category, player, bookStack, null); + guiCategory.entryPage = entryPage; + Minecraft.getInstance().displayGuiScreen( guiCategory); + } else { + int categoryNumber = tagCompound.getInt(NBTBookTags.CATEGORY_PAGE_TAG); + HomeScreen guiHome = new HomeScreen(book, player, bookStack); + guiHome.categoryPage = categoryNumber; + Minecraft.getInstance().displayGuiScreen( guiHome); + } + } + } catch (Exception e) { + // No-op: If the linked content doesn't exist anymore + } + + Minecraft.getInstance().displayGuiScreen(new HomeScreen(book, player, bookStack)); + } + } } diff --git a/src/main/java/amerifrance/guideapi/proxy/CommonProxy.java b/src/main/java/amerifrance/guideapi/proxy/CommonProxy.java index cc0502c7..caaf5b39 100644 --- a/src/main/java/amerifrance/guideapi/proxy/CommonProxy.java +++ b/src/main/java/amerifrance/guideapi/proxy/CommonProxy.java @@ -18,50 +18,10 @@ import net.minecraft.world.World; import net.minecraftforge.fml.common.network.IGuiHandler; -public class CommonProxy implements IGuiHandler { +public class CommonProxy { - @Override - public Object getServerGuiElement(int ID, PlayerEntity player, World world, int x, int y, int z) { - return null; - } - - @Override - public Object getClientGuiElement(int ID, PlayerEntity player, World world, int x, int y, int z) { - ItemStack bookStack = player.getHeldItem(Hand.values()[x]); - - if (!bookStack.isEmpty() && bookStack.getItem() instanceof IGuideItem) { - Book book = GuideAPI.getIndexedBooks().get(ID); - try { - if (bookStack.hasTag()) { - CompoundNBT tagCompound = bookStack.getTag(); - if (tagCompound.contains(NBTBookTags.ENTRY_TAG) && tagCompound.contains(NBTBookTags.CATEGORY_TAG)) { - CategoryAbstract category = book.getCategoryList().get(tagCompound.getInt(NBTBookTags.CATEGORY_TAG)); - EntryAbstract entry = category.entries.get(new ResourceLocation(tagCompound.getString(NBTBookTags.ENTRY_TAG))); - int pageNumber = tagCompound.getInt(NBTBookTags.PAGE_TAG); - EntryScreen guiEntry = new EntryScreen(book, category, entry, player, bookStack); - guiEntry.pageNumber = pageNumber; - return guiEntry; - } else if (tagCompound.contains(NBTBookTags.CATEGORY_TAG)) { - CategoryAbstract category = book.getCategoryList().get(tagCompound.getInt(NBTBookTags.CATEGORY_TAG)); - int entryPage = tagCompound.getInt(NBTBookTags.ENTRY_PAGE_TAG); - CategoryScreen guiCategory = new CategoryScreen(book, category, player, bookStack, null); - guiCategory.entryPage = entryPage; - return guiCategory; - } else { - int categoryNumber = tagCompound.getInt(NBTBookTags.CATEGORY_PAGE_TAG); - HomeScreen guiHome = new HomeScreen(book, player, bookStack); - guiHome.categoryPage = categoryNumber; - return guiHome; - } - } - } catch (Exception e) { - // No-op: If the linked content doesn't exist anymore - } - - return new HomeScreen(book, player, bookStack); - } - return null; + public void openGuidebook(PlayerEntity player, World world, Book book, ItemStack bookStack){ } public void playSound(SoundEvent sound) { diff --git a/src/main/java/amerifrance/guideapi/test/TestBook2.java b/src/main/java/amerifrance/guideapi/test/TestBook2.java index f1dd8863..bea22529 100644 --- a/src/main/java/amerifrance/guideapi/test/TestBook2.java +++ b/src/main/java/amerifrance/guideapi/test/TestBook2.java @@ -9,13 +9,14 @@ import amerifrance.guideapi.page.*; import net.minecraft.block.Blocks; import net.minecraft.item.Items; +import net.minecraft.item.crafting.Ingredient; import net.minecraft.potion.Potions; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.potion.PotionUtils; import net.minecraft.util.ResourceLocation; +import net.minecraftforge.common.Tags; import net.minecraftforge.common.brewing.BrewingRecipe; -import net.minecraftforge.oredict.ShapedOreRecipe; import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -36,15 +37,12 @@ public Book buildBook() { book.setTitle("Title message"); book.setWelcomeMessage("Is this still a thing?"); - CategoryAbstract testCategory = new CategoryItemStack("test.category.name", new ItemStack(Items.BANNER)).withKeyBase("guideapi"); + CategoryAbstract testCategory = new CategoryItemStack("test.category.name", new ItemStack(Items.BLUE_BANNER)).withKeyBase("guideapi"); testCategory.addEntry("entry", new EntryItemStack("test.entry.name", new ItemStack(Items.POTATO))); testCategory.getEntry("entry").addPage(new PageText("Hello, this is\nsome text")); testCategory.getEntry("entry").addPage(new PageFurnaceRecipe(Blocks.COBBLESTONE)); - testCategory.getEntry("entry").addPage(PageIRecipe.newShaped(new ItemStack(Items.ACACIA_BOAT), "X X", "XXX", 'X', new ItemStack(Blocks.PLANKS, 1, 4))); - testCategory.getEntry("entry").addPage(new PageBrewingRecipe(new BrewingRecipe( - PotionUtils.addPotionToItemStack(new ItemStack(Items.POTIONITEM), Potions.AWKWARD), - new ItemStack(Items.SPECKLED_MELON), - PotionUtils.addPotionToItemStack(new ItemStack(Items.POTIONITEM), Potions.HEALING))) + testCategory.getEntry("entry").addPage(PageIRecipe.newShaped(new ItemStack(Items.ACACIA_BOAT), "X X", "XXX", 'X', new ItemStack(Blocks.ACACIA_PLANKS, 1, 4))); + testCategory.getEntry("entry").addPage(new PageBrewingRecipe(new BrewingRecipe(Ingredient.fromStacks(PotionUtils.addPotionToItemStack(new ItemStack(Items.POTION), Potions.AWKWARD)),Ingredient.fromStacks( new ItemStack(Items.GLISTERING_MELON_SLICE)), PotionUtils.addPotionToItemStack(new ItemStack(Items.POTION), Potions.HEALING))) ); testCategory.getEntry("entry").addPage(new PageJsonRecipe(new ResourceLocation("bread"))); book.addCategory(testCategory); diff --git a/src/main/java/amerifrance/guideapi/util/AnnotationHandler.java b/src/main/java/amerifrance/guideapi/util/AnnotationHandler.java index e2203d15..8be4e925 100644 --- a/src/main/java/amerifrance/guideapi/util/AnnotationHandler.java +++ b/src/main/java/amerifrance/guideapi/util/AnnotationHandler.java @@ -5,41 +5,57 @@ import api.IGuideBook; import api.impl.Book; import com.google.common.collect.Lists; -import net.minecraftforge.fml.common.discovery.ASMDataTable; -import net.minecraftforge.fml.common.discovery.asm.ModAnnotation; -import net.minecraftforge.fml.common.eventhandler.EventPriority; +import net.minecraftforge.eventbus.api.EventPriority; +import net.minecraftforge.fml.ModList; + +import net.minecraftforge.forgespi.language.ModFileScanData; import org.apache.commons.lang3.tuple.Pair; +import org.objectweb.asm.Type; +import java.util.Collection; import java.util.List; +import java.util.stream.Collectors; public class AnnotationHandler { public static final List> BOOK_CLASSES = Lists.newArrayList(); - public static void gatherBooks(ASMDataTable dataTable) { + private static final Type GUIDE = Type.getType(GuideBook.class); + + + public static void gatherBooks() { + final List annotations = ModList.get().getAllScanData().stream() + .map(ModFileScanData::getAnnotations) + .flatMap(Collection::stream) + .filter(a -> GUIDE.equals(a.getAnnotationType())) + .collect(Collectors.toList()); + + + for (EventPriority priority : EventPriority.values()) - for (ASMDataTable.ASMData data : dataTable.getAll(GuideBook.class.getCanonicalName())) { - try { - Class genericClass = Class.forName(data.getClassName()); + for(ModFileScanData.AnnotationData data: annotations){ + try{ + + EventPriority priority1 = (EventPriority) data.getAnnotationData().getOrDefault("priority",EventPriority.NORMAL); + if(priority!=priority1)continue; + Class genericClass = Class.forName(data.getClassType().getClassName()); if (!IGuideBook.class.isAssignableFrom(genericClass)) continue; - IGuideBook guideBook = (IGuideBook) genericClass.newInstance(); - ModAnnotation.EnumHolder holder = (ModAnnotation.EnumHolder) data.getAnnotationInfo().get("priority"); - EventPriority bookPriority = holder == null ? EventPriority.NORMAL : EventPriority.valueOf(holder.getValue()); - if (priority != bookPriority) - continue; Book book = guideBook.buildBook(); if (book == null) continue; APISetter.registerBook(book); BOOK_CLASSES.add(Pair.of(book, guideBook)); - } catch (Exception e) { - LogHelper.error("Error registering book for class " + data.getClassName()); + + }catch (Exception e) { + LogHelper.error("Error registering book for class " + data.getClassType().getClassName()); e.printStackTrace(); } + } + APISetter.setIndexedBooks(Lists.newArrayList(GuideAPI.getBooks().values())); } } diff --git a/src/main/java/amerifrance/guideapi/util/EventHandler.java b/src/main/java/amerifrance/guideapi/util/EventHandler.java index 05729bf4..702f1ebf 100644 --- a/src/main/java/amerifrance/guideapi/util/EventHandler.java +++ b/src/main/java/amerifrance/guideapi/util/EventHandler.java @@ -1,6 +1,6 @@ package amerifrance.guideapi.util; -import amerifrance.guideapi.ConfigHandler; +import amerifrance.guideapi.GuideConfig; import amerifrance.guideapi.GuideMod; import api.GuideAPI; import api.IGuideItem; @@ -43,12 +43,12 @@ public static void onPlayerJoinWorld(EntityJoinWorldEvent event) { if (!event.getEntity().world.isRemote && event.getEntity() instanceof PlayerEntity) { PlayerEntity player = (PlayerEntity) event.getEntity(); CompoundNBT tag = getModTag(player, GuideMod.ID); - if (ConfigHandler.canSpawnWithBooks) { + if (GuideConfig.SERVER.canSpawnWithBook.get()) { for (Book book : GuideAPI.getBooks().values()) { - if (ConfigHandler.SPAWN_BOOKS.getOrDefault(book, false) && !tag.getBoolean("hasInitial" + book.getTitle())) { + //if (ConfigHandler.SPAWN_BOOKS.getOrDefault(book, false) && !tag.getBoolean("hasInitial" + book.getTitle())) { TODO ItemHandlerHelper.giveItemToPlayer(player, GuideAPI.getStackFromBook(book)); tag.putBoolean("hasInitial" + book.getTitle(), true); - } + //} } } } diff --git a/src/main/java/amerifrance/guideapi/util/LogHelper.java b/src/main/java/amerifrance/guideapi/util/LogHelper.java index d9704721..edd830a8 100644 --- a/src/main/java/amerifrance/guideapi/util/LogHelper.java +++ b/src/main/java/amerifrance/guideapi/util/LogHelper.java @@ -1,6 +1,6 @@ package amerifrance.guideapi.util; -import amerifrance.guideapi.ConfigHandler; +import amerifrance.guideapi.GuideConfig; import amerifrance.guideapi.GuideMod; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -14,7 +14,7 @@ public class LogHelper { */ public static void info(Object info) { - if (ConfigHandler.enableLogging) + if (GuideConfig.COMMON.enableLogging.get()) logger.info(info); } @@ -23,7 +23,7 @@ public static void info(Object info) { */ public static void error(Object error) { - if (ConfigHandler.enableLogging) + if (GuideConfig.COMMON.enableLogging.get()) logger.error(error); } @@ -32,7 +32,7 @@ public static void error(Object error) { */ public static void debug(Object debug) { - if (ConfigHandler.enableLogging) + if (GuideConfig.COMMON.enableLogging.get()) logger.debug(debug); } } diff --git a/src/main/java/amerifrance/guideapi/wrapper/AbstractWrapper.java b/src/main/java/amerifrance/guideapi/wrapper/AbstractWrapper.java index 059de800..3f81ceb1 100644 --- a/src/main/java/amerifrance/guideapi/wrapper/AbstractWrapper.java +++ b/src/main/java/amerifrance/guideapi/wrapper/AbstractWrapper.java @@ -12,5 +12,5 @@ public abstract class AbstractWrapper { public abstract void drawExtras(int mouseX, int mouseY, BaseScreen gui); - public abstract boolean isMouseOnWrapper(int mouseX, int mouseY); + public abstract boolean isMouseOnWrapper(double mouseX, double mouseY); } diff --git a/src/main/java/amerifrance/guideapi/wrapper/CategoryWrapper.java b/src/main/java/amerifrance/guideapi/wrapper/CategoryWrapper.java index ed1a503d..46878550 100644 --- a/src/main/java/amerifrance/guideapi/wrapper/CategoryWrapper.java +++ b/src/main/java/amerifrance/guideapi/wrapper/CategoryWrapper.java @@ -54,7 +54,7 @@ public void drawExtras(int mouseX, int mouseY, BaseScreen gui) { } @Override - public boolean isMouseOnWrapper(int mouseX, int mouseY) { + public boolean isMouseOnWrapper(double mouseX, double mouseY) { return GuiHelper.isMouseBetween(mouseX, mouseY, x, y, width, height); } } diff --git a/src/main/java/amerifrance/guideapi/wrapper/EntryWrapper.java b/src/main/java/amerifrance/guideapi/wrapper/EntryWrapper.java index e574e179..da06f728 100644 --- a/src/main/java/amerifrance/guideapi/wrapper/EntryWrapper.java +++ b/src/main/java/amerifrance/guideapi/wrapper/EntryWrapper.java @@ -47,16 +47,16 @@ public boolean canPlayerSee() { @Override public void draw(int mouseX, int mouseY, BaseScreen gui) { - entry.draw(book, category, x, y, width, height, mouseX, mouseY, gui, Minecraft.getMinecraft().fontRenderer); + entry.draw(book, category, x, y, width, height, mouseX, mouseY, gui, Minecraft.getInstance().fontRenderer); } @Override public void drawExtras(int mouseX, int mouseY, BaseScreen gui) { - entry.drawExtras(book, category, x, y, width, height, mouseX, mouseY, gui, Minecraft.getMinecraft().fontRenderer); + entry.drawExtras(book, category, x, y, width, height, mouseX, mouseY, gui, Minecraft.getInstance().fontRenderer); } @Override - public boolean isMouseOnWrapper(int mouseX, int mouseY) { + public boolean isMouseOnWrapper(double mouseX, double mouseY) { return GuiHelper.isMouseBetween(mouseX, mouseY, x, y, width, height); } } diff --git a/src/main/java/amerifrance/guideapi/wrapper/PageWrapper.java b/src/main/java/amerifrance/guideapi/wrapper/PageWrapper.java index 7bd90e05..63705593 100644 --- a/src/main/java/amerifrance/guideapi/wrapper/PageWrapper.java +++ b/src/main/java/amerifrance/guideapi/wrapper/PageWrapper.java @@ -47,16 +47,16 @@ public boolean canPlayerSee() { @Override public void draw(int mouseX, int mouseY, BaseScreen gui) { - page.draw(book, category, entry, guiLeft, guiTop, mouseX, mouseY, gui, Minecraft.getMinecraft().fontRenderer); + page.draw(book, category, entry, guiLeft, guiTop, mouseX, mouseY, gui, Minecraft.getInstance().fontRenderer); } @Override public void drawExtras(int mouseX, int mouseY, BaseScreen gui) { - page.drawExtras(book, category, entry, guiLeft, guiTop, mouseX, mouseY, gui, Minecraft.getMinecraft().fontRenderer); + page.drawExtras(book, category, entry, guiLeft, guiTop, mouseX, mouseY, gui, Minecraft.getInstance().fontRenderer); } @Override - public boolean isMouseOnWrapper(int mouseX, int mouseY) { + public boolean isMouseOnWrapper(double mouseX, double mouseY) { return true; } } diff --git a/src/main/java/api/IPage.java b/src/main/java/api/IPage.java index 185462de..84021aa3 100644 --- a/src/main/java/api/IPage.java +++ b/src/main/java/api/IPage.java @@ -22,10 +22,10 @@ public interface IPage { boolean canSee(Book book, CategoryAbstract category, EntryAbstract entry, PlayerEntity player, ItemStack bookStack, EntryScreen guiEntry); @OnlyIn(Dist.CLIENT) - void onLeftClicked(Book book, CategoryAbstract category, EntryAbstract entry, int mouseX, int mouseY, PlayerEntity player, EntryScreen guiEntry); + void onLeftClicked(Book book, CategoryAbstract category, EntryAbstract entry, double mouseX, double mouseY, PlayerEntity player, EntryScreen guiEntry); @OnlyIn(Dist.CLIENT) - void onRightClicked(Book book, CategoryAbstract category, EntryAbstract entry, int mouseX, int mouseY, PlayerEntity player, EntryScreen guiEntry); + void onRightClicked(Book book, CategoryAbstract category, EntryAbstract entry, double mouseX, double mouseY, PlayerEntity player, EntryScreen guiEntry); @OnlyIn(Dist.CLIENT) void onInit(Book book, CategoryAbstract category, EntryAbstract entry, PlayerEntity player, ItemStack bookStack, EntryScreen guiEntry); diff --git a/src/main/java/api/IRecipeRenderer.java b/src/main/java/api/IRecipeRenderer.java index 3207b2ae..603616e3 100644 --- a/src/main/java/api/IRecipeRenderer.java +++ b/src/main/java/api/IRecipeRenderer.java @@ -10,8 +10,10 @@ import net.minecraft.util.text.ITextComponent; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; +import net.minecraftforge.fml.client.config.GuiUtils; import java.util.List; +import java.util.stream.Collectors; public interface IRecipeRenderer { @@ -32,7 +34,7 @@ public RecipeRendererBase(T recipe) { @Override public void drawExtras(Book book, CategoryAbstract category, EntryAbstract entry, int guiLeft, int guiTop, int mouseX, int mouseY, BaseScreen guiBase, FontRenderer fontRendererObj) { - guiBase.drawHoveringText(tooltips, mouseX, mouseY); + guiBase.drawHoveringTextComponents(tooltips, mouseX, mouseY); tooltips.clear(); } } diff --git a/src/main/java/api/button/ButtonGuideAPI.java b/src/main/java/api/button/ButtonGuideAPI.java index de46bd99..962a917d 100644 --- a/src/main/java/api/button/ButtonGuideAPI.java +++ b/src/main/java/api/button/ButtonGuideAPI.java @@ -7,8 +7,8 @@ public class ButtonGuideAPI extends Button { public BaseScreen guiBase; - public ButtonGuideAPI(int id, int x, int y, BaseScreen guiBase) { - super(id, x, y, ""); + public ButtonGuideAPI(int widthIn, int heightIn, int width, int height, Button.IPressable onPress, BaseScreen guiBase) { + super(widthIn, heightIn, width, height, "", onPress); this.guiBase = guiBase; } } diff --git a/src/main/java/api/impl/Category.java b/src/main/java/api/impl/Category.java index 014e379b..c25f0d45 100644 --- a/src/main/java/api/impl/Category.java +++ b/src/main/java/api/impl/Category.java @@ -42,13 +42,13 @@ public boolean canSee(PlayerEntity player, ItemStack bookStack) { @Override @OnlyIn(Dist.CLIENT) - public void onLeftClicked(Book book, int mouseX, int mouseY, PlayerEntity player, ItemStack bookStack) { + public void onLeftClicked(Book book, double mouseX, double mouseY, PlayerEntity player, ItemStack bookStack) { Minecraft.getInstance().displayGuiScreen(new CategoryScreen(book, this, player, bookStack, null)); } @Override @OnlyIn(Dist.CLIENT) - public void onRightClicked(Book book, int mouseX, int mouseY, PlayerEntity player, ItemStack bookStack) { + public void onRightClicked(Book book, double mouseX, double mouseY, PlayerEntity player, ItemStack bookStack) { } @Override diff --git a/src/main/java/api/impl/Entry.java b/src/main/java/api/impl/Entry.java index 79832ec8..0292a4f2 100644 --- a/src/main/java/api/impl/Entry.java +++ b/src/main/java/api/impl/Entry.java @@ -13,6 +13,7 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; +import net.minecraftforge.fml.client.config.GuiUtils; import java.awt.Color; import java.util.Collections; @@ -40,10 +41,6 @@ public Entry(String name) { @OnlyIn(Dist.CLIENT) public void draw(Book book, CategoryAbstract category, int entryX, int entryY, int entryWidth, int entryHeight, int mouseX, int mouseY, BaseScreen guiBase, FontRenderer fontRendererObj) { - boolean startFlag = fontRendererObj.getUnicodeFlag(); - - if (unicode) - fontRendererObj.setUnicodeFlag(true); // Cutting code ripped from GuiButtonExt#drawButton(...) String entryName = getLocalizedName(); @@ -60,15 +57,13 @@ public void draw(Book book, CategoryAbstract category, int entryX, int entryY, i fontRendererObj.drawString(entryName, entryX + 12, entryY, 0); } - if (unicode && !startFlag) - fontRendererObj.setUnicodeFlag(false); + } @Override @OnlyIn(Dist.CLIENT) public void drawExtras(Book book, CategoryAbstract category, int entryX, int entryY, int entryWidth, int entryHeight, int mouseX, int mouseY, BaseScreen guiBase, FontRenderer fontRendererObj) { - boolean startFlag = fontRendererObj.getUnicodeFlag(); - fontRendererObj.setUnicodeFlag(false); + // Cutting code ripped from GuiButtonExt#drawButton(...) int strWidth = fontRendererObj.getStringWidth(getLocalizedName()); @@ -79,11 +74,10 @@ public void drawExtras(Book book, CategoryAbstract category, int entryX, int ent if (GuiHelper.isMouseBetween(mouseX, mouseY, entryX, entryY, entryWidth, entryHeight) && cutString) { - guiBase.drawHoveringText(Collections.singletonList(getLocalizedName()), entryX, entryY + 12); - fontRendererObj.setUnicodeFlag(unicode); + GuiUtils.drawHoveringText(Collections.singletonList(getLocalizedName()), entryX, entryY + 12,entryWidth,entryHeight,-1,fontRendererObj); } - fontRendererObj.setUnicodeFlag(startFlag); + } @Override @@ -93,13 +87,13 @@ public boolean canSee(PlayerEntity player, ItemStack bookStack) { @Override @OnlyIn(Dist.CLIENT) - public void onLeftClicked(Book book, CategoryAbstract category, int mouseX, int mouseY, PlayerEntity player, CategoryScreen guiCategory) { + public void onLeftClicked(Book book, CategoryAbstract category, double mouseX, double mouseY, PlayerEntity player, CategoryScreen guiCategory) { Minecraft.getInstance().displayGuiScreen(new EntryScreen(book, category, this, player, guiCategory.bookStack)); } @Override @OnlyIn(Dist.CLIENT) - public void onRightClicked(Book book, CategoryAbstract category, int mouseX, int mouseY, PlayerEntity player, CategoryScreen guiCategory) { + public void onRightClicked(Book book, CategoryAbstract category, double mouseX, double mouseY, PlayerEntity player, CategoryScreen guiCategory) { } @Override diff --git a/src/main/java/api/impl/Page.java b/src/main/java/api/impl/Page.java index 88a007c8..378c7b4c 100644 --- a/src/main/java/api/impl/Page.java +++ b/src/main/java/api/impl/Page.java @@ -32,12 +32,12 @@ public boolean canSee(Book book, CategoryAbstract category, EntryAbstract entry, @Override @OnlyIn(Dist.CLIENT) - public void onLeftClicked(Book book, CategoryAbstract category, EntryAbstract entry, int mouseX, int mouseY, PlayerEntity player, EntryScreen guiEntry) { + public void onLeftClicked(Book book, CategoryAbstract category, EntryAbstract entry, double mouseX, double mouseY, PlayerEntity player, EntryScreen guiEntry) { } @Override @OnlyIn(Dist.CLIENT) - public void onRightClicked(Book book, CategoryAbstract category, EntryAbstract entry, int mouseX, int mouseY, PlayerEntity player, EntryScreen guiEntry) { + public void onRightClicked(Book book, CategoryAbstract category, EntryAbstract entry, double mouseX, double mouseY, PlayerEntity player, EntryScreen guiEntry) { } @Override diff --git a/src/main/java/api/impl/abstraction/CategoryAbstract.java b/src/main/java/api/impl/abstraction/CategoryAbstract.java index 6700278d..9c6b8f53 100644 --- a/src/main/java/api/impl/abstraction/CategoryAbstract.java +++ b/src/main/java/api/impl/abstraction/CategoryAbstract.java @@ -142,10 +142,10 @@ public List getTooltip() { public abstract boolean canSee(PlayerEntity player, ItemStack bookStack); @OnlyIn(Dist.CLIENT) - public abstract void onLeftClicked(Book book, int mouseX, int mouseY, PlayerEntity player, ItemStack bookStack); + public abstract void onLeftClicked(Book book, double mouseX, double mouseY, PlayerEntity player, ItemStack bookStack); @OnlyIn(Dist.CLIENT) - public abstract void onRightClicked(Book book, int mouseX, int mouseY, PlayerEntity player, ItemStack bookStack); + public abstract void onRightClicked(Book book, double mouseX, double mouseY, PlayerEntity player, ItemStack bookStack); @OnlyIn(Dist.CLIENT) public abstract void onInit(Book book, HomeScreen guiHome, PlayerEntity player, ItemStack bookStack); diff --git a/src/main/java/api/impl/abstraction/EntryAbstract.java b/src/main/java/api/impl/abstraction/EntryAbstract.java index fcf47a58..2b885793 100644 --- a/src/main/java/api/impl/abstraction/EntryAbstract.java +++ b/src/main/java/api/impl/abstraction/EntryAbstract.java @@ -67,10 +67,10 @@ public String getLocalizedName() { public abstract boolean canSee(PlayerEntity player, ItemStack bookStack); @OnlyIn(Dist.CLIENT) - public abstract void onLeftClicked(Book book, CategoryAbstract category, int mouseX, int mouseY, PlayerEntity player, CategoryScreen guiCategory); + public abstract void onLeftClicked(Book book, CategoryAbstract category, double mouseX, double mouseY, PlayerEntity player, CategoryScreen guiCategory); @OnlyIn(Dist.CLIENT) - public abstract void onRightClicked(Book book, CategoryAbstract category, int mouseX, int mouseY, PlayerEntity player, CategoryScreen guiCategory); + public abstract void onRightClicked(Book book, CategoryAbstract category, double mouseX, double mouseY, PlayerEntity player, CategoryScreen guiCategory); @OnlyIn(Dist.CLIENT) public abstract void onInit(Book book, CategoryAbstract category, CategoryScreen guiCategory, PlayerEntity player, ItemStack bookStack); diff --git a/src/main/java/api/util/GuiHelper.java b/src/main/java/api/util/GuiHelper.java index e5caff1e..400970c0 100644 --- a/src/main/java/api/util/GuiHelper.java +++ b/src/main/java/api/util/GuiHelper.java @@ -30,7 +30,7 @@ public class GuiHelper { * @param height - Height of the rectangle * @return whether or not the mouse is in the rectangle */ - public static boolean isMouseBetween(int mouseX, int mouseY, int x, int y, int width, int height) { + public static boolean isMouseBetween(double mouseX, double mouseY, int x, int y, int width, int height) { int xSize = x + width; int ySize = y + height; return (mouseX >= x && mouseX <= xSize && mouseY >= y && mouseY <= ySize); From 901d67d51a4d5e84afd64ba55ece250c117fff24 Mon Sep 17 00:00:00 2001 From: maxanier Date: Sun, 22 Mar 2020 12:29:44 +0100 Subject: [PATCH 06/28] It compiles --- build.gradle | 12 +++ .../amerifrance/guideapi/GuideConfig.java | 2 +- .../java/amerifrance/guideapi/GuideMod.java | 1 + .../guideapi/RegistrarGuideAPI.java | 2 +- .../guideapi/page/PageFurnaceRecipe.java | 78 ++++++++++--------- .../guideapi/page/PageJsonRecipe.java | 3 +- src/main/java/api/GuideAPI.java | 10 +-- .../guideapi => }/test/TestBook.java | 13 ++-- .../guideapi => }/test/TestBook2.java | 11 +-- .../guideapi => }/test/TestBook3.java | 7 +- src/main/resources/META-INF/mods.toml | 19 +++++ src/main/resources/mcmod.info | 16 ---- src/main/resources/pack.mcmeta | 6 ++ 13 files changed, 102 insertions(+), 78 deletions(-) rename src/main/java/{amerifrance/guideapi => }/test/TestBook.java (77%) rename src/main/java/{amerifrance/guideapi => }/test/TestBook2.java (79%) rename src/main/java/{amerifrance/guideapi => }/test/TestBook3.java (88%) create mode 100644 src/main/resources/META-INF/mods.toml delete mode 100644 src/main/resources/mcmod.info create mode 100644 src/main/resources/pack.mcmeta diff --git a/build.gradle b/build.gradle index 0d8d1a37..592630b1 100644 --- a/build.gradle +++ b/build.gradle @@ -47,7 +47,19 @@ dependencies { runtimeOnly fg.deobf("mezz.jei:jei-${project.minecraft_version}:${project.jei_version}") //Full for runtime } +sourceSets { + main { + java { + srcDirs = ["$rootDir/src/main/java"] + } + resources { + srcDirs = [ + "$rootDir/src/main/resources" + ] + } + } +} minecraft { diff --git a/src/main/java/amerifrance/guideapi/GuideConfig.java b/src/main/java/amerifrance/guideapi/GuideConfig.java index 13c84162..6a442f1b 100644 --- a/src/main/java/amerifrance/guideapi/GuideConfig.java +++ b/src/main/java/amerifrance/guideapi/GuideConfig.java @@ -65,7 +65,7 @@ public static class Common { Common(ForgeConfigSpec.Builder builder) { - builder.comment("Common configurations settings").comment("common"); + builder.comment("Common configurations settings").push("common"); enableLogging = builder.comment("Enables extra information being printed to the console.").define("enableLogging",true); builder.pop(); } diff --git a/src/main/java/amerifrance/guideapi/GuideMod.java b/src/main/java/amerifrance/guideapi/GuideMod.java index 51175a53..9c577a3c 100644 --- a/src/main/java/amerifrance/guideapi/GuideMod.java +++ b/src/main/java/amerifrance/guideapi/GuideMod.java @@ -7,6 +7,7 @@ import amerifrance.guideapi.network.PacketHandler; import amerifrance.guideapi.proxy.CommonProxy; import amerifrance.guideapi.util.AnnotationHandler; +import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.DistExecutor; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; diff --git a/src/main/java/amerifrance/guideapi/RegistrarGuideAPI.java b/src/main/java/amerifrance/guideapi/RegistrarGuideAPI.java index bba0fa53..a529b475 100644 --- a/src/main/java/amerifrance/guideapi/RegistrarGuideAPI.java +++ b/src/main/java/amerifrance/guideapi/RegistrarGuideAPI.java @@ -23,7 +23,7 @@ import net.minecraftforge.registries.ForgeRegistries; import org.apache.commons.lang3.tuple.Pair; -@Mod.EventBusSubscriber +@Mod.EventBusSubscriber(modid = "guideapi",bus = Mod.EventBusSubscriber.Bus.MOD) public class RegistrarGuideAPI { /* diff --git a/src/main/java/amerifrance/guideapi/page/PageFurnaceRecipe.java b/src/main/java/amerifrance/guideapi/page/PageFurnaceRecipe.java index 99bbb732..e7913f1c 100644 --- a/src/main/java/amerifrance/guideapi/page/PageFurnaceRecipe.java +++ b/src/main/java/amerifrance/guideapi/page/PageFurnaceRecipe.java @@ -26,46 +26,48 @@ public class PageFurnaceRecipe extends Page { public ItemStack input; public ItemStack output; +// +// /** +// * @param input - Input ItemStack to draw smelting result of +// */ +// public PageFurnaceRecipe(ItemStack input) { +// this.input = input; +// this.output = FurnaceRecipe.instance().getSmeltingResult(input); +// } +// +// /** +// * @param input - Input Item to draw smelting result of +// */ +// public PageFurnaceRecipe(Item input) { +// this.input = new ItemStack(input); +// this.output = FurnaceRecipes.instance().getSmeltingResult(new ItemStack(input)); +// } +// +// /** +// * @param input - Input Block to draw smelting result of +// */ +// public PageFurnaceRecipe(Block input) { +// this.input = new ItemStack(input); +// this.output = FurnaceRecipes.instance().getSmeltingResult(new ItemStack(input)); +// } +// +// /** +// * @param input - Input OreDict entry to draw smelting result of +// */ +// public PageFurnaceRecipe(String input) { +// +// this.input = new ItemStack(Blocks.FIRE); +// +// if (!OreDictionary.getOres(input).isEmpty()) +// for (int i = 0; i < OreDictionary.getOres(input).size(); i++) { +// ItemStack stack = OreDictionary.getOres(input).get(i); +// +// this.input = stack; +// this.output = FurnaceRecipes.instance().getSmeltingResult(stack); +// } +// } - /** - * @param input - Input ItemStack to draw smelting result of - */ - public PageFurnaceRecipe(ItemStack input) { - this.input = input; - this.output = FurnaceRecipe.instance().getSmeltingResult(input); - } - - /** - * @param input - Input Item to draw smelting result of - */ - public PageFurnaceRecipe(Item input) { - this.input = new ItemStack(input); - this.output = FurnaceRecipes.instance().getSmeltingResult(new ItemStack(input)); - } - - /** - * @param input - Input Block to draw smelting result of - */ - public PageFurnaceRecipe(Block input) { - this.input = new ItemStack(input); - this.output = FurnaceRecipes.instance().getSmeltingResult(new ItemStack(input)); - } - /** - * @param input - Input OreDict entry to draw smelting result of - */ - public PageFurnaceRecipe(String input) { - - this.input = new ItemStack(Blocks.FIRE); - - if (!OreDictionary.getOres(input).isEmpty()) - for (int i = 0; i < OreDictionary.getOres(input).size(); i++) { - ItemStack stack = OreDictionary.getOres(input).get(i); - - this.input = stack; - this.output = FurnaceRecipes.instance().getSmeltingResult(stack); - } - } @Override @OnlyIn(Dist.CLIENT) diff --git a/src/main/java/amerifrance/guideapi/page/PageJsonRecipe.java b/src/main/java/amerifrance/guideapi/page/PageJsonRecipe.java index ce4e1c32..67dea3c7 100644 --- a/src/main/java/amerifrance/guideapi/page/PageJsonRecipe.java +++ b/src/main/java/amerifrance/guideapi/page/PageJsonRecipe.java @@ -1,5 +1,6 @@ package amerifrance.guideapi.page; +import net.minecraft.client.Minecraft; import net.minecraft.util.ResourceLocation; import net.minecraftforge.registries.ForgeRegistries; @@ -14,7 +15,7 @@ public PageJsonRecipe(ResourceLocation recipeId) { } public void init() { - this.recipe = ForgeRegistries.RECIPES.getValue(recipeId); + this.recipe = Minecraft.getInstance().getConnection().getRecipeManager().getRecipe(recipeId).get(); //TODO this.iRecipeRenderer = getRenderer(recipe); this.isValid = recipe != null && iRecipeRenderer != null; } diff --git a/src/main/java/api/GuideAPI.java b/src/main/java/api/GuideAPI.java index fa9ee88e..daf96681 100644 --- a/src/main/java/api/GuideAPI.java +++ b/src/main/java/api/GuideAPI.java @@ -59,11 +59,11 @@ public static void registerInfoRenderer(Book book, IInfoRenderer infoRenderer, C @OnlyIn(Dist.CLIENT) public static void setModel(Book book, ResourceLocation modelLoc, String variantName) { ModelResourceLocation mrl = new ModelResourceLocation(modelLoc, variantName); - ModelLoader.setCustomModelResourceLocation( - getStackFromBook(book).getItem(), - 0, - mrl - ); +// ModelLoader.setCustomModelResourceLocation( +// getStackFromBook(book).getItem(), +// 0, +// mrl +// ); TODO } /** diff --git a/src/main/java/amerifrance/guideapi/test/TestBook.java b/src/main/java/test/TestBook.java similarity index 77% rename from src/main/java/amerifrance/guideapi/test/TestBook.java rename to src/main/java/test/TestBook.java index b5ddd9cd..febb52e6 100644 --- a/src/main/java/amerifrance/guideapi/test/TestBook.java +++ b/src/main/java/test/TestBook.java @@ -1,4 +1,4 @@ -package amerifrance.guideapi.test; +package test; import api.GuideBook; import api.IGuideBook; @@ -9,14 +9,12 @@ import api.impl.abstraction.EntryAbstract; import amerifrance.guideapi.category.CategoryItemStack; import amerifrance.guideapi.entry.EntryItemStack; -import amerifrance.guideapi.page.PageFurnaceRecipe; import amerifrance.guideapi.page.PageIRecipe; import amerifrance.guideapi.page.PageJsonRecipe; import amerifrance.guideapi.page.PageText; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import net.minecraft.block.Blocks; -import net.minecraft.item.ItemGroup; import net.minecraft.item.Items; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; @@ -52,14 +50,15 @@ public Book buildBook() { List pages = Lists.newArrayList(); pages.add(new PageText("Hello, this is\nsome text")); - pages.add(new PageFurnaceRecipe(Blocks.COBBLESTONE)); - pages.add(PageIRecipe.newShaped(new ItemStack(Items.ACACIA_BOAT), "X X", "XXX", 'X', "plankWood")); + //pages.add(new PageFurnaceRecipe(Blocks.COBBLESTONE)); + pages.add(new PageIRecipe(new ShapedRecipe(new ResourceLocation("guideapi","test11"), "test",1,1,NonNullList.from(Ingredient.EMPTY,Ingredient.fromStacks(new ItemStack(Items.PUMPKIN))),new ItemStack(Blocks.OAK_LOG)))); + //pages.add(PageIRecipe.newShaped(new ItemStack(Items.ACACIA_BOAT), "X X", "XXX", 'X', "plankWood")); pages.add(new PageJsonRecipe(new ResourceLocation("minecraft", "acacia_fence"))); Entry entry = new EntryItemStack(pages, "test.entry.name", new ItemStack(Items.POTATO)); entries.put(new ResourceLocation("guideapi", "entry"), entry); - pages.add(PageIRecipe.newShapeless(new ItemStack(Blocks.IRON_BLOCK), "ingotIron", "ingotIron", "ingotIron", "ingotIron", "ingotIron", "ingotIron", "ingotIron", "ingotIron", "ingotIron")); - pages.add(PageIRecipe.newShapeless(new ItemStack(Blocks.OAK_PLANKS, 4), new ItemStack(Blocks.OAK_LOG))); + //pages.add(PageIRecipe.newShapeless(new ItemStack(Blocks.IRON_BLOCK), "ingotIron", "ingotIron", "ingotIron", "ingotIron", "ingotIron", "ingotIron", "ingotIron", "ingotIron", "ingotIron")); + //pages.add(PageIRecipe.newShapeless(new ItemStack(Blocks.OAK_PLANKS, 4), new ItemStack(Blocks.OAK_LOG))); categories.add(new CategoryItemStack(entries, "test.category.name", new ItemStack(Items.BLUE_BANNER))); book.setCategoryList(categories); diff --git a/src/main/java/amerifrance/guideapi/test/TestBook2.java b/src/main/java/test/TestBook2.java similarity index 79% rename from src/main/java/amerifrance/guideapi/test/TestBook2.java rename to src/main/java/test/TestBook2.java index bea22529..f336f078 100644 --- a/src/main/java/amerifrance/guideapi/test/TestBook2.java +++ b/src/main/java/test/TestBook2.java @@ -1,4 +1,4 @@ -package amerifrance.guideapi.test; +package test; import api.GuideBook; import api.IGuideBook; @@ -7,13 +7,14 @@ import amerifrance.guideapi.category.CategoryItemStack; import amerifrance.guideapi.entry.EntryItemStack; import amerifrance.guideapi.page.*; -import net.minecraft.block.Blocks; import net.minecraft.item.Items; import net.minecraft.item.crafting.Ingredient; +import net.minecraft.item.crafting.ShapedRecipe; import net.minecraft.potion.Potions; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.potion.PotionUtils; +import net.minecraft.util.NonNullList; import net.minecraft.util.ResourceLocation; import net.minecraftforge.common.Tags; import net.minecraftforge.common.brewing.BrewingRecipe; @@ -40,8 +41,8 @@ public Book buildBook() { CategoryAbstract testCategory = new CategoryItemStack("test.category.name", new ItemStack(Items.BLUE_BANNER)).withKeyBase("guideapi"); testCategory.addEntry("entry", new EntryItemStack("test.entry.name", new ItemStack(Items.POTATO))); testCategory.getEntry("entry").addPage(new PageText("Hello, this is\nsome text")); - testCategory.getEntry("entry").addPage(new PageFurnaceRecipe(Blocks.COBBLESTONE)); - testCategory.getEntry("entry").addPage(PageIRecipe.newShaped(new ItemStack(Items.ACACIA_BOAT), "X X", "XXX", 'X', new ItemStack(Blocks.ACACIA_PLANKS, 1, 4))); + //testCategory.getEntry("entry").addPage(new PageFurnaceRecipe(Blocks.COBBLESTONE)); + //testCategory.getEntry("entry").addPage(PageIRecipe.newShaped(new ItemStack(Items.ACACIA_BOAT), "X X", "XXX", 'X', new ItemStack(Blocks.ACACIA_PLANKS, 1, 4))); testCategory.getEntry("entry").addPage(new PageBrewingRecipe(new BrewingRecipe(Ingredient.fromStacks(PotionUtils.addPotionToItemStack(new ItemStack(Items.POTION), Potions.AWKWARD)),Ingredient.fromStacks( new ItemStack(Items.GLISTERING_MELON_SLICE)), PotionUtils.addPotionToItemStack(new ItemStack(Items.POTION), Potions.HEALING))) ); testCategory.getEntry("entry").addPage(new PageJsonRecipe(new ResourceLocation("bread"))); @@ -54,6 +55,6 @@ public Book buildBook() { @Nullable @Override public IRecipe getRecipe(@Nonnull ItemStack bookStack) { - return new ShapedOreRecipe(null, bookStack, "X X", " X ", "X X", 'X', "ingotIron").setRegistryName(book.getRegistryName()); + return new ShapedRecipe(book.getRegistryName(), "", 3,1, NonNullList.from(Ingredient.EMPTY,Ingredient.EMPTY,Ingredient.fromTag(Tags.Items.INGOTS_GOLD),Ingredient.EMPTY),bookStack); } } diff --git a/src/main/java/amerifrance/guideapi/test/TestBook3.java b/src/main/java/test/TestBook3.java similarity index 88% rename from src/main/java/amerifrance/guideapi/test/TestBook3.java rename to src/main/java/test/TestBook3.java index b6155085..afdf3f95 100644 --- a/src/main/java/amerifrance/guideapi/test/TestBook3.java +++ b/src/main/java/test/TestBook3.java @@ -1,4 +1,4 @@ -package amerifrance.guideapi.test; +package test; import amerifrance.guideapi.GuideMod; import api.BookEvent; @@ -10,7 +10,6 @@ import amerifrance.guideapi.category.CategoryItemStack; import amerifrance.guideapi.entry.EntryItemStack; import amerifrance.guideapi.page.*; -import net.minecraft.block.Blocks; import net.minecraft.item.ItemGroup; import net.minecraft.item.Items; import net.minecraft.item.crafting.Ingredient; @@ -46,8 +45,8 @@ public Book buildBook() { CategoryAbstract testCategory = new CategoryItemStack("test.category.name", new ItemStack(Items.BLACK_BANNER)).withKeyBase("guideapi"); testCategory.addEntry("entry", new EntryItemStack("test.entry.name", new ItemStack(Items.POTATO))); testCategory.getEntry("entry").addPage(new PageText("Hello, this is\nsome text")); - testCategory.getEntry("entry").addPage(new PageFurnaceRecipe(Blocks.COBBLESTONE)); - testCategory.getEntry("entry").addPage(PageIRecipe.newShaped(new ItemStack(Items.ACACIA_BOAT), "X X", "XXX", 'X', new ItemStack(Blocks.ACACIA_PLANKS, 1, 4))); + //testCategory.getEntry("entry").addPage(new PageFurnaceRecipe(Blocks.COBBLESTONE)); + //testCategory.getEntry("entry").addPage(PageIRecipe.newShaped(new ItemStack(Items.ACACIA_BOAT), "X X", "XXX", 'X', new ItemStack(Blocks.ACACIA_PLANKS, 1, 4))); testCategory.getEntry("entry").addPage(new PageBrewingRecipe(new BrewingRecipe(Ingredient.fromStacks( PotionUtils.addPotionToItemStack(new ItemStack(Items.POTION), Potions.AWKWARD)),Ingredient.fromStacks( new ItemStack(Items.GLISTERING_MELON_SLICE)), PotionUtils.addPotionToItemStack(new ItemStack(Items.POTION), Potions.HEALING))) ); diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml new file mode 100644 index 00000000..4ff03cbd --- /dev/null +++ b/src/main/resources/META-INF/mods.toml @@ -0,0 +1,19 @@ +modLoader="javafml" +loaderVersion="[27,)" +issueTrackerURL="https://github.com/TeamAmeriFrance/Guide-API/issues" + +[[mods]] + modId="guideapi" + namespace="guideapi" + version="${version}" + displayName="Guide-API" + authors="Tombenpotter, TehNut, Maxanier" + credits="" + description="Simple mod guide creation" + updateJSONURL="https://maxanier.de/projects/vampirism/versions.json" + [[dependencies.guideeapi]] + modId="forge" + mandatory=true + versionRange="[${forge_version},)" + ordering="NONE" + side="BOTH" diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info deleted file mode 100644 index 56a344a7..00000000 --- a/src/main/resources/mcmod.info +++ /dev/null @@ -1,16 +0,0 @@ -[ -{ - "modid": "guideapi", - "name": "Guide-API", - "description": "Simple mod guide creation.", - "version": "${version}", - "mcversion": "${mcversion}", - "url": "", - "updateUrl": "http://tehnut.info/jenkins/", - "authorList": [ "Tombenpotter", "TehNut" ], - "credits": "", - "logoFile": "", - "screenshots": [], - "dependencies": [] -} -] diff --git a/src/main/resources/pack.mcmeta b/src/main/resources/pack.mcmeta new file mode 100644 index 00000000..6df7ca86 --- /dev/null +++ b/src/main/resources/pack.mcmeta @@ -0,0 +1,6 @@ +{ + "pack": { + "description": "Guide-API Resources", + "pack_format": 4 + } +} \ No newline at end of file From 81360c11f085b87e7a87df49c2b84f11777717ef Mon Sep 17 00:00:00 2001 From: maxanier Date: Tue, 24 Mar 2020 00:49:09 +0100 Subject: [PATCH 07/28] Modified book registration and content creation. Removed deprecated book creation --- .../java/amerifrance/guideapi/GuideMod.java | 8 +- .../guideapi/RegistrarGuideAPI.java | 11 +- .../guideapi/item/ItemGuideBook.java | 4 +- src/main/java/api/impl/Book.java | 244 ++---------------- src/main/java/api/impl/BookBinder.java | 28 +- src/main/java/test/TestBook.java | 29 +-- src/main/java/test/TestBook2.java | 33 +-- src/main/java/test/TestBook3.java | 66 ----- 8 files changed, 80 insertions(+), 343 deletions(-) delete mode 100644 src/main/java/test/TestBook3.java diff --git a/src/main/java/amerifrance/guideapi/GuideMod.java b/src/main/java/amerifrance/guideapi/GuideMod.java index 9c577a3c..ea6b7435 100644 --- a/src/main/java/amerifrance/guideapi/GuideMod.java +++ b/src/main/java/amerifrance/guideapi/GuideMod.java @@ -12,6 +12,7 @@ import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; import net.minecraftforge.fml.event.lifecycle.FMLLoadCompleteEvent; +import net.minecraftforge.fml.event.lifecycle.InterModProcessEvent; import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; import org.apache.commons.lang3.tuple.Pair; @@ -36,8 +37,7 @@ public GuideMod(){ GuideAPI.initialize(); FMLJavaModLoadingContext.get().getModEventBus().addListener(this::setup); FMLJavaModLoadingContext.get().getModEventBus().addListener(this::loadComplete); - - + FMLJavaModLoadingContext.get().getModEventBus().addListener(this::interModMsg); } private void setup(final FMLCommonSetupEvent event){ @@ -51,6 +51,10 @@ private void loadComplete(final FMLLoadCompleteEvent event){ guide.getRight().handlePost(GuideAPI.getStackFromBook(guide.getLeft())); } + private void interModMsg(final InterModProcessEvent event){ + GuideAPI.getBooks().values().parallelStream().forEach(Book::initializeContent); + } + diff --git a/src/main/java/amerifrance/guideapi/RegistrarGuideAPI.java b/src/main/java/amerifrance/guideapi/RegistrarGuideAPI.java index a529b475..9745f801 100644 --- a/src/main/java/amerifrance/guideapi/RegistrarGuideAPI.java +++ b/src/main/java/amerifrance/guideapi/RegistrarGuideAPI.java @@ -26,16 +26,9 @@ @Mod.EventBusSubscriber(modid = "guideapi",bus = Mod.EventBusSubscriber.Bus.MOD) public class RegistrarGuideAPI { - /* - * Why Register? Well, that's an easy one. We need to register our items during the registry event phase so they - * can be properly used during init and beyond. However, we cannot handle it during Register because any mods - * using @ObjectHolder will not have their Item fields populated. Thus, we must use an event that fires *after* - * Item object holders are populated, but *before* the recipe registry. Since the events are fired in alphabetical order, - * we just pick one that starts with a letter before "r". - * TODO check - */ + @SubscribeEvent - public static void registerItemsInADifferentRegistryEventBecauseLoadOrderingAndObjectHoldersAreImportant(RegistryEvent.Register event) { + public static void registerItems(RegistryEvent.Register event) { AnnotationHandler.gatherBooks(); for (Book book : GuideAPI.getBooks().values()) { diff --git a/src/main/java/amerifrance/guideapi/item/ItemGuideBook.java b/src/main/java/amerifrance/guideapi/item/ItemGuideBook.java index 2694d80f..0fc48625 100644 --- a/src/main/java/amerifrance/guideapi/item/ItemGuideBook.java +++ b/src/main/java/amerifrance/guideapi/item/ItemGuideBook.java @@ -25,10 +25,12 @@ import net.minecraft.util.text.TranslationTextComponent; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.common.util.LazyOptional; import javax.annotation.Nonnull; import javax.annotation.Nullable; import java.util.List; +import java.util.Optional; public class ItemGuideBook extends Item implements IGuideItem { @@ -37,7 +39,7 @@ public class ItemGuideBook extends Item implements IGuideItem { private String translation_key; - public ItemGuideBook(@Nonnull Book book) { + public ItemGuideBook(Book book) { super(new Item.Properties().maxStackSize(1).group(book.getCreativeTab())); this.book = book; diff --git a/src/main/java/api/impl/Book.java b/src/main/java/api/impl/Book.java index f95c3c97..669a7442 100644 --- a/src/main/java/api/impl/Book.java +++ b/src/main/java/api/impl/Book.java @@ -6,34 +6,36 @@ import com.google.common.collect.Lists; import net.minecraft.item.ItemGroup; import net.minecraft.util.ResourceLocation; +import net.minecraftforge.common.util.NonNullSupplier; import org.apache.commons.lang3.builder.ToStringBuilder; import java.awt.Color; +import java.util.ArrayList; import java.util.List; +import java.util.function.Consumer; +import java.util.function.Supplier; public class Book { private static final String GUITEXLOC = "guideapi:textures/gui/"; - private List categories = Lists.newArrayList(); - private String title = "item.GuideBook.name"; - private String header = title; - private String itemName = title; - private String author; - private ResourceLocation pageTexture = new ResourceLocation(GUITEXLOC + "book_colored.png"); - private ResourceLocation outlineTexture = new ResourceLocation(GUITEXLOC + "book_greyscale.png"); - private boolean customModel; - private Color color = new Color(171, 70, 30); - private boolean spawnWithBook; - private ResourceLocation registryName; - private ItemGroup creativeTab = ItemGroup.MISC; - - /** - * @deprecated see {@link BookBinder}. To be made package private in 1.13. - */ - @Deprecated - public Book(List categoryList, String title, String header, String displayName, String author, ResourceLocation pageTexture, ResourceLocation outlineTexture, boolean customModel, Color color, boolean spawnWithBook, ResourceLocation registryName, ItemGroup creativeTab) { - this.categories = categoryList; + private final List categories = new ArrayList<>(); + private final Consumer> contentProvider; + private final String title; + private final String header; + private final String itemName; + private final String author; + private final ResourceLocation pageTexture; + private final ResourceLocation outlineTexture; + private final boolean customModel; + private final Color color; + private final boolean spawnWithBook; + private final ResourceLocation registryName; + private final ItemGroup creativeTab; + + + protected Book(Consumer> contentProvider, String title, String header, String displayName, String author, ResourceLocation pageTexture, ResourceLocation outlineTexture, boolean customModel, Color color, boolean spawnWithBook, ResourceLocation registryName, ItemGroup creativeTab) { + this.contentProvider = contentProvider; this.title = title; this.header = header; this.itemName = displayName; @@ -47,11 +49,8 @@ public Book(List categoryList, String title, String header, St this.creativeTab = creativeTab; } - /** - * @deprecated see {@link BookBinder}. To be removed in 1.13. - */ - @Deprecated - public Book() { + public void initializeContent(){ + contentProvider.accept(categories); } public List getCategoryList() { @@ -102,203 +101,6 @@ public ItemGroup getCreativeTab() { return this.creativeTab; } - /** - * @deprecated see {@link #getItemName()}. To be removed in 1.13. - */ - @Deprecated - public String getDisplayName() { - return this.itemName; - } - - /** - * @deprecated see {@link #getHeader()}. To be removed in 1.13. - */ - @Deprecated - public String getWelcomeMessage() { - return this.header; - } - - /** - * @deprecated see {@link #hasCustomModel()}. To be removed in 1.13. - */ - @Deprecated - public boolean isCustomModel() { - return this.customModel; - } - - /** - * @deprecated see {@link #shouldSpawnWithBook()}. To be removed in 1.13. - */ - @Deprecated - public boolean isSpawnWithBook() { - return this.spawnWithBook; - } - - /** - * @deprecated see {@link BookBinder#addCategory(CategoryAbstract)}. To be removed in 1.13. - */ - @Deprecated - public void setCategoryList(List categoryList) { - this.categories = categoryList; - } - - /** - * @deprecated see {@link BookBinder#setGuideTitle(String)}. To be removed in 1.13. - */ - @Deprecated - public void setTitle(String title) { - this.title = title; - } - - /** - * @deprecated see {@link BookBinder#setHeader(String)}. To be removed in 1.13. - */ - @Deprecated - public void setWelcomeMessage(String header) { - this.header = header; - } - - /** - * @deprecated see {@link BookBinder#setItemName(String)}. To be removed in 1.13. - */ - @Deprecated - public void setDisplayName(String displayName) { - this.itemName = displayName; - } - - /** - * @deprecated see {@link BookBinder#setAuthor(String)}. To be removed in 1.13. - */ - @Deprecated - public void setAuthor(String author) { - this.author = author; - } - - /** - * @deprecated see {@link BookBinder#setSpawnWithBook()}. To be removed in 1.13. - */ - @Deprecated - public void setSpawnWithBook(boolean spawnWithBook) { - this.spawnWithBook = spawnWithBook; - } - - /** - * @deprecated see {@link BookBinder#setPageTexture(ResourceLocation)}. To be removed in 1.13. - */ - @Deprecated - public void setPageTexture(ResourceLocation pageTexture) { - this.pageTexture = pageTexture; - } - - /** - * @deprecated see {@link BookBinder#setOutlineTexture(ResourceLocation)}. To be removed in 1.13. - */ - @Deprecated - public void setOutlineTexture(ResourceLocation outlineTexture) { - this.outlineTexture = outlineTexture; - } - - /** - * @deprecated see {@link BookBinder#setHasCustomModel()}. To be removed in 1.13. - */ - @Deprecated - public void setCustomModel(boolean customModel) { - this.customModel = customModel; - } - - /** - * @deprecated see {@link BookBinder#setColor(int)}. To be removed in 1.13. - */ - @Deprecated - public void setColor(Color color) { - this.color = color; - } - - /** - * @deprecated see {@link BookBinder#BookBinder(ResourceLocation)}. To be removed in 1.13. - */ - @Deprecated - public void setRegistryName(ResourceLocation registryName) { - this.registryName = registryName; - } - - /** - * @deprecated see {@link BookBinder#setCreativeTab(ItemGroup)}. To be removed in 1.13. - */ - @Deprecated - public void setCreativeTab(ItemGroup creativeTab) { - this.creativeTab = creativeTab; - } - - /** - * @deprecated see {@link BookBinder#addCategory(CategoryAbstract)}. To be removed in 1.13. - * - * @param category - Add this category - */ - @Deprecated - public void addCategory(CategoryAbstract category) { - this.categories.add(category); - } - - /** - * @deprecated see {@link BookBinder}. To be removed in 1.13. - * - * @param category - Remove this category - */ - @Deprecated - public void removeCategory(CategoryAbstract category) { - this.categories.remove(category); - } - - /** - * @deprecated see {@link BookBinder#addCategory(CategoryAbstract)}. To be removed in 1.13. - * - * @param categories - Add these categories - */ - @Deprecated - public void addCategoryList(List categories) { - this.categories.addAll(categories); - } - - /** - * @deprecated see {@link BookBinder}. To be removed in 1.13. - * - * @param categories - Remove these categories - */ - @Deprecated - public void removeCategoryList(List categories) { - this.categories.removeAll(categories); - } - - /** - * @deprecated localize yourself with {@link #getTitle()}. To be removed in 1.13. - * - * @return - Localized book title - */ - @Deprecated - public String getLocalizedBookTitle() { - return TextHelper.localizeEffect(getTitle()); - } - - /** - * @deprecated localize yourself with {@link #getHeader()}. To be removed in 1.13. - * - * @return - Localized welcome message - */ - @Deprecated - public String getLocalizedWelcomeMessage() { - return TextHelper.localizeEffect(getHeader()); - } - - /** - * @deprecated localize yourself with {@link #getDisplayName()}. To be removed in 1.13. - * - * @return - Localized item display name - */ - @Deprecated - public String getLocalizedDisplayName() { - return TextHelper.localize(getDisplayName()); - } @Override public String toString() { diff --git a/src/main/java/api/impl/BookBinder.java b/src/main/java/api/impl/BookBinder.java index 4aa27e14..b1c47ff9 100644 --- a/src/main/java/api/impl/BookBinder.java +++ b/src/main/java/api/impl/BookBinder.java @@ -1,23 +1,24 @@ package api.impl; import api.impl.abstraction.CategoryAbstract; +import com.google.common.base.Function; import com.google.common.base.Strings; -import com.google.common.collect.Lists; import net.minecraft.item.ItemGroup; import net.minecraft.util.ResourceLocation; +import net.minecraftforge.common.util.NonNullSupplier; import net.minecraftforge.fml.ModContainer; import net.minecraftforge.fml.ModList; -import net.minecraftforge.fml.ModLoadingContext; -import net.minecraftforge.fml.loading.moddiscovery.ModInfo; +import net.minecraftforge.fml.event.lifecycle.InterModProcessEvent; import net.minecraftforge.forgespi.language.IModInfo; import java.awt.Color; import java.util.List; +import java.util.function.Consumer; public class BookBinder { private final ResourceLocation registryName; - private final List categories = Lists.newArrayList(); + private Consumer> contentProvider; private String guideTitle = "item.guideapi.book.name"; private String header; private String itemName; @@ -38,17 +39,16 @@ public BookBinder(ResourceLocation registryName) { this.registryName = registryName; } + /** - * Adds a new {@link CategoryAbstract} to this book. You should either pre-build or keep a reference of this category - * so you may populate it with entries. - * - * Categories are displayed in the order they are added. + * Set a consumer (method) that will generate the content for your book and add it to the provided list + * It will be called during GuideAPI's {@link InterModProcessEvent} (so it might execute in parallel with your mod) * - * @param category The category to add to this book. + * @param contentProvider The consumer. Categories are displayed in which they are added to the provided list * @return the builder instance for chaining. */ - public BookBinder addCategory(CategoryAbstract category) { - this.categories.add(category); + public BookBinder setContentProvider(Consumer> contentProvider){ + this.contentProvider = contentProvider; return this; } @@ -208,6 +208,10 @@ public Book build() { if (this.itemName == null) this.itemName = guideTitle.substring(5); - return new Book(categories, guideTitle, header, itemName, author, pageTexture, outlineTexture, hasCustomModel, color, spawnWithBook, registryName, creativeTab); + if(contentProvider ==null){ + throw new IllegalStateException("Content supplier of book "+registryName.toString()+" must be provided"); + } + + return new Book(contentProvider, guideTitle, header, itemName, author, pageTexture, outlineTexture, hasCustomModel, color, spawnWithBook, registryName, creativeTab); } } diff --git a/src/main/java/test/TestBook.java b/src/main/java/test/TestBook.java index febb52e6..c93b8f05 100644 --- a/src/main/java/test/TestBook.java +++ b/src/main/java/test/TestBook.java @@ -4,6 +4,7 @@ import api.IGuideBook; import api.IPage; import api.impl.Book; +import api.impl.BookBinder; import api.impl.Entry; import api.impl.abstraction.CategoryAbstract; import api.impl.abstraction.EntryAbstract; @@ -27,6 +28,7 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; import java.awt.Color; +import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -38,14 +40,18 @@ public class TestBook implements IGuideBook { @Nullable @Override public Book buildBook() { - book = new Book(); - book.setAuthor("TehNut"); - book.setColor(Color.GRAY); - book.setDisplayName("Display Name"); - book.setTitle("Title message"); - book.setWelcomeMessage("Is this still a thing?"); + BookBinder binder = new BookBinder(new ResourceLocation("guideapi","test_book")); + binder.setAuthor("TehNut").setColor(Color.GRAY).setItemName("Display Name").setHeader("Hello there").setGuideTitle("Title message").setContentProvider(this::buildContent); + return (book = binder.build()); + } + + @Override + public IRecipe getRecipe(@Nonnull ItemStack bookStack) { + return new ShapedRecipe(book.getRegistryName(), "", 3,1,NonNullList.from(Ingredient.EMPTY,Ingredient.EMPTY,Ingredient.fromTag(Tags.Items.INGOTS_IRON),Ingredient.EMPTY),bookStack); + } + + private void buildContent(List categories){ - List categories = Lists.newArrayList(); Map entries = Maps.newHashMap(); List pages = Lists.newArrayList(); @@ -59,15 +65,6 @@ public Book buildBook() { //pages.add(PageIRecipe.newShapeless(new ItemStack(Blocks.IRON_BLOCK), "ingotIron", "ingotIron", "ingotIron", "ingotIron", "ingotIron", "ingotIron", "ingotIron", "ingotIron", "ingotIron")); //pages.add(PageIRecipe.newShapeless(new ItemStack(Blocks.OAK_PLANKS, 4), new ItemStack(Blocks.OAK_LOG))); - categories.add(new CategoryItemStack(entries, "test.category.name", new ItemStack(Items.BLUE_BANNER))); - book.setCategoryList(categories); - book.setRegistryName(new ResourceLocation("guideapi", "test_book")); - return book; - } - - @Override - public IRecipe getRecipe(@Nonnull ItemStack bookStack) { - return new ShapedRecipe(book.getRegistryName(), "", 3,1,NonNullList.from(Ingredient.EMPTY,Ingredient.EMPTY,Ingredient.fromTag(Tags.Items.INGOTS_IRON),Ingredient.EMPTY),bookStack); } } diff --git a/src/main/java/test/TestBook2.java b/src/main/java/test/TestBook2.java index f336f078..270eea2d 100644 --- a/src/main/java/test/TestBook2.java +++ b/src/main/java/test/TestBook2.java @@ -3,6 +3,7 @@ import api.GuideBook; import api.IGuideBook; import api.impl.Book; +import api.impl.BookBinder; import api.impl.abstraction.CategoryAbstract; import amerifrance.guideapi.category.CategoryItemStack; import amerifrance.guideapi.entry.EntryItemStack; @@ -22,6 +23,7 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; import java.awt.Color; +import java.util.List; @GuideBook public class TestBook2 implements IGuideBook { @@ -31,13 +33,21 @@ public class TestBook2 implements IGuideBook { @Nullable @Override public Book buildBook() { - book = new Book(); - book.setAuthor("TehNut"); - book.setColor(Color.GREEN); - book.setDisplayName("Display Name"); - book.setTitle("Title message"); - book.setWelcomeMessage("Is this still a thing?"); + BookBinder binder = new BookBinder(new ResourceLocation("guideapi","test_book2")); + binder.setAuthor("TehNut").setColor(Color.GRAY).setItemName("Display Name").setHeader("Hello there").setGuideTitle("Title message").setContentProvider(this::buildContent); + + + return (book = binder.build()); + } + + @Nullable + @Override + public IRecipe getRecipe(@Nonnull ItemStack bookStack) { + return new ShapedRecipe(book.getRegistryName(), "", 3,1, NonNullList.from(Ingredient.EMPTY,Ingredient.EMPTY,Ingredient.fromTag(Tags.Items.INGOTS_GOLD),Ingredient.EMPTY),bookStack); + } + + private void buildContent(List categories) { CategoryAbstract testCategory = new CategoryItemStack("test.category.name", new ItemStack(Items.BLUE_BANNER)).withKeyBase("guideapi"); testCategory.addEntry("entry", new EntryItemStack("test.entry.name", new ItemStack(Items.POTATO))); testCategory.getEntry("entry").addPage(new PageText("Hello, this is\nsome text")); @@ -46,15 +56,6 @@ public Book buildBook() { testCategory.getEntry("entry").addPage(new PageBrewingRecipe(new BrewingRecipe(Ingredient.fromStacks(PotionUtils.addPotionToItemStack(new ItemStack(Items.POTION), Potions.AWKWARD)),Ingredient.fromStacks( new ItemStack(Items.GLISTERING_MELON_SLICE)), PotionUtils.addPotionToItemStack(new ItemStack(Items.POTION), Potions.HEALING))) ); testCategory.getEntry("entry").addPage(new PageJsonRecipe(new ResourceLocation("bread"))); - book.addCategory(testCategory); - - book.setRegistryName(new ResourceLocation("guideapi", "test_book2")); - return book; - } - - @Nullable - @Override - public IRecipe getRecipe(@Nonnull ItemStack bookStack) { - return new ShapedRecipe(book.getRegistryName(), "", 3,1, NonNullList.from(Ingredient.EMPTY,Ingredient.EMPTY,Ingredient.fromTag(Tags.Items.INGOTS_GOLD),Ingredient.EMPTY),bookStack); + categories.add(testCategory); } } diff --git a/src/main/java/test/TestBook3.java b/src/main/java/test/TestBook3.java deleted file mode 100644 index afdf3f95..00000000 --- a/src/main/java/test/TestBook3.java +++ /dev/null @@ -1,66 +0,0 @@ -package test; - -import amerifrance.guideapi.GuideMod; -import api.BookEvent; -import api.GuideBook; -import api.IGuideBook; -import api.impl.Book; -import api.impl.BookBinder; -import api.impl.abstraction.CategoryAbstract; -import amerifrance.guideapi.category.CategoryItemStack; -import amerifrance.guideapi.entry.EntryItemStack; -import amerifrance.guideapi.page.*; -import net.minecraft.item.ItemGroup; -import net.minecraft.item.Items; -import net.minecraft.item.crafting.Ingredient; -import net.minecraft.potion.Potions; -import net.minecraft.item.ItemStack; -import net.minecraft.potion.PotionUtils; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.text.StringTextComponent; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.common.brewing.BrewingRecipe; -import net.minecraftforge.eventbus.api.SubscribeEvent; - -import javax.annotation.Nullable; - -@GuideBook -public class TestBook3 implements IGuideBook { - - public static Book book; - - @Nullable - @Override - public Book buildBook() { - MinecraftForge.EVENT_BUS.register(this); - - BookBinder binder = new BookBinder(new ResourceLocation(GuideMod.ID, "test_book3")) - .setAuthor("TunHet") - .setColor(0x7EF67F) - .setCreativeTab(ItemGroup.COMBAT) - .setGuideTitle("some.guide.title") - .setHeader("some.header.text") - .setSpawnWithBook(); - - CategoryAbstract testCategory = new CategoryItemStack("test.category.name", new ItemStack(Items.BLACK_BANNER)).withKeyBase("guideapi"); - testCategory.addEntry("entry", new EntryItemStack("test.entry.name", new ItemStack(Items.POTATO))); - testCategory.getEntry("entry").addPage(new PageText("Hello, this is\nsome text")); - //testCategory.getEntry("entry").addPage(new PageFurnaceRecipe(Blocks.COBBLESTONE)); - //testCategory.getEntry("entry").addPage(PageIRecipe.newShaped(new ItemStack(Items.ACACIA_BOAT), "X X", "XXX", 'X', new ItemStack(Blocks.ACACIA_PLANKS, 1, 4))); - testCategory.getEntry("entry").addPage(new PageBrewingRecipe(new BrewingRecipe(Ingredient.fromStacks( PotionUtils.addPotionToItemStack(new ItemStack(Items.POTION), Potions.AWKWARD)),Ingredient.fromStacks( new ItemStack(Items.GLISTERING_MELON_SLICE)), - PotionUtils.addPotionToItemStack(new ItemStack(Items.POTION), Potions.HEALING))) - ); - testCategory.getEntry("entry").addPage(new PageJsonRecipe(new ResourceLocation("bread"))); - binder.addCategory(testCategory); - - return book = binder.build(); - } - - @SubscribeEvent - public void onBookOpen(BookEvent.Open event) { - if (event.getBook() == book && event.getPlayer().isSneaking()) { - event.setCanceledText(new StringTextComponent("No snek allowed")); - event.setCanceled(true); - } - } -} From ac91743c118b7a637499181a5ac7626ac60c5fb8 Mon Sep 17 00:00:00 2001 From: maxanier Date: Sat, 28 Mar 2020 17:35:06 +0100 Subject: [PATCH 08/28] WIP recipe rework (all recipes can now be json recipes) --- .../guideapi/page/PageIRecipe.java | 10 +++++- .../guideapi/page/PageJsonRecipe.java | 35 +++++++++++++++++-- .../reciperenderer/FurnaceRecipeRenderer.java | 10 ++++++ .../guideapi/proxy/ClientProxy.java | 4 +++ .../guideapi/proxy/CommonProxy.java | 2 ++ 5 files changed, 57 insertions(+), 4 deletions(-) create mode 100644 src/main/java/amerifrance/guideapi/page/reciperenderer/FurnaceRecipeRenderer.java diff --git a/src/main/java/amerifrance/guideapi/page/PageIRecipe.java b/src/main/java/amerifrance/guideapi/page/PageIRecipe.java index 94b36bee..f035d6e6 100644 --- a/src/main/java/amerifrance/guideapi/page/PageIRecipe.java +++ b/src/main/java/amerifrance/guideapi/page/PageIRecipe.java @@ -1,5 +1,6 @@ package amerifrance.guideapi.page; +import amerifrance.guideapi.page.reciperenderer.FurnaceRecipeRenderer; import api.IRecipeRenderer; import api.impl.Book; import api.impl.Page; @@ -13,12 +14,15 @@ import net.minecraft.client.gui.FontRenderer; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.FurnaceRecipe; import net.minecraft.item.crafting.IRecipe; import net.minecraft.item.crafting.ShapedRecipe; import net.minecraft.item.crafting.ShapelessRecipe; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; +import javax.annotation.Nullable; + public class PageIRecipe extends Page { @@ -32,6 +36,7 @@ public class PageIRecipe extends Page { *
    *
  • {@link ShapedRecipe}
    • *
  • {@link ShapelessRecipe}
    • + *
  • {@link FurnaceRecipe}
    • *
* * @param recipe - Recipe to draw @@ -82,7 +87,10 @@ static IRecipeRenderer getRenderer(IRecipe recipe) { return new ShapedRecipesRenderer((ShapedRecipe) recipe); } else if (recipe instanceof ShapelessRecipe) { return new ShapelessRecipesRenderer((ShapelessRecipe) recipe); - } else { + } else if(recipe instanceof FurnaceRecipe){ + return new FurnaceRecipeRenderer((FurnaceRecipe)recipe); + } + else { LogHelper.error("Cannot get renderer for recipe type "+recipe.getClass().toString()); return null; } diff --git a/src/main/java/amerifrance/guideapi/page/PageJsonRecipe.java b/src/main/java/amerifrance/guideapi/page/PageJsonRecipe.java index 67dea3c7..60b63d7b 100644 --- a/src/main/java/amerifrance/guideapi/page/PageJsonRecipe.java +++ b/src/main/java/amerifrance/guideapi/page/PageJsonRecipe.java @@ -1,7 +1,20 @@ package amerifrance.guideapi.page; +import amerifrance.guideapi.gui.EntryScreen; +import amerifrance.guideapi.util.LogHelper; +import api.IRecipeRenderer; +import api.impl.Book; +import api.impl.abstraction.CategoryAbstract; +import api.impl.abstraction.EntryAbstract; import net.minecraft.client.Minecraft; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.IRecipe; import net.minecraft.util.ResourceLocation; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.fml.server.ServerLifecycleHooks; import net.minecraftforge.registries.ForgeRegistries; public class PageJsonRecipe extends PageIRecipe { @@ -10,13 +23,29 @@ public class PageJsonRecipe extends PageIRecipe { public PageJsonRecipe(ResourceLocation recipeId) { super(null, null); + this.recipeId = recipeId; + } + public PageJsonRecipe(ResourceLocation recipeId, IRecipeRenderer render){ + super(null,render); this.recipeId = recipeId; } - public void init() { - this.recipe = Minecraft.getInstance().getConnection().getRecipeManager().getRecipe(recipeId).get(); //TODO - this.iRecipeRenderer = getRenderer(recipe); + @OnlyIn(Dist.CLIENT) + @Override + public void onInit(Book book, CategoryAbstract category, EntryAbstract entry, PlayerEntity player, ItemStack bookStack, EntryScreen guiEntry) { + super.onInit(book, category, entry, player, bookStack, guiEntry); + if(recipe==null){ + this.recipe = Minecraft.getInstance().getConnection() ==null ? null : Minecraft.getInstance().getConnection().getRecipeManager().getRecipe(recipeId).orElse(null); + if(recipe==null){ + LogHelper.error("Cannot find recipe "+recipeId.toString()); + } + else{ + if(iRecipeRenderer!=null){ + iRecipeRenderer = getRenderer(recipe); + } + } + } this.isValid = recipe != null && iRecipeRenderer != null; } } \ No newline at end of file diff --git a/src/main/java/amerifrance/guideapi/page/reciperenderer/FurnaceRecipeRenderer.java b/src/main/java/amerifrance/guideapi/page/reciperenderer/FurnaceRecipeRenderer.java new file mode 100644 index 00000000..5ee3618e --- /dev/null +++ b/src/main/java/amerifrance/guideapi/page/reciperenderer/FurnaceRecipeRenderer.java @@ -0,0 +1,10 @@ +package amerifrance.guideapi.page.reciperenderer; + +import net.minecraft.item.crafting.FurnaceRecipe; + + +public class FurnaceRecipeRenderer extends BasicRecipeRenderer { + public FurnaceRecipeRenderer(FurnaceRecipe recipe) { + super(recipe); + } +} diff --git a/src/main/java/amerifrance/guideapi/proxy/ClientProxy.java b/src/main/java/amerifrance/guideapi/proxy/ClientProxy.java index d80d6764..e50bb43a 100644 --- a/src/main/java/amerifrance/guideapi/proxy/ClientProxy.java +++ b/src/main/java/amerifrance/guideapi/proxy/ClientProxy.java @@ -5,6 +5,7 @@ import api.BookEvent; import api.GuideAPI; import api.IGuideItem; +import api.IRecipeRenderer; import api.impl.Book; import api.impl.abstraction.CategoryAbstract; import api.impl.abstraction.EntryAbstract; @@ -14,12 +15,15 @@ import net.minecraft.client.audio.SimpleSound; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.IRecipeType; import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.ResourceLocation; import net.minecraft.util.SoundEvent; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; +import java.util.Map; + public class ClientProxy extends CommonProxy { @Override diff --git a/src/main/java/amerifrance/guideapi/proxy/CommonProxy.java b/src/main/java/amerifrance/guideapi/proxy/CommonProxy.java index caaf5b39..c2a7e73e 100644 --- a/src/main/java/amerifrance/guideapi/proxy/CommonProxy.java +++ b/src/main/java/amerifrance/guideapi/proxy/CommonProxy.java @@ -2,6 +2,7 @@ import api.GuideAPI; import api.IGuideItem; +import api.IRecipeRenderer; import api.impl.Book; import api.impl.abstraction.CategoryAbstract; import api.impl.abstraction.EntryAbstract; @@ -11,6 +12,7 @@ import amerifrance.guideapi.gui.HomeScreen; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.IRecipeType; import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.Hand; import net.minecraft.util.ResourceLocation; From 1001aa9956eb3a13ee465fca1f81d7899fb7f5fb Mon Sep 17 00:00:00 2001 From: maxanier Date: Sat, 28 Mar 2020 17:52:34 +0100 Subject: [PATCH 09/28] Fix api and test package --- .../amerifrance/guideapi/GuideConfig.java | 2 -- .../java/amerifrance/guideapi/GuideMod.java | 9 +++------ .../guideapi/RegistrarGuideAPI.java | 13 +++---------- .../guideapi}/api/BookEvent.java | 4 ++-- .../guideapi}/api/GuideAPI.java | 5 ++--- .../guideapi}/api/GuideBook.java | 2 +- .../guideapi}/api/IGuideBook.java | 4 ++-- .../guideapi}/api/IGuideItem.java | 4 ++-- .../guideapi}/api/IGuideLinked.java | 2 +- .../guideapi}/api/IInfoRenderer.java | 4 ++-- .../{ => amerifrance/guideapi}/api/IPage.java | 8 ++++---- .../guideapi}/api/IRecipeRenderer.java | 10 ++++------ .../guideapi}/api/SubTexture.java | 2 +- .../guideapi}/api/button/ButtonGuideAPI.java | 2 +- .../guideapi}/api/impl/Book.java | 8 ++------ .../guideapi}/api/impl/BookBinder.java | 6 ++---- .../guideapi}/api/impl/Category.java | 6 +++--- .../guideapi}/api/impl/Entry.java | 10 +++++----- .../guideapi}/api/impl/Page.java | 8 ++++---- .../impl/abstraction/CategoryAbstract.java | 6 +++--- .../api/impl/abstraction/EntryAbstract.java | 8 ++++---- .../guideapi/api/package-info.java | 2 ++ .../guideapi}/api/util/BookHelper.java | 8 ++++---- .../guideapi}/api/util/GuiHelper.java | 3 +-- .../guideapi}/api/util/NBTBookTags.java | 2 +- .../guideapi}/api/util/PageHelper.java | 6 +++--- .../guideapi}/api/util/TextHelper.java | 2 +- .../guideapi/button/ButtonBack.java | 6 +++--- .../guideapi/button/ButtonNext.java | 6 +++--- .../guideapi/button/ButtonPrev.java | 6 +++--- .../guideapi/button/ButtonSearch.java | 8 ++++---- .../guideapi/category/CategoryItemStack.java | 8 ++++---- .../category/CategoryResourceLocation.java | 8 ++++---- .../guideapi/entry/EntryItemStack.java | 10 +++++----- .../guideapi/entry/EntryResourceLocation.java | 10 +++++----- .../guideapi/gui/CategoryScreen.java | 10 +++------- .../amerifrance/guideapi/gui/EntryScreen.java | 11 ++++------- .../amerifrance/guideapi/gui/HomeScreen.java | 7 ++----- .../guideapi/gui/SearchScreen.java | 11 ++++------- .../info/InfoRendererDescription.java | 6 +++--- .../guideapi/info/InfoRendererImage.java | 4 ++-- .../guideapi/item/ItemGuideBook.java | 18 ++++++------------ .../guideapi/network/PacketSyncCategory.java | 6 ++---- .../guideapi/network/PacketSyncEntry.java | 6 ++---- .../guideapi/network/PacketSyncHome.java | 6 ++---- .../guideapi/page/PageBrewingRecipe.java | 14 +++++++------- .../guideapi/page/PageFurnaceRecipe.java | 16 +++++++--------- .../guideapi/page/PageIRecipe.java | 12 +++++------- .../amerifrance/guideapi/page/PageImage.java | 10 +++++----- .../guideapi/page/PageItemStack.java | 10 ++++------ .../guideapi/page/PageJsonRecipe.java | 12 ++++-------- .../amerifrance/guideapi/page/PageSound.java | 10 +++++----- .../amerifrance/guideapi/page/PageText.java | 10 +++++----- .../guideapi/page/PageTextImage.java | 10 +++++----- .../reciperenderer/BasicRecipeRenderer.java | 16 +++++++--------- .../reciperenderer/ShapedRecipesRenderer.java | 8 ++++---- .../ShapelessRecipesRenderer.java | 10 +++++----- .../guideapi/proxy/ClientProxy.java | 18 +++++++----------- .../guideapi/proxy/CommonProxy.java | 18 +++--------------- .../guideapi}/test/TestBook.java | 19 +++++++++---------- .../guideapi}/test/TestBook2.java | 12 ++++++------ .../amerifrance/guideapi/util/APISetter.java | 4 ++-- .../guideapi/util/AnnotationHandler.java | 8 ++++---- .../guideapi/util/EventHandler.java | 14 +++++++------- .../guideapi/wrapper/CategoryWrapper.java | 6 +++--- .../guideapi/wrapper/EntryWrapper.java | 8 ++++---- .../guideapi/wrapper/PageWrapper.java | 8 ++++---- src/main/java/api/package-info.java | 2 -- 68 files changed, 236 insertions(+), 312 deletions(-) rename src/main/java/{ => amerifrance/guideapi}/api/BookEvent.java (96%) rename src/main/java/{ => amerifrance/guideapi}/api/GuideAPI.java (97%) rename src/main/java/{ => amerifrance/guideapi}/api/GuideBook.java (92%) rename src/main/java/{ => amerifrance/guideapi}/api/IGuideBook.java (94%) rename src/main/java/{ => amerifrance/guideapi}/api/IGuideItem.java (58%) rename src/main/java/{ => amerifrance/guideapi}/api/IGuideLinked.java (95%) rename src/main/java/{ => amerifrance/guideapi}/api/IInfoRenderer.java (96%) rename src/main/java/{ => amerifrance/guideapi}/api/IPage.java (87%) rename src/main/java/{ => amerifrance/guideapi}/api/IRecipeRenderer.java (86%) rename src/main/java/{ => amerifrance/guideapi}/api/SubTexture.java (99%) rename src/main/java/{ => amerifrance/guideapi}/api/button/ButtonGuideAPI.java (90%) rename src/main/java/{ => amerifrance/guideapi}/api/impl/Book.java (94%) rename src/main/java/{ => amerifrance/guideapi}/api/impl/BookBinder.java (97%) rename src/main/java/{ => amerifrance/guideapi}/api/impl/Category.java (91%) rename src/main/java/{ => amerifrance/guideapi}/api/impl/Entry.java (93%) rename src/main/java/{ => amerifrance/guideapi}/api/impl/Page.java (90%) rename src/main/java/{ => amerifrance/guideapi}/api/impl/abstraction/CategoryAbstract.java (97%) rename src/main/java/{ => amerifrance/guideapi}/api/impl/abstraction/EntryAbstract.java (94%) create mode 100644 src/main/java/amerifrance/guideapi/api/package-info.java rename src/main/java/{ => amerifrance/guideapi}/api/util/BookHelper.java (73%) rename src/main/java/{ => amerifrance/guideapi}/api/util/GuiHelper.java (99%) rename src/main/java/{ => amerifrance/guideapi}/api/util/NBTBookTags.java (91%) rename src/main/java/{ => amerifrance/guideapi}/api/util/PageHelper.java (96%) rename src/main/java/{ => amerifrance/guideapi}/api/util/TextHelper.java (98%) rename src/main/java/{ => amerifrance/guideapi}/test/TestBook.java (87%) rename src/main/java/{ => amerifrance/guideapi}/test/TestBook2.java (90%) delete mode 100644 src/main/java/api/package-info.java diff --git a/src/main/java/amerifrance/guideapi/GuideConfig.java b/src/main/java/amerifrance/guideapi/GuideConfig.java index 6a442f1b..0e6c941c 100644 --- a/src/main/java/amerifrance/guideapi/GuideConfig.java +++ b/src/main/java/amerifrance/guideapi/GuideConfig.java @@ -1,8 +1,6 @@ package amerifrance.guideapi; -import api.GuideAPI; -import api.impl.Book; import net.minecraftforge.common.ForgeConfigSpec; import net.minecraftforge.fml.ModLoadingContext; import net.minecraftforge.fml.config.ModConfig; diff --git a/src/main/java/amerifrance/guideapi/GuideMod.java b/src/main/java/amerifrance/guideapi/GuideMod.java index ea6b7435..2793e097 100644 --- a/src/main/java/amerifrance/guideapi/GuideMod.java +++ b/src/main/java/amerifrance/guideapi/GuideMod.java @@ -1,13 +1,12 @@ package amerifrance.guideapi; import amerifrance.guideapi.proxy.ClientProxy; -import api.GuideAPI; -import api.IGuideBook; -import api.impl.Book; +import amerifrance.guideapi.api.GuideAPI; +import amerifrance.guideapi.api.IGuideBook; +import amerifrance.guideapi.api.impl.Book; import amerifrance.guideapi.network.PacketHandler; import amerifrance.guideapi.proxy.CommonProxy; import amerifrance.guideapi.util.AnnotationHandler; -import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.DistExecutor; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; @@ -16,8 +15,6 @@ import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; import org.apache.commons.lang3.tuple.Pair; -import java.io.File; - @Mod(value = GuideMod.ID) public class GuideMod { diff --git a/src/main/java/amerifrance/guideapi/RegistrarGuideAPI.java b/src/main/java/amerifrance/guideapi/RegistrarGuideAPI.java index 9745f801..476eaab7 100644 --- a/src/main/java/amerifrance/guideapi/RegistrarGuideAPI.java +++ b/src/main/java/amerifrance/guideapi/RegistrarGuideAPI.java @@ -1,22 +1,15 @@ package amerifrance.guideapi; -import api.GuideAPI; -import api.IGuideBook; -import api.IPage; -import api.impl.Book; -import api.impl.abstraction.CategoryAbstract; -import api.impl.abstraction.EntryAbstract; +import amerifrance.guideapi.api.GuideAPI; +import amerifrance.guideapi.api.IGuideBook; +import amerifrance.guideapi.api.impl.Book; import amerifrance.guideapi.item.ItemGuideBook; -import amerifrance.guideapi.page.PageJsonRecipe; import amerifrance.guideapi.util.APISetter; import amerifrance.guideapi.util.AnnotationHandler; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.IRecipe; -import net.minecraft.world.biome.Biome; import net.minecraftforge.client.event.ModelRegistryEvent; import net.minecraftforge.event.RegistryEvent; -import net.minecraftforge.eventbus.api.EventPriority; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; diff --git a/src/main/java/api/BookEvent.java b/src/main/java/amerifrance/guideapi/api/BookEvent.java similarity index 96% rename from src/main/java/api/BookEvent.java rename to src/main/java/amerifrance/guideapi/api/BookEvent.java index 07d0db15..a92ad2ff 100644 --- a/src/main/java/api/BookEvent.java +++ b/src/main/java/amerifrance/guideapi/api/BookEvent.java @@ -1,6 +1,6 @@ -package api; +package amerifrance.guideapi.api; -import api.impl.Book; +import amerifrance.guideapi.api.impl.Book; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.text.ITextComponent; diff --git a/src/main/java/api/GuideAPI.java b/src/main/java/amerifrance/guideapi/api/GuideAPI.java similarity index 97% rename from src/main/java/api/GuideAPI.java rename to src/main/java/amerifrance/guideapi/api/GuideAPI.java index daf96681..8f6e0413 100644 --- a/src/main/java/api/GuideAPI.java +++ b/src/main/java/amerifrance/guideapi/api/GuideAPI.java @@ -1,6 +1,6 @@ -package api; +package amerifrance.guideapi.api; -import api.impl.Book; +import amerifrance.guideapi.api.impl.Book; import com.google.common.collect.*; import net.minecraft.block.Block; import net.minecraft.client.renderer.model.ModelResourceLocation; @@ -8,7 +8,6 @@ import net.minecraft.util.ResourceLocation; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import net.minecraftforge.client.model.ModelLoader; import java.util.List; diff --git a/src/main/java/api/GuideBook.java b/src/main/java/amerifrance/guideapi/api/GuideBook.java similarity index 92% rename from src/main/java/api/GuideBook.java rename to src/main/java/amerifrance/guideapi/api/GuideBook.java index a88959bd..97890413 100644 --- a/src/main/java/api/GuideBook.java +++ b/src/main/java/amerifrance/guideapi/api/GuideBook.java @@ -1,4 +1,4 @@ -package api; +package amerifrance.guideapi.api; import net.minecraftforge.eventbus.api.EventPriority; diff --git a/src/main/java/api/IGuideBook.java b/src/main/java/amerifrance/guideapi/api/IGuideBook.java similarity index 94% rename from src/main/java/api/IGuideBook.java rename to src/main/java/amerifrance/guideapi/api/IGuideBook.java index ce205265..40449854 100644 --- a/src/main/java/api/IGuideBook.java +++ b/src/main/java/amerifrance/guideapi/api/IGuideBook.java @@ -1,6 +1,6 @@ -package api; +package amerifrance.guideapi.api; -import api.impl.Book; +import amerifrance.guideapi.api.impl.Book; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraftforge.api.distmarker.Dist; diff --git a/src/main/java/api/IGuideItem.java b/src/main/java/amerifrance/guideapi/api/IGuideItem.java similarity index 58% rename from src/main/java/api/IGuideItem.java rename to src/main/java/amerifrance/guideapi/api/IGuideItem.java index 1ed345e7..60c55150 100644 --- a/src/main/java/api/IGuideItem.java +++ b/src/main/java/amerifrance/guideapi/api/IGuideItem.java @@ -1,6 +1,6 @@ -package api; +package amerifrance.guideapi.api; -import api.impl.Book; +import amerifrance.guideapi.api.impl.Book; import net.minecraft.item.ItemStack; public interface IGuideItem { diff --git a/src/main/java/api/IGuideLinked.java b/src/main/java/amerifrance/guideapi/api/IGuideLinked.java similarity index 95% rename from src/main/java/api/IGuideLinked.java rename to src/main/java/amerifrance/guideapi/api/IGuideLinked.java index b7850284..f1a3a772 100644 --- a/src/main/java/api/IGuideLinked.java +++ b/src/main/java/amerifrance/guideapi/api/IGuideLinked.java @@ -1,4 +1,4 @@ -package api; +package amerifrance.guideapi.api; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; diff --git a/src/main/java/api/IInfoRenderer.java b/src/main/java/amerifrance/guideapi/api/IInfoRenderer.java similarity index 96% rename from src/main/java/api/IInfoRenderer.java rename to src/main/java/amerifrance/guideapi/api/IInfoRenderer.java index fbb5dc8b..fb7137ce 100644 --- a/src/main/java/api/IInfoRenderer.java +++ b/src/main/java/amerifrance/guideapi/api/IInfoRenderer.java @@ -1,6 +1,6 @@ -package api; +package amerifrance.guideapi.api; -import api.impl.Book; +import amerifrance.guideapi.api.impl.Book; import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/api/IPage.java b/src/main/java/amerifrance/guideapi/api/IPage.java similarity index 87% rename from src/main/java/api/IPage.java rename to src/main/java/amerifrance/guideapi/api/IPage.java index 84021aa3..a28d5426 100644 --- a/src/main/java/api/IPage.java +++ b/src/main/java/amerifrance/guideapi/api/IPage.java @@ -1,10 +1,10 @@ -package api; +package amerifrance.guideapi.api; import amerifrance.guideapi.gui.BaseScreen; import amerifrance.guideapi.gui.EntryScreen; -import api.impl.Book; -import api.impl.abstraction.CategoryAbstract; -import api.impl.abstraction.EntryAbstract; +import amerifrance.guideapi.api.impl.Book; +import amerifrance.guideapi.api.impl.abstraction.CategoryAbstract; +import amerifrance.guideapi.api.impl.abstraction.EntryAbstract; import net.minecraft.client.gui.FontRenderer; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; diff --git a/src/main/java/api/IRecipeRenderer.java b/src/main/java/amerifrance/guideapi/api/IRecipeRenderer.java similarity index 86% rename from src/main/java/api/IRecipeRenderer.java rename to src/main/java/amerifrance/guideapi/api/IRecipeRenderer.java index 603616e3..68462989 100644 --- a/src/main/java/api/IRecipeRenderer.java +++ b/src/main/java/amerifrance/guideapi/api/IRecipeRenderer.java @@ -1,19 +1,17 @@ -package api; +package amerifrance.guideapi.api; import amerifrance.guideapi.gui.BaseScreen; -import api.impl.Book; -import api.impl.abstraction.CategoryAbstract; -import api.impl.abstraction.EntryAbstract; +import amerifrance.guideapi.api.impl.Book; +import amerifrance.guideapi.api.impl.abstraction.CategoryAbstract; +import amerifrance.guideapi.api.impl.abstraction.EntryAbstract; import com.google.common.collect.Lists; import net.minecraft.client.gui.FontRenderer; import net.minecraft.item.crafting.IRecipe; import net.minecraft.util.text.ITextComponent; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import net.minecraftforge.fml.client.config.GuiUtils; import java.util.List; -import java.util.stream.Collectors; public interface IRecipeRenderer { diff --git a/src/main/java/api/SubTexture.java b/src/main/java/amerifrance/guideapi/api/SubTexture.java similarity index 99% rename from src/main/java/api/SubTexture.java rename to src/main/java/amerifrance/guideapi/api/SubTexture.java index f576fa0e..0cccb97b 100644 --- a/src/main/java/api/SubTexture.java +++ b/src/main/java/amerifrance/guideapi/api/SubTexture.java @@ -1,4 +1,4 @@ -package api; +package amerifrance.guideapi.api; import com.mojang.blaze3d.platform.GlStateManager; import net.minecraft.client.Minecraft; diff --git a/src/main/java/api/button/ButtonGuideAPI.java b/src/main/java/amerifrance/guideapi/api/button/ButtonGuideAPI.java similarity index 90% rename from src/main/java/api/button/ButtonGuideAPI.java rename to src/main/java/amerifrance/guideapi/api/button/ButtonGuideAPI.java index 962a917d..62787bc6 100644 --- a/src/main/java/api/button/ButtonGuideAPI.java +++ b/src/main/java/amerifrance/guideapi/api/button/ButtonGuideAPI.java @@ -1,4 +1,4 @@ -package api.button; +package amerifrance.guideapi.api.button; import amerifrance.guideapi.gui.BaseScreen; import net.minecraft.client.gui.widget.button.Button; diff --git a/src/main/java/api/impl/Book.java b/src/main/java/amerifrance/guideapi/api/impl/Book.java similarity index 94% rename from src/main/java/api/impl/Book.java rename to src/main/java/amerifrance/guideapi/api/impl/Book.java index 669a7442..0011c3ae 100644 --- a/src/main/java/api/impl/Book.java +++ b/src/main/java/amerifrance/guideapi/api/impl/Book.java @@ -1,19 +1,15 @@ -package api.impl; +package amerifrance.guideapi.api.impl; -import api.impl.abstraction.CategoryAbstract; -import api.util.TextHelper; +import amerifrance.guideapi.api.impl.abstraction.CategoryAbstract; import com.google.common.base.Joiner; -import com.google.common.collect.Lists; import net.minecraft.item.ItemGroup; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.common.util.NonNullSupplier; import org.apache.commons.lang3.builder.ToStringBuilder; import java.awt.Color; import java.util.ArrayList; import java.util.List; import java.util.function.Consumer; -import java.util.function.Supplier; public class Book { diff --git a/src/main/java/api/impl/BookBinder.java b/src/main/java/amerifrance/guideapi/api/impl/BookBinder.java similarity index 97% rename from src/main/java/api/impl/BookBinder.java rename to src/main/java/amerifrance/guideapi/api/impl/BookBinder.java index b1c47ff9..cc7a17f6 100644 --- a/src/main/java/api/impl/BookBinder.java +++ b/src/main/java/amerifrance/guideapi/api/impl/BookBinder.java @@ -1,11 +1,9 @@ -package api.impl; +package amerifrance.guideapi.api.impl; -import api.impl.abstraction.CategoryAbstract; -import com.google.common.base.Function; +import amerifrance.guideapi.api.impl.abstraction.CategoryAbstract; import com.google.common.base.Strings; import net.minecraft.item.ItemGroup; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.common.util.NonNullSupplier; import net.minecraftforge.fml.ModContainer; import net.minecraftforge.fml.ModList; import net.minecraftforge.fml.event.lifecycle.InterModProcessEvent; diff --git a/src/main/java/api/impl/Category.java b/src/main/java/amerifrance/guideapi/api/impl/Category.java similarity index 91% rename from src/main/java/api/impl/Category.java rename to src/main/java/amerifrance/guideapi/api/impl/Category.java index c25f0d45..d3166a2c 100644 --- a/src/main/java/api/impl/Category.java +++ b/src/main/java/amerifrance/guideapi/api/impl/Category.java @@ -1,7 +1,7 @@ -package api.impl; +package amerifrance.guideapi.api.impl; -import api.impl.abstraction.CategoryAbstract; -import api.impl.abstraction.EntryAbstract; +import amerifrance.guideapi.api.impl.abstraction.CategoryAbstract; +import amerifrance.guideapi.api.impl.abstraction.EntryAbstract; import amerifrance.guideapi.gui.BaseScreen; import amerifrance.guideapi.gui.CategoryScreen; import amerifrance.guideapi.gui.HomeScreen; diff --git a/src/main/java/api/impl/Entry.java b/src/main/java/amerifrance/guideapi/api/impl/Entry.java similarity index 93% rename from src/main/java/api/impl/Entry.java rename to src/main/java/amerifrance/guideapi/api/impl/Entry.java index 0292a4f2..df96c081 100644 --- a/src/main/java/api/impl/Entry.java +++ b/src/main/java/amerifrance/guideapi/api/impl/Entry.java @@ -1,9 +1,9 @@ -package api.impl; +package amerifrance.guideapi.api.impl; -import api.IPage; -import api.impl.abstraction.CategoryAbstract; -import api.impl.abstraction.EntryAbstract; -import api.util.GuiHelper; +import amerifrance.guideapi.api.IPage; +import amerifrance.guideapi.api.impl.abstraction.CategoryAbstract; +import amerifrance.guideapi.api.impl.abstraction.EntryAbstract; +import amerifrance.guideapi.api.util.GuiHelper; import amerifrance.guideapi.gui.BaseScreen; import amerifrance.guideapi.gui.CategoryScreen; import amerifrance.guideapi.gui.EntryScreen; diff --git a/src/main/java/api/impl/Page.java b/src/main/java/amerifrance/guideapi/api/impl/Page.java similarity index 90% rename from src/main/java/api/impl/Page.java rename to src/main/java/amerifrance/guideapi/api/impl/Page.java index 378c7b4c..20a601d9 100644 --- a/src/main/java/api/impl/Page.java +++ b/src/main/java/amerifrance/guideapi/api/impl/Page.java @@ -1,8 +1,8 @@ -package api.impl; +package amerifrance.guideapi.api.impl; -import api.IPage; -import api.impl.abstraction.CategoryAbstract; -import api.impl.abstraction.EntryAbstract; +import amerifrance.guideapi.api.IPage; +import amerifrance.guideapi.api.impl.abstraction.CategoryAbstract; +import amerifrance.guideapi.api.impl.abstraction.EntryAbstract; import amerifrance.guideapi.gui.BaseScreen; import amerifrance.guideapi.gui.EntryScreen; import net.minecraft.client.gui.FontRenderer; diff --git a/src/main/java/api/impl/abstraction/CategoryAbstract.java b/src/main/java/amerifrance/guideapi/api/impl/abstraction/CategoryAbstract.java similarity index 97% rename from src/main/java/api/impl/abstraction/CategoryAbstract.java rename to src/main/java/amerifrance/guideapi/api/impl/abstraction/CategoryAbstract.java index 9c6b8f53..2560b668 100644 --- a/src/main/java/api/impl/abstraction/CategoryAbstract.java +++ b/src/main/java/amerifrance/guideapi/api/impl/abstraction/CategoryAbstract.java @@ -1,7 +1,7 @@ -package api.impl.abstraction; +package amerifrance.guideapi.api.impl.abstraction; -import api.impl.Book; -import api.util.TextHelper; +import amerifrance.guideapi.api.impl.Book; +import amerifrance.guideapi.api.util.TextHelper; import amerifrance.guideapi.gui.BaseScreen; import amerifrance.guideapi.gui.HomeScreen; import com.google.common.base.Strings; diff --git a/src/main/java/api/impl/abstraction/EntryAbstract.java b/src/main/java/amerifrance/guideapi/api/impl/abstraction/EntryAbstract.java similarity index 94% rename from src/main/java/api/impl/abstraction/EntryAbstract.java rename to src/main/java/amerifrance/guideapi/api/impl/abstraction/EntryAbstract.java index 2b885793..a12cc752 100644 --- a/src/main/java/api/impl/abstraction/EntryAbstract.java +++ b/src/main/java/amerifrance/guideapi/api/impl/abstraction/EntryAbstract.java @@ -1,8 +1,8 @@ -package api.impl.abstraction; +package amerifrance.guideapi.api.impl.abstraction; -import api.IPage; -import api.impl.Book; -import api.util.TextHelper; +import amerifrance.guideapi.api.IPage; +import amerifrance.guideapi.api.impl.Book; +import amerifrance.guideapi.api.util.TextHelper; import amerifrance.guideapi.gui.BaseScreen; import amerifrance.guideapi.gui.CategoryScreen; import com.google.common.collect.Lists; diff --git a/src/main/java/amerifrance/guideapi/api/package-info.java b/src/main/java/amerifrance/guideapi/api/package-info.java new file mode 100644 index 00000000..e757efb4 --- /dev/null +++ b/src/main/java/amerifrance/guideapi/api/package-info.java @@ -0,0 +1,2 @@ +package amerifrance.guideapi.api; + diff --git a/src/main/java/api/util/BookHelper.java b/src/main/java/amerifrance/guideapi/api/util/BookHelper.java similarity index 73% rename from src/main/java/api/util/BookHelper.java rename to src/main/java/amerifrance/guideapi/api/util/BookHelper.java index 44d6b183..86bd5a0e 100644 --- a/src/main/java/api/util/BookHelper.java +++ b/src/main/java/amerifrance/guideapi/api/util/BookHelper.java @@ -1,8 +1,8 @@ -package api.util; +package amerifrance.guideapi.api.util; -import api.impl.Book; -import api.impl.abstraction.CategoryAbstract; -import api.impl.abstraction.EntryAbstract; +import amerifrance.guideapi.api.impl.Book; +import amerifrance.guideapi.api.impl.abstraction.CategoryAbstract; +import amerifrance.guideapi.api.impl.abstraction.EntryAbstract; public class BookHelper { diff --git a/src/main/java/api/util/GuiHelper.java b/src/main/java/amerifrance/guideapi/api/util/GuiHelper.java similarity index 99% rename from src/main/java/api/util/GuiHelper.java rename to src/main/java/amerifrance/guideapi/api/util/GuiHelper.java index 400970c0..8b719c0d 100644 --- a/src/main/java/api/util/GuiHelper.java +++ b/src/main/java/amerifrance/guideapi/api/util/GuiHelper.java @@ -1,9 +1,8 @@ -package api.util; +package amerifrance.guideapi.api.util; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.RenderHelper; -import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.client.util.ITooltipFlag.TooltipFlags; diff --git a/src/main/java/api/util/NBTBookTags.java b/src/main/java/amerifrance/guideapi/api/util/NBTBookTags.java similarity index 91% rename from src/main/java/api/util/NBTBookTags.java rename to src/main/java/amerifrance/guideapi/api/util/NBTBookTags.java index a44a61c7..cfacf8e2 100644 --- a/src/main/java/api/util/NBTBookTags.java +++ b/src/main/java/amerifrance/guideapi/api/util/NBTBookTags.java @@ -1,4 +1,4 @@ -package api.util; +package amerifrance.guideapi.api.util; public class NBTBookTags { diff --git a/src/main/java/api/util/PageHelper.java b/src/main/java/amerifrance/guideapi/api/util/PageHelper.java similarity index 96% rename from src/main/java/api/util/PageHelper.java rename to src/main/java/amerifrance/guideapi/api/util/PageHelper.java index 753ffcab..127f6025 100644 --- a/src/main/java/api/util/PageHelper.java +++ b/src/main/java/amerifrance/guideapi/api/util/PageHelper.java @@ -1,7 +1,7 @@ -package api.util; +package amerifrance.guideapi.api.util; -import api.IPage; -import api.impl.Page; +import amerifrance.guideapi.api.IPage; +import amerifrance.guideapi.api.impl.Page; import amerifrance.guideapi.gui.BaseScreen; import amerifrance.guideapi.page.PageItemStack; import amerifrance.guideapi.page.PageText; diff --git a/src/main/java/api/util/TextHelper.java b/src/main/java/amerifrance/guideapi/api/util/TextHelper.java similarity index 98% rename from src/main/java/api/util/TextHelper.java rename to src/main/java/amerifrance/guideapi/api/util/TextHelper.java index 03c9ad1b..d50bdd5e 100644 --- a/src/main/java/api/util/TextHelper.java +++ b/src/main/java/amerifrance/guideapi/api/util/TextHelper.java @@ -1,4 +1,4 @@ -package api.util; +package amerifrance.guideapi.api.util; import net.minecraft.client.resources.I18n; import org.apache.commons.lang3.text.WordUtils; diff --git a/src/main/java/amerifrance/guideapi/button/ButtonBack.java b/src/main/java/amerifrance/guideapi/button/ButtonBack.java index 20682ddc..0a381470 100644 --- a/src/main/java/amerifrance/guideapi/button/ButtonBack.java +++ b/src/main/java/amerifrance/guideapi/button/ButtonBack.java @@ -1,9 +1,9 @@ package amerifrance.guideapi.button; import amerifrance.guideapi.GuideMod; -import api.button.ButtonGuideAPI; -import api.util.GuiHelper; -import api.util.TextHelper; +import amerifrance.guideapi.api.button.ButtonGuideAPI; +import amerifrance.guideapi.api.util.GuiHelper; +import amerifrance.guideapi.api.util.TextHelper; import amerifrance.guideapi.gui.BaseScreen; import com.mojang.blaze3d.platform.GlStateManager; import net.minecraft.client.Minecraft; diff --git a/src/main/java/amerifrance/guideapi/button/ButtonNext.java b/src/main/java/amerifrance/guideapi/button/ButtonNext.java index a07f79e9..32f4a699 100644 --- a/src/main/java/amerifrance/guideapi/button/ButtonNext.java +++ b/src/main/java/amerifrance/guideapi/button/ButtonNext.java @@ -1,9 +1,9 @@ package amerifrance.guideapi.button; import amerifrance.guideapi.GuideMod; -import api.button.ButtonGuideAPI; -import api.util.GuiHelper; -import api.util.TextHelper; +import amerifrance.guideapi.api.button.ButtonGuideAPI; +import amerifrance.guideapi.api.util.GuiHelper; +import amerifrance.guideapi.api.util.TextHelper; import amerifrance.guideapi.gui.BaseScreen; import com.mojang.blaze3d.platform.GlStateManager; import net.minecraft.client.Minecraft; diff --git a/src/main/java/amerifrance/guideapi/button/ButtonPrev.java b/src/main/java/amerifrance/guideapi/button/ButtonPrev.java index adbbf873..b78d598b 100644 --- a/src/main/java/amerifrance/guideapi/button/ButtonPrev.java +++ b/src/main/java/amerifrance/guideapi/button/ButtonPrev.java @@ -1,9 +1,9 @@ package amerifrance.guideapi.button; import amerifrance.guideapi.GuideMod; -import api.button.ButtonGuideAPI; -import api.util.GuiHelper; -import api.util.TextHelper; +import amerifrance.guideapi.api.button.ButtonGuideAPI; +import amerifrance.guideapi.api.util.GuiHelper; +import amerifrance.guideapi.api.util.TextHelper; import amerifrance.guideapi.gui.BaseScreen; import com.mojang.blaze3d.platform.GlStateManager; import net.minecraft.client.Minecraft; diff --git a/src/main/java/amerifrance/guideapi/button/ButtonSearch.java b/src/main/java/amerifrance/guideapi/button/ButtonSearch.java index 912c9332..f55f57ca 100644 --- a/src/main/java/amerifrance/guideapi/button/ButtonSearch.java +++ b/src/main/java/amerifrance/guideapi/button/ButtonSearch.java @@ -1,9 +1,9 @@ package amerifrance.guideapi.button; -import api.SubTexture; -import api.button.ButtonGuideAPI; -import api.util.GuiHelper; -import api.util.TextHelper; +import amerifrance.guideapi.api.SubTexture; +import amerifrance.guideapi.api.button.ButtonGuideAPI; +import amerifrance.guideapi.api.util.GuiHelper; +import amerifrance.guideapi.api.util.TextHelper; import amerifrance.guideapi.gui.BaseScreen; import com.mojang.blaze3d.platform.GlStateManager; import net.minecraft.client.Minecraft; diff --git a/src/main/java/amerifrance/guideapi/category/CategoryItemStack.java b/src/main/java/amerifrance/guideapi/category/CategoryItemStack.java index 6c58af3f..46219d7f 100644 --- a/src/main/java/amerifrance/guideapi/category/CategoryItemStack.java +++ b/src/main/java/amerifrance/guideapi/category/CategoryItemStack.java @@ -1,9 +1,9 @@ package amerifrance.guideapi.category; -import api.impl.Book; -import api.impl.Category; -import api.impl.abstraction.EntryAbstract; -import api.util.GuiHelper; +import amerifrance.guideapi.api.impl.Book; +import amerifrance.guideapi.api.impl.Category; +import amerifrance.guideapi.api.impl.abstraction.EntryAbstract; +import amerifrance.guideapi.api.util.GuiHelper; import amerifrance.guideapi.gui.BaseScreen; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.ItemRenderer; diff --git a/src/main/java/amerifrance/guideapi/category/CategoryResourceLocation.java b/src/main/java/amerifrance/guideapi/category/CategoryResourceLocation.java index a6b3d04b..6cac89f8 100644 --- a/src/main/java/amerifrance/guideapi/category/CategoryResourceLocation.java +++ b/src/main/java/amerifrance/guideapi/category/CategoryResourceLocation.java @@ -1,9 +1,9 @@ package amerifrance.guideapi.category; -import api.impl.Book; -import api.impl.Category; -import api.impl.abstraction.EntryAbstract; -import api.util.GuiHelper; +import amerifrance.guideapi.api.impl.Book; +import amerifrance.guideapi.api.impl.Category; +import amerifrance.guideapi.api.impl.abstraction.EntryAbstract; +import amerifrance.guideapi.api.util.GuiHelper; import amerifrance.guideapi.gui.BaseScreen; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.ItemRenderer; diff --git a/src/main/java/amerifrance/guideapi/entry/EntryItemStack.java b/src/main/java/amerifrance/guideapi/entry/EntryItemStack.java index 78c83520..73869273 100644 --- a/src/main/java/amerifrance/guideapi/entry/EntryItemStack.java +++ b/src/main/java/amerifrance/guideapi/entry/EntryItemStack.java @@ -1,10 +1,10 @@ package amerifrance.guideapi.entry; -import api.IPage; -import api.impl.Book; -import api.impl.Entry; -import api.impl.abstraction.CategoryAbstract; -import api.util.GuiHelper; +import amerifrance.guideapi.api.IPage; +import amerifrance.guideapi.api.impl.Book; +import amerifrance.guideapi.api.impl.Entry; +import amerifrance.guideapi.api.impl.abstraction.CategoryAbstract; +import amerifrance.guideapi.api.util.GuiHelper; import amerifrance.guideapi.gui.BaseScreen; import net.minecraft.client.gui.FontRenderer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/amerifrance/guideapi/entry/EntryResourceLocation.java b/src/main/java/amerifrance/guideapi/entry/EntryResourceLocation.java index 7a651436..d14f45e0 100644 --- a/src/main/java/amerifrance/guideapi/entry/EntryResourceLocation.java +++ b/src/main/java/amerifrance/guideapi/entry/EntryResourceLocation.java @@ -1,10 +1,10 @@ package amerifrance.guideapi.entry; -import api.IPage; -import api.impl.Book; -import api.impl.Entry; -import api.impl.abstraction.CategoryAbstract; -import api.util.GuiHelper; +import amerifrance.guideapi.api.IPage; +import amerifrance.guideapi.api.impl.Book; +import amerifrance.guideapi.api.impl.Entry; +import amerifrance.guideapi.api.impl.abstraction.CategoryAbstract; +import amerifrance.guideapi.api.util.GuiHelper; import amerifrance.guideapi.gui.BaseScreen; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; diff --git a/src/main/java/amerifrance/guideapi/gui/CategoryScreen.java b/src/main/java/amerifrance/guideapi/gui/CategoryScreen.java index ab4ecdd6..6ba814fe 100644 --- a/src/main/java/amerifrance/guideapi/gui/CategoryScreen.java +++ b/src/main/java/amerifrance/guideapi/gui/CategoryScreen.java @@ -1,8 +1,8 @@ package amerifrance.guideapi.gui; -import api.impl.Book; -import api.impl.abstraction.CategoryAbstract; -import api.impl.abstraction.EntryAbstract; +import amerifrance.guideapi.api.impl.Book; +import amerifrance.guideapi.api.impl.abstraction.CategoryAbstract; +import amerifrance.guideapi.api.impl.abstraction.EntryAbstract; import amerifrance.guideapi.button.ButtonBack; import amerifrance.guideapi.button.ButtonNext; import amerifrance.guideapi.button.ButtonPrev; @@ -12,18 +12,14 @@ import amerifrance.guideapi.wrapper.EntryWrapper; import com.google.common.collect.HashMultimap; import com.google.common.collect.Lists; -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.widget.button.Button; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.MathHelper; -import net.minecraft.util.text.StringTextComponent; import net.minecraft.util.text.TranslationTextComponent; import org.lwjgl.glfw.GLFW; import java.awt.Color; -import java.io.IOException; import java.util.List; import javax.annotation.Nullable; diff --git a/src/main/java/amerifrance/guideapi/gui/EntryScreen.java b/src/main/java/amerifrance/guideapi/gui/EntryScreen.java index fabd9d28..d4909fe2 100644 --- a/src/main/java/amerifrance/guideapi/gui/EntryScreen.java +++ b/src/main/java/amerifrance/guideapi/gui/EntryScreen.java @@ -1,9 +1,9 @@ package amerifrance.guideapi.gui; -import api.IPage; -import api.impl.Book; -import api.impl.abstraction.CategoryAbstract; -import api.impl.abstraction.EntryAbstract; +import amerifrance.guideapi.api.IPage; +import amerifrance.guideapi.api.impl.Book; +import amerifrance.guideapi.api.impl.abstraction.CategoryAbstract; +import amerifrance.guideapi.api.impl.abstraction.EntryAbstract; import amerifrance.guideapi.button.ButtonBack; import amerifrance.guideapi.button.ButtonNext; import amerifrance.guideapi.button.ButtonPrev; @@ -12,17 +12,14 @@ import amerifrance.guideapi.network.PacketSyncEntry; import amerifrance.guideapi.wrapper.PageWrapper; import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.widget.button.Button; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.MathHelper; -import net.minecraft.util.text.StringTextComponent; import net.minecraft.util.text.TranslationTextComponent; import org.lwjgl.glfw.GLFW; import java.awt.Color; -import java.io.IOException; import java.util.ArrayList; import java.util.List; import java.util.Map; diff --git a/src/main/java/amerifrance/guideapi/gui/HomeScreen.java b/src/main/java/amerifrance/guideapi/gui/HomeScreen.java index 50718dfe..2330e6ab 100644 --- a/src/main/java/amerifrance/guideapi/gui/HomeScreen.java +++ b/src/main/java/amerifrance/guideapi/gui/HomeScreen.java @@ -1,7 +1,7 @@ package amerifrance.guideapi.gui; -import api.impl.Book; -import api.impl.abstraction.CategoryAbstract; +import amerifrance.guideapi.api.impl.Book; +import amerifrance.guideapi.api.impl.abstraction.CategoryAbstract; import amerifrance.guideapi.button.ButtonNext; import amerifrance.guideapi.button.ButtonPrev; import amerifrance.guideapi.button.ButtonSearch; @@ -9,8 +9,6 @@ import amerifrance.guideapi.network.PacketSyncHome; import amerifrance.guideapi.wrapper.CategoryWrapper; import com.google.common.collect.HashMultimap; -import net.minecraft.client.gui.widget.Widget; -import net.minecraft.client.gui.widget.button.Button; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; @@ -20,7 +18,6 @@ import org.lwjgl.glfw.GLFW; import java.awt.Color; -import java.io.IOException; public class HomeScreen extends BaseScreen { diff --git a/src/main/java/amerifrance/guideapi/gui/SearchScreen.java b/src/main/java/amerifrance/guideapi/gui/SearchScreen.java index 0b0e9ea2..030b6782 100644 --- a/src/main/java/amerifrance/guideapi/gui/SearchScreen.java +++ b/src/main/java/amerifrance/guideapi/gui/SearchScreen.java @@ -1,17 +1,15 @@ package amerifrance.guideapi.gui; import amerifrance.guideapi.GuideMod; -import api.impl.Book; -import api.impl.abstraction.CategoryAbstract; -import api.impl.abstraction.EntryAbstract; -import api.util.GuiHelper; +import amerifrance.guideapi.api.impl.Book; +import amerifrance.guideapi.api.impl.abstraction.CategoryAbstract; +import amerifrance.guideapi.api.impl.abstraction.EntryAbstract; +import amerifrance.guideapi.api.util.GuiHelper; import amerifrance.guideapi.button.ButtonBack; import amerifrance.guideapi.button.ButtonNext; import amerifrance.guideapi.button.ButtonPrev; import com.google.common.base.Strings; import com.google.common.collect.Lists; -import net.minecraft.client.MouseHelper; -import net.minecraft.client.gui.widget.button.Button; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.widget.TextFieldWidget; import net.minecraft.entity.player.PlayerEntity; @@ -25,7 +23,6 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; import java.awt.Color; -import java.io.IOException; import java.util.List; import java.util.Locale; diff --git a/src/main/java/amerifrance/guideapi/info/InfoRendererDescription.java b/src/main/java/amerifrance/guideapi/info/InfoRendererDescription.java index b3930775..c4052f3d 100644 --- a/src/main/java/amerifrance/guideapi/info/InfoRendererDescription.java +++ b/src/main/java/amerifrance/guideapi/info/InfoRendererDescription.java @@ -1,8 +1,8 @@ package amerifrance.guideapi.info; -import api.IInfoRenderer; -import api.impl.Book; -import api.util.GuiHelper; +import amerifrance.guideapi.api.IInfoRenderer; +import amerifrance.guideapi.api.impl.Book; +import amerifrance.guideapi.api.util.GuiHelper; import com.mojang.blaze3d.platform.GlStateManager; import net.minecraft.block.BlockState; import net.minecraft.client.Minecraft; diff --git a/src/main/java/amerifrance/guideapi/info/InfoRendererImage.java b/src/main/java/amerifrance/guideapi/info/InfoRendererImage.java index b4d9c429..d7942af2 100644 --- a/src/main/java/amerifrance/guideapi/info/InfoRendererImage.java +++ b/src/main/java/amerifrance/guideapi/info/InfoRendererImage.java @@ -1,7 +1,7 @@ package amerifrance.guideapi.info; -import api.IInfoRenderer; -import api.impl.Book; +import amerifrance.guideapi.api.IInfoRenderer; +import amerifrance.guideapi.api.impl.Book; import net.minecraft.block.BlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.AbstractGui; diff --git a/src/main/java/amerifrance/guideapi/item/ItemGuideBook.java b/src/main/java/amerifrance/guideapi/item/ItemGuideBook.java index 0fc48625..46e91abb 100644 --- a/src/main/java/amerifrance/guideapi/item/ItemGuideBook.java +++ b/src/main/java/amerifrance/guideapi/item/ItemGuideBook.java @@ -1,16 +1,14 @@ package amerifrance.guideapi.item; import amerifrance.guideapi.GuideMod; -import api.BookEvent; -import api.GuideAPI; -import api.IGuideItem; -import api.IGuideLinked; -import api.impl.Book; -import api.impl.abstraction.CategoryAbstract; -import api.util.TextHelper; +import amerifrance.guideapi.api.BookEvent; +import amerifrance.guideapi.api.IGuideItem; +import amerifrance.guideapi.api.IGuideLinked; +import amerifrance.guideapi.api.impl.Book; +import amerifrance.guideapi.api.impl.abstraction.CategoryAbstract; +import amerifrance.guideapi.api.util.TextHelper; import com.google.common.base.Strings; import net.minecraft.block.BlockState; -import net.minecraft.client.resources.I18n; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.client.util.ITooltipFlag.TooltipFlags; import net.minecraft.entity.player.PlayerEntity; @@ -18,19 +16,15 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.ItemUseContext; import net.minecraft.util.*; -import net.minecraft.util.math.BlockPos; import net.minecraft.util.registry.Registry; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.StringTextComponent; import net.minecraft.util.text.TranslationTextComponent; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.common.util.LazyOptional; import javax.annotation.Nonnull; -import javax.annotation.Nullable; import java.util.List; -import java.util.Optional; public class ItemGuideBook extends Item implements IGuideItem { diff --git a/src/main/java/amerifrance/guideapi/network/PacketSyncCategory.java b/src/main/java/amerifrance/guideapi/network/PacketSyncCategory.java index 72cddf9f..822d0636 100644 --- a/src/main/java/amerifrance/guideapi/network/PacketSyncCategory.java +++ b/src/main/java/amerifrance/guideapi/network/PacketSyncCategory.java @@ -1,13 +1,11 @@ package amerifrance.guideapi.network; -import api.IGuideItem; -import api.util.NBTBookTags; -import io.netty.buffer.ByteBuf; +import amerifrance.guideapi.api.IGuideItem; +import amerifrance.guideapi.api.util.NBTBookTags; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; import net.minecraft.network.PacketBuffer; -import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.network.NetworkEvent; import org.apache.commons.lang3.Validate; diff --git a/src/main/java/amerifrance/guideapi/network/PacketSyncEntry.java b/src/main/java/amerifrance/guideapi/network/PacketSyncEntry.java index 64b942fb..48ebfb7d 100644 --- a/src/main/java/amerifrance/guideapi/network/PacketSyncEntry.java +++ b/src/main/java/amerifrance/guideapi/network/PacketSyncEntry.java @@ -1,14 +1,12 @@ package amerifrance.guideapi.network; -import api.IGuideItem; -import api.util.NBTBookTags; -import io.netty.buffer.ByteBuf; +import amerifrance.guideapi.api.IGuideItem; +import amerifrance.guideapi.api.util.NBTBookTags; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; import net.minecraft.network.PacketBuffer; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fml.common.network.ByteBufUtils; import net.minecraftforge.fml.network.NetworkEvent; import org.apache.commons.lang3.Validate; diff --git a/src/main/java/amerifrance/guideapi/network/PacketSyncHome.java b/src/main/java/amerifrance/guideapi/network/PacketSyncHome.java index 9635eff6..201343eb 100644 --- a/src/main/java/amerifrance/guideapi/network/PacketSyncHome.java +++ b/src/main/java/amerifrance/guideapi/network/PacketSyncHome.java @@ -1,13 +1,11 @@ package amerifrance.guideapi.network; -import api.IGuideItem; -import api.util.NBTBookTags; -import io.netty.buffer.ByteBuf; +import amerifrance.guideapi.api.IGuideItem; +import amerifrance.guideapi.api.util.NBTBookTags; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; import net.minecraft.network.PacketBuffer; -import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.network.NetworkEvent; import org.apache.commons.lang3.Validate; diff --git a/src/main/java/amerifrance/guideapi/page/PageBrewingRecipe.java b/src/main/java/amerifrance/guideapi/page/PageBrewingRecipe.java index 2fd72a2d..f3705d62 100644 --- a/src/main/java/amerifrance/guideapi/page/PageBrewingRecipe.java +++ b/src/main/java/amerifrance/guideapi/page/PageBrewingRecipe.java @@ -1,12 +1,12 @@ package amerifrance.guideapi.page; -import api.SubTexture; -import api.impl.Book; -import api.impl.Page; -import api.impl.abstraction.CategoryAbstract; -import api.impl.abstraction.EntryAbstract; -import api.util.GuiHelper; -import api.util.TextHelper; +import amerifrance.guideapi.api.SubTexture; +import amerifrance.guideapi.api.impl.Book; +import amerifrance.guideapi.api.impl.Page; +import amerifrance.guideapi.api.impl.abstraction.CategoryAbstract; +import amerifrance.guideapi.api.impl.abstraction.EntryAbstract; +import amerifrance.guideapi.api.util.GuiHelper; +import amerifrance.guideapi.api.util.TextHelper; import amerifrance.guideapi.gui.BaseScreen; import net.minecraft.block.Blocks; import net.minecraft.client.gui.FontRenderer; diff --git a/src/main/java/amerifrance/guideapi/page/PageFurnaceRecipe.java b/src/main/java/amerifrance/guideapi/page/PageFurnaceRecipe.java index e7913f1c..cc6e1d79 100644 --- a/src/main/java/amerifrance/guideapi/page/PageFurnaceRecipe.java +++ b/src/main/java/amerifrance/guideapi/page/PageFurnaceRecipe.java @@ -1,19 +1,17 @@ package amerifrance.guideapi.page; -import api.SubTexture; -import api.impl.Book; -import api.impl.Page; -import api.impl.abstraction.CategoryAbstract; -import api.impl.abstraction.EntryAbstract; -import api.util.GuiHelper; -import api.util.TextHelper; +import amerifrance.guideapi.api.SubTexture; +import amerifrance.guideapi.api.impl.Book; +import amerifrance.guideapi.api.impl.Page; +import amerifrance.guideapi.api.impl.abstraction.CategoryAbstract; +import amerifrance.guideapi.api.impl.abstraction.EntryAbstract; +import amerifrance.guideapi.api.util.GuiHelper; +import amerifrance.guideapi.api.util.TextHelper; import amerifrance.guideapi.gui.BaseScreen; -import net.minecraft.block.Block; import net.minecraft.block.Blocks; import net.minecraft.client.gui.FontRenderer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.FurnaceRecipe; import net.minecraft.util.text.ITextComponent; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; diff --git a/src/main/java/amerifrance/guideapi/page/PageIRecipe.java b/src/main/java/amerifrance/guideapi/page/PageIRecipe.java index f035d6e6..2e4cf162 100644 --- a/src/main/java/amerifrance/guideapi/page/PageIRecipe.java +++ b/src/main/java/amerifrance/guideapi/page/PageIRecipe.java @@ -1,11 +1,11 @@ package amerifrance.guideapi.page; import amerifrance.guideapi.page.reciperenderer.FurnaceRecipeRenderer; -import api.IRecipeRenderer; -import api.impl.Book; -import api.impl.Page; -import api.impl.abstraction.CategoryAbstract; -import api.impl.abstraction.EntryAbstract; +import amerifrance.guideapi.api.IRecipeRenderer; +import amerifrance.guideapi.api.impl.Book; +import amerifrance.guideapi.api.impl.Page; +import amerifrance.guideapi.api.impl.abstraction.CategoryAbstract; +import amerifrance.guideapi.api.impl.abstraction.EntryAbstract; import amerifrance.guideapi.gui.BaseScreen; import amerifrance.guideapi.gui.EntryScreen; import amerifrance.guideapi.page.reciperenderer.ShapedRecipesRenderer; @@ -21,8 +21,6 @@ import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import javax.annotation.Nullable; - public class PageIRecipe extends Page { diff --git a/src/main/java/amerifrance/guideapi/page/PageImage.java b/src/main/java/amerifrance/guideapi/page/PageImage.java index 5e76c7e4..dc3cce5d 100644 --- a/src/main/java/amerifrance/guideapi/page/PageImage.java +++ b/src/main/java/amerifrance/guideapi/page/PageImage.java @@ -1,10 +1,10 @@ package amerifrance.guideapi.page; -import api.impl.Book; -import api.impl.Page; -import api.impl.abstraction.CategoryAbstract; -import api.impl.abstraction.EntryAbstract; -import api.util.GuiHelper; +import amerifrance.guideapi.api.impl.Book; +import amerifrance.guideapi.api.impl.Page; +import amerifrance.guideapi.api.impl.abstraction.CategoryAbstract; +import amerifrance.guideapi.api.impl.abstraction.EntryAbstract; +import amerifrance.guideapi.api.util.GuiHelper; import amerifrance.guideapi.gui.BaseScreen; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; diff --git a/src/main/java/amerifrance/guideapi/page/PageItemStack.java b/src/main/java/amerifrance/guideapi/page/PageItemStack.java index 4218463a..cc6e859f 100644 --- a/src/main/java/amerifrance/guideapi/page/PageItemStack.java +++ b/src/main/java/amerifrance/guideapi/page/PageItemStack.java @@ -1,16 +1,14 @@ package amerifrance.guideapi.page; -import api.impl.Book; -import api.impl.abstraction.CategoryAbstract; -import api.impl.abstraction.EntryAbstract; -import api.util.GuiHelper; +import amerifrance.guideapi.api.impl.Book; +import amerifrance.guideapi.api.impl.abstraction.CategoryAbstract; +import amerifrance.guideapi.api.impl.abstraction.EntryAbstract; +import amerifrance.guideapi.api.util.GuiHelper; import amerifrance.guideapi.gui.BaseScreen; import net.minecraft.block.Block; import net.minecraft.client.gui.FontRenderer; -import net.minecraft.block.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.Ingredient; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; diff --git a/src/main/java/amerifrance/guideapi/page/PageJsonRecipe.java b/src/main/java/amerifrance/guideapi/page/PageJsonRecipe.java index 60b63d7b..17c9b378 100644 --- a/src/main/java/amerifrance/guideapi/page/PageJsonRecipe.java +++ b/src/main/java/amerifrance/guideapi/page/PageJsonRecipe.java @@ -2,20 +2,16 @@ import amerifrance.guideapi.gui.EntryScreen; import amerifrance.guideapi.util.LogHelper; -import api.IRecipeRenderer; -import api.impl.Book; -import api.impl.abstraction.CategoryAbstract; -import api.impl.abstraction.EntryAbstract; +import amerifrance.guideapi.api.IRecipeRenderer; +import amerifrance.guideapi.api.impl.Book; +import amerifrance.guideapi.api.impl.abstraction.CategoryAbstract; +import amerifrance.guideapi.api.impl.abstraction.EntryAbstract; import net.minecraft.client.Minecraft; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.IRecipe; import net.minecraft.util.ResourceLocation; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.fml.server.ServerLifecycleHooks; -import net.minecraftforge.registries.ForgeRegistries; public class PageJsonRecipe extends PageIRecipe { diff --git a/src/main/java/amerifrance/guideapi/page/PageSound.java b/src/main/java/amerifrance/guideapi/page/PageSound.java index c1c34005..783cfac4 100644 --- a/src/main/java/amerifrance/guideapi/page/PageSound.java +++ b/src/main/java/amerifrance/guideapi/page/PageSound.java @@ -1,11 +1,11 @@ package amerifrance.guideapi.page; import amerifrance.guideapi.GuideMod; -import api.IPage; -import api.impl.Book; -import api.impl.Page; -import api.impl.abstraction.CategoryAbstract; -import api.impl.abstraction.EntryAbstract; +import amerifrance.guideapi.api.IPage; +import amerifrance.guideapi.api.impl.Book; +import amerifrance.guideapi.api.impl.Page; +import amerifrance.guideapi.api.impl.abstraction.CategoryAbstract; +import amerifrance.guideapi.api.impl.abstraction.EntryAbstract; import amerifrance.guideapi.gui.BaseScreen; import amerifrance.guideapi.gui.EntryScreen; import net.minecraft.client.gui.FontRenderer; diff --git a/src/main/java/amerifrance/guideapi/page/PageText.java b/src/main/java/amerifrance/guideapi/page/PageText.java index e1dd3ca9..4b369864 100644 --- a/src/main/java/amerifrance/guideapi/page/PageText.java +++ b/src/main/java/amerifrance/guideapi/page/PageText.java @@ -1,10 +1,10 @@ package amerifrance.guideapi.page; -import api.impl.Book; -import api.impl.Page; -import api.impl.abstraction.CategoryAbstract; -import api.impl.abstraction.EntryAbstract; -import api.util.PageHelper; +import amerifrance.guideapi.api.impl.Book; +import amerifrance.guideapi.api.impl.Page; +import amerifrance.guideapi.api.impl.abstraction.CategoryAbstract; +import amerifrance.guideapi.api.impl.abstraction.EntryAbstract; +import amerifrance.guideapi.api.util.PageHelper; import amerifrance.guideapi.gui.BaseScreen; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.resources.I18n; diff --git a/src/main/java/amerifrance/guideapi/page/PageTextImage.java b/src/main/java/amerifrance/guideapi/page/PageTextImage.java index 2c3770b7..7ae3ae33 100644 --- a/src/main/java/amerifrance/guideapi/page/PageTextImage.java +++ b/src/main/java/amerifrance/guideapi/page/PageTextImage.java @@ -1,10 +1,10 @@ package amerifrance.guideapi.page; -import api.impl.Book; -import api.impl.Page; -import api.impl.abstraction.CategoryAbstract; -import api.impl.abstraction.EntryAbstract; -import api.util.GuiHelper; +import amerifrance.guideapi.api.impl.Book; +import amerifrance.guideapi.api.impl.Page; +import amerifrance.guideapi.api.impl.abstraction.CategoryAbstract; +import amerifrance.guideapi.api.impl.abstraction.EntryAbstract; +import amerifrance.guideapi.api.util.GuiHelper; import amerifrance.guideapi.gui.BaseScreen; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; diff --git a/src/main/java/amerifrance/guideapi/page/reciperenderer/BasicRecipeRenderer.java b/src/main/java/amerifrance/guideapi/page/reciperenderer/BasicRecipeRenderer.java index 8ec2a1c1..dd92e017 100644 --- a/src/main/java/amerifrance/guideapi/page/reciperenderer/BasicRecipeRenderer.java +++ b/src/main/java/amerifrance/guideapi/page/reciperenderer/BasicRecipeRenderer.java @@ -1,20 +1,18 @@ package amerifrance.guideapi.page.reciperenderer; -import api.IRecipeRenderer.RecipeRendererBase; -import api.SubTexture; -import api.impl.Book; -import api.impl.abstraction.CategoryAbstract; -import api.impl.abstraction.EntryAbstract; -import api.util.GuiHelper; -import api.util.TextHelper; +import amerifrance.guideapi.api.IRecipeRenderer.RecipeRendererBase; +import amerifrance.guideapi.api.SubTexture; +import amerifrance.guideapi.api.impl.Book; +import amerifrance.guideapi.api.impl.abstraction.CategoryAbstract; +import amerifrance.guideapi.api.impl.abstraction.EntryAbstract; +import amerifrance.guideapi.api.util.GuiHelper; +import amerifrance.guideapi.api.util.TextHelper; import amerifrance.guideapi.gui.BaseScreen; import com.google.common.base.Strings; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; -import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; -import net.minecraft.util.NonNullList; import java.util.Random; diff --git a/src/main/java/amerifrance/guideapi/page/reciperenderer/ShapedRecipesRenderer.java b/src/main/java/amerifrance/guideapi/page/reciperenderer/ShapedRecipesRenderer.java index 850f0ac2..9169d2ba 100644 --- a/src/main/java/amerifrance/guideapi/page/reciperenderer/ShapedRecipesRenderer.java +++ b/src/main/java/amerifrance/guideapi/page/reciperenderer/ShapedRecipesRenderer.java @@ -1,9 +1,9 @@ package amerifrance.guideapi.page.reciperenderer; -import api.impl.Book; -import api.impl.abstraction.CategoryAbstract; -import api.impl.abstraction.EntryAbstract; -import api.util.GuiHelper; +import amerifrance.guideapi.api.impl.Book; +import amerifrance.guideapi.api.impl.abstraction.CategoryAbstract; +import amerifrance.guideapi.api.impl.abstraction.EntryAbstract; +import amerifrance.guideapi.api.util.GuiHelper; import amerifrance.guideapi.gui.BaseScreen; import net.minecraft.client.gui.FontRenderer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/amerifrance/guideapi/page/reciperenderer/ShapelessRecipesRenderer.java b/src/main/java/amerifrance/guideapi/page/reciperenderer/ShapelessRecipesRenderer.java index 860d80aa..a601555d 100644 --- a/src/main/java/amerifrance/guideapi/page/reciperenderer/ShapelessRecipesRenderer.java +++ b/src/main/java/amerifrance/guideapi/page/reciperenderer/ShapelessRecipesRenderer.java @@ -1,10 +1,10 @@ package amerifrance.guideapi.page.reciperenderer; -import api.impl.Book; -import api.impl.abstraction.CategoryAbstract; -import api.impl.abstraction.EntryAbstract; -import api.util.GuiHelper; -import api.util.TextHelper; +import amerifrance.guideapi.api.impl.Book; +import amerifrance.guideapi.api.impl.abstraction.CategoryAbstract; +import amerifrance.guideapi.api.impl.abstraction.EntryAbstract; +import amerifrance.guideapi.api.util.GuiHelper; +import amerifrance.guideapi.api.util.TextHelper; import amerifrance.guideapi.gui.BaseScreen; import net.minecraft.client.gui.FontRenderer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/amerifrance/guideapi/proxy/ClientProxy.java b/src/main/java/amerifrance/guideapi/proxy/ClientProxy.java index e50bb43a..0d42353e 100644 --- a/src/main/java/amerifrance/guideapi/proxy/ClientProxy.java +++ b/src/main/java/amerifrance/guideapi/proxy/ClientProxy.java @@ -2,28 +2,24 @@ import amerifrance.guideapi.gui.CategoryScreen; import amerifrance.guideapi.gui.HomeScreen; -import api.BookEvent; -import api.GuideAPI; -import api.IGuideItem; -import api.IRecipeRenderer; -import api.impl.Book; -import api.impl.abstraction.CategoryAbstract; -import api.impl.abstraction.EntryAbstract; +import amerifrance.guideapi.api.BookEvent; +import amerifrance.guideapi.api.GuideAPI; +import amerifrance.guideapi.api.IGuideItem; +import amerifrance.guideapi.api.impl.Book; +import amerifrance.guideapi.api.impl.abstraction.CategoryAbstract; +import amerifrance.guideapi.api.impl.abstraction.EntryAbstract; import amerifrance.guideapi.gui.EntryScreen; -import api.util.NBTBookTags; +import amerifrance.guideapi.api.util.NBTBookTags; import net.minecraft.client.Minecraft; import net.minecraft.client.audio.SimpleSound; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.IRecipeType; import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.ResourceLocation; import net.minecraft.util.SoundEvent; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; -import java.util.Map; - public class ClientProxy extends CommonProxy { @Override diff --git a/src/main/java/amerifrance/guideapi/proxy/CommonProxy.java b/src/main/java/amerifrance/guideapi/proxy/CommonProxy.java index c2a7e73e..575b329d 100644 --- a/src/main/java/amerifrance/guideapi/proxy/CommonProxy.java +++ b/src/main/java/amerifrance/guideapi/proxy/CommonProxy.java @@ -1,24 +1,12 @@ package amerifrance.guideapi.proxy; -import api.GuideAPI; -import api.IGuideItem; -import api.IRecipeRenderer; -import api.impl.Book; -import api.impl.abstraction.CategoryAbstract; -import api.impl.abstraction.EntryAbstract; -import api.util.NBTBookTags; -import amerifrance.guideapi.gui.CategoryScreen; -import amerifrance.guideapi.gui.EntryScreen; -import amerifrance.guideapi.gui.HomeScreen; +import amerifrance.guideapi.api.impl.Book; +import amerifrance.guideapi.api.impl.abstraction.CategoryAbstract; +import amerifrance.guideapi.api.impl.abstraction.EntryAbstract; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.IRecipeType; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.util.Hand; -import net.minecraft.util.ResourceLocation; import net.minecraft.util.SoundEvent; import net.minecraft.world.World; -import net.minecraftforge.fml.common.network.IGuiHandler; public class CommonProxy { diff --git a/src/main/java/test/TestBook.java b/src/main/java/amerifrance/guideapi/test/TestBook.java similarity index 87% rename from src/main/java/test/TestBook.java rename to src/main/java/amerifrance/guideapi/test/TestBook.java index c93b8f05..01528413 100644 --- a/src/main/java/test/TestBook.java +++ b/src/main/java/amerifrance/guideapi/test/TestBook.java @@ -1,13 +1,13 @@ -package test; +package amerifrance.guideapi.test; -import api.GuideBook; -import api.IGuideBook; -import api.IPage; -import api.impl.Book; -import api.impl.BookBinder; -import api.impl.Entry; -import api.impl.abstraction.CategoryAbstract; -import api.impl.abstraction.EntryAbstract; +import amerifrance.guideapi.api.GuideBook; +import amerifrance.guideapi.api.IGuideBook; +import amerifrance.guideapi.api.IPage; +import amerifrance.guideapi.api.impl.Book; +import amerifrance.guideapi.api.impl.BookBinder; +import amerifrance.guideapi.api.impl.Entry; +import amerifrance.guideapi.api.impl.abstraction.CategoryAbstract; +import amerifrance.guideapi.api.impl.abstraction.EntryAbstract; import amerifrance.guideapi.category.CategoryItemStack; import amerifrance.guideapi.entry.EntryItemStack; import amerifrance.guideapi.page.PageIRecipe; @@ -28,7 +28,6 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; import java.awt.Color; -import java.util.ArrayList; import java.util.List; import java.util.Map; diff --git a/src/main/java/test/TestBook2.java b/src/main/java/amerifrance/guideapi/test/TestBook2.java similarity index 90% rename from src/main/java/test/TestBook2.java rename to src/main/java/amerifrance/guideapi/test/TestBook2.java index 270eea2d..7ebda1f8 100644 --- a/src/main/java/test/TestBook2.java +++ b/src/main/java/amerifrance/guideapi/test/TestBook2.java @@ -1,10 +1,10 @@ -package test; +package amerifrance.guideapi.test; -import api.GuideBook; -import api.IGuideBook; -import api.impl.Book; -import api.impl.BookBinder; -import api.impl.abstraction.CategoryAbstract; +import amerifrance.guideapi.api.GuideBook; +import amerifrance.guideapi.api.IGuideBook; +import amerifrance.guideapi.api.impl.Book; +import amerifrance.guideapi.api.impl.BookBinder; +import amerifrance.guideapi.api.impl.abstraction.CategoryAbstract; import amerifrance.guideapi.category.CategoryItemStack; import amerifrance.guideapi.entry.EntryItemStack; import amerifrance.guideapi.page.*; diff --git a/src/main/java/amerifrance/guideapi/util/APISetter.java b/src/main/java/amerifrance/guideapi/util/APISetter.java index 8f2cad62..39308ca7 100644 --- a/src/main/java/amerifrance/guideapi/util/APISetter.java +++ b/src/main/java/amerifrance/guideapi/util/APISetter.java @@ -1,8 +1,8 @@ package amerifrance.guideapi.util; import amerifrance.guideapi.GuideMod; -import api.GuideAPI; -import api.impl.Book; +import amerifrance.guideapi.api.GuideAPI; +import amerifrance.guideapi.api.impl.Book; import com.google.common.base.Throwables; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/amerifrance/guideapi/util/AnnotationHandler.java b/src/main/java/amerifrance/guideapi/util/AnnotationHandler.java index 8be4e925..f8abba35 100644 --- a/src/main/java/amerifrance/guideapi/util/AnnotationHandler.java +++ b/src/main/java/amerifrance/guideapi/util/AnnotationHandler.java @@ -1,9 +1,9 @@ package amerifrance.guideapi.util; -import api.GuideAPI; -import api.GuideBook; -import api.IGuideBook; -import api.impl.Book; +import amerifrance.guideapi.api.GuideAPI; +import amerifrance.guideapi.api.GuideBook; +import amerifrance.guideapi.api.IGuideBook; +import amerifrance.guideapi.api.impl.Book; import com.google.common.collect.Lists; import net.minecraftforge.eventbus.api.EventPriority; import net.minecraftforge.fml.ModList; diff --git a/src/main/java/amerifrance/guideapi/util/EventHandler.java b/src/main/java/amerifrance/guideapi/util/EventHandler.java index 702f1ebf..1384bb2b 100644 --- a/src/main/java/amerifrance/guideapi/util/EventHandler.java +++ b/src/main/java/amerifrance/guideapi/util/EventHandler.java @@ -2,13 +2,13 @@ import amerifrance.guideapi.GuideConfig; import amerifrance.guideapi.GuideMod; -import api.GuideAPI; -import api.IGuideItem; -import api.IGuideLinked; -import api.IInfoRenderer; -import api.impl.Book; -import api.impl.abstraction.CategoryAbstract; -import api.util.TextHelper; +import amerifrance.guideapi.api.GuideAPI; +import amerifrance.guideapi.api.IGuideItem; +import amerifrance.guideapi.api.IGuideLinked; +import amerifrance.guideapi.api.IInfoRenderer; +import amerifrance.guideapi.api.impl.Book; +import amerifrance.guideapi.api.impl.abstraction.CategoryAbstract; +import amerifrance.guideapi.api.util.TextHelper; import com.google.common.base.Strings; import com.google.common.collect.Multimap; import net.minecraft.block.Block; diff --git a/src/main/java/amerifrance/guideapi/wrapper/CategoryWrapper.java b/src/main/java/amerifrance/guideapi/wrapper/CategoryWrapper.java index 46878550..ea2d6c69 100644 --- a/src/main/java/amerifrance/guideapi/wrapper/CategoryWrapper.java +++ b/src/main/java/amerifrance/guideapi/wrapper/CategoryWrapper.java @@ -1,8 +1,8 @@ package amerifrance.guideapi.wrapper; -import api.impl.Book; -import api.impl.abstraction.CategoryAbstract; -import api.util.GuiHelper; +import amerifrance.guideapi.api.impl.Book; +import amerifrance.guideapi.api.impl.abstraction.CategoryAbstract; +import amerifrance.guideapi.api.util.GuiHelper; import amerifrance.guideapi.gui.BaseScreen; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.renderer.ItemRenderer; diff --git a/src/main/java/amerifrance/guideapi/wrapper/EntryWrapper.java b/src/main/java/amerifrance/guideapi/wrapper/EntryWrapper.java index da06f728..72564031 100644 --- a/src/main/java/amerifrance/guideapi/wrapper/EntryWrapper.java +++ b/src/main/java/amerifrance/guideapi/wrapper/EntryWrapper.java @@ -1,9 +1,9 @@ package amerifrance.guideapi.wrapper; -import api.impl.Book; -import api.impl.abstraction.CategoryAbstract; -import api.impl.abstraction.EntryAbstract; -import api.util.GuiHelper; +import amerifrance.guideapi.api.impl.Book; +import amerifrance.guideapi.api.impl.abstraction.CategoryAbstract; +import amerifrance.guideapi.api.impl.abstraction.EntryAbstract; +import amerifrance.guideapi.api.util.GuiHelper; import amerifrance.guideapi.gui.BaseScreen; import amerifrance.guideapi.gui.CategoryScreen; import net.minecraft.client.Minecraft; diff --git a/src/main/java/amerifrance/guideapi/wrapper/PageWrapper.java b/src/main/java/amerifrance/guideapi/wrapper/PageWrapper.java index 63705593..24691fff 100644 --- a/src/main/java/amerifrance/guideapi/wrapper/PageWrapper.java +++ b/src/main/java/amerifrance/guideapi/wrapper/PageWrapper.java @@ -1,9 +1,9 @@ package amerifrance.guideapi.wrapper; -import api.IPage; -import api.impl.Book; -import api.impl.abstraction.CategoryAbstract; -import api.impl.abstraction.EntryAbstract; +import amerifrance.guideapi.api.IPage; +import amerifrance.guideapi.api.impl.Book; +import amerifrance.guideapi.api.impl.abstraction.CategoryAbstract; +import amerifrance.guideapi.api.impl.abstraction.EntryAbstract; import amerifrance.guideapi.gui.BaseScreen; import amerifrance.guideapi.gui.EntryScreen; import net.minecraft.client.Minecraft; diff --git a/src/main/java/api/package-info.java b/src/main/java/api/package-info.java deleted file mode 100644 index e165a207..00000000 --- a/src/main/java/api/package-info.java +++ /dev/null @@ -1,2 +0,0 @@ -package api; - From 55cd3c540db89bdcd877a2f56113aabcf02ac27b Mon Sep 17 00:00:00 2001 From: maxanier Date: Sat, 28 Mar 2020 19:00:41 +0100 Subject: [PATCH 10/28] Finish recipe rework --- .../guideapi/api/IRecipeRenderer.java | 42 +++++- .../guideapi/page/PageBrewingRecipe.java | 41 +++++- .../guideapi/page/PageFurnaceRecipe.java | 122 ------------------ .../guideapi/page/PageIRecipe.java | 2 +- .../guideapi/page/PageJsonRecipe.java | 20 ++- ...derer.java => CraftingRecipeRenderer.java} | 26 ++-- .../reciperenderer/FurnaceRecipeRenderer.java | 47 ++++++- .../reciperenderer/ShapedRecipesRenderer.java | 13 +- .../ShapelessRecipesRenderer.java | 8 +- .../amerifrance/guideapi/test/TestBook.java | 9 +- 10 files changed, 163 insertions(+), 167 deletions(-) delete mode 100644 src/main/java/amerifrance/guideapi/page/PageFurnaceRecipe.java rename src/main/java/amerifrance/guideapi/page/reciperenderer/{BasicRecipeRenderer.java => CraftingRecipeRenderer.java} (75%) diff --git a/src/main/java/amerifrance/guideapi/api/IRecipeRenderer.java b/src/main/java/amerifrance/guideapi/api/IRecipeRenderer.java index 68462989..3dc7e448 100644 --- a/src/main/java/amerifrance/guideapi/api/IRecipeRenderer.java +++ b/src/main/java/amerifrance/guideapi/api/IRecipeRenderer.java @@ -5,13 +5,18 @@ import amerifrance.guideapi.api.impl.abstraction.CategoryAbstract; import amerifrance.guideapi.api.impl.abstraction.EntryAbstract; import com.google.common.collect.Lists; +import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; +import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; +import net.minecraft.item.crafting.Ingredient; import net.minecraft.util.text.ITextComponent; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import java.util.List; +import java.util.Optional; +import java.util.Random; public interface IRecipeRenderer { @@ -21,15 +26,50 @@ public interface IRecipeRenderer { @OnlyIn(Dist.CLIENT) void drawExtras(Book book, CategoryAbstract category, EntryAbstract entry, int guiLeft, int guiTop, int mouseX, int mouseY, BaseScreen guiBase, FontRenderer fontRendererObj); - abstract class RecipeRendererBase implements IRecipeRenderer { + abstract class RecipeRendererBase> implements IRecipeRenderer { protected T recipe; protected List tooltips = Lists.newArrayList(); + private long lastCycle = -1; + private int cycleIdx = 0; + private Random rand = new Random(); + public RecipeRendererBase(T recipe) { this.recipe = recipe; } + @Override + public void draw(Book book, CategoryAbstract category, EntryAbstract entry, int guiLeft, int guiTop, int mouseX, int mouseY, BaseScreen guiBase, FontRenderer fontRendererObj) { + Minecraft mc = guiBase.getMinecraft(); + long time = mc.world.getGameTime(); + if (lastCycle < 0 || lastCycle < time - 20) { + if (lastCycle > 0) { + cycleIdx++; + cycleIdx = Math.max(0, cycleIdx); + } + lastCycle = mc.world.getGameTime(); + } + } + + /** + * Retrieves a itemstack that matches the ingredient. + * Cycles though all matching stacks. + * Must call {@link IRecipeRenderer#draw(Book, CategoryAbstract, EntryAbstract, int, int, int, int, BaseScreen, FontRenderer)} if you are overriding it. + * @param ingredient The ingredient + * @param index An "unique" id for this ingredient, so multiple ingredients can be cycled independently + * @return Optional. Can be empty if ingredient is invalid and has no matching stacks + */ + protected Optional getCycledIngredientStack(Ingredient ingredient, int index){ + ItemStack[] itemStacks = ingredient.getMatchingStacks(); + if(itemStacks.length>0){ + rand.setSeed(index); + int id = (index + rand.nextInt(itemStacks.length) + cycleIdx) %itemStacks.length; + return Optional.of(itemStacks[id]); + } + return Optional.empty(); + } + @Override public void drawExtras(Book book, CategoryAbstract category, EntryAbstract entry, int guiLeft, int guiTop, int mouseX, int mouseY, BaseScreen guiBase, FontRenderer fontRendererObj) { guiBase.drawHoveringTextComponents(tooltips, mouseX, mouseY); diff --git a/src/main/java/amerifrance/guideapi/page/PageBrewingRecipe.java b/src/main/java/amerifrance/guideapi/page/PageBrewingRecipe.java index f3705d62..612dce3d 100644 --- a/src/main/java/amerifrance/guideapi/page/PageBrewingRecipe.java +++ b/src/main/java/amerifrance/guideapi/page/PageBrewingRecipe.java @@ -1,5 +1,6 @@ package amerifrance.guideapi.page; +import amerifrance.guideapi.api.IRecipeRenderer; import amerifrance.guideapi.api.SubTexture; import amerifrance.guideapi.api.impl.Book; import amerifrance.guideapi.api.impl.Page; @@ -9,6 +10,7 @@ import amerifrance.guideapi.api.util.TextHelper; import amerifrance.guideapi.gui.BaseScreen; import net.minecraft.block.Blocks; +import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -21,6 +23,8 @@ import java.util.ArrayList; import java.util.List; +import java.util.Optional; +import java.util.Random; public class PageBrewingRecipe extends Page { @@ -29,6 +33,11 @@ public class PageBrewingRecipe extends Page { public Ingredient input; public ItemStack output; + //Used for ingredient cycling + private long lastCycle = -1; + private int cycleIdx = 0; + private Random rand = new Random(); + /** * Your brewing recipe - what you pass to BrewingRecipeRegistry.addRecipe * @@ -55,6 +64,15 @@ public PageBrewingRecipe(Ingredient input, Ingredient ingredient, ItemStack outp @Override @OnlyIn(Dist.CLIENT) public void draw(Book book, CategoryAbstract category, EntryAbstract entry, int guiLeft, int guiTop, int mouseX, int mouseY, BaseScreen guiBase, FontRenderer fontRendererObj) { + Minecraft mc = guiBase.getMinecraft(); + long time = mc.world.getGameTime(); + if (lastCycle < 0 || lastCycle < time - 20) { + if (lastCycle > 0) { + cycleIdx++; + cycleIdx = Math.max(0, cycleIdx); + } + lastCycle = mc.world.getGameTime(); + } int xStart = guiLeft + 62; int yStart = guiTop + 52; @@ -70,7 +88,11 @@ public void draw(Book book, CategoryAbstract category, EntryAbstract entry, int int x = xStart + 25;//since item stack is approx 16 wide int y = yStart + 1; //start input - GuiHelper.drawItemStack(ingredient.getMatchingStacks()[0], x, y); //TODO do proper and safe ingredient cycling + int finalX = x; + int finalY = y; + getCycledIngredientStack(ingredient,0).ifPresent(stack -> { + GuiHelper.drawItemStack(stack, finalX, finalY); + }); List tooltip = null; if (GuiHelper.isMouseBetween(mouseX, mouseY, x, y, 15, 15)) @@ -109,4 +131,21 @@ public void draw(Book book, CategoryAbstract category, EntryAbstract entry, int guiBase.drawHoveringTextComponents(tooltip, mouseX, mouseY); } + + /** + * Copied from {@link IRecipeRenderer} because brewing does not use real recipes + * @param ingredient + * @param index + * @return + */ + private Optional getCycledIngredientStack(Ingredient ingredient, int index){ + ItemStack[] itemStacks = ingredient.getMatchingStacks(); + if(itemStacks.length>0){ + rand.setSeed(index); + int id = (index + rand.nextInt(itemStacks.length) + cycleIdx) %itemStacks.length; + return Optional.of(itemStacks[id]); + } + return Optional.empty(); + } + } diff --git a/src/main/java/amerifrance/guideapi/page/PageFurnaceRecipe.java b/src/main/java/amerifrance/guideapi/page/PageFurnaceRecipe.java deleted file mode 100644 index cc6e1d79..00000000 --- a/src/main/java/amerifrance/guideapi/page/PageFurnaceRecipe.java +++ /dev/null @@ -1,122 +0,0 @@ -package amerifrance.guideapi.page; - -import amerifrance.guideapi.api.SubTexture; -import amerifrance.guideapi.api.impl.Book; -import amerifrance.guideapi.api.impl.Page; -import amerifrance.guideapi.api.impl.abstraction.CategoryAbstract; -import amerifrance.guideapi.api.impl.abstraction.EntryAbstract; -import amerifrance.guideapi.api.util.GuiHelper; -import amerifrance.guideapi.api.util.TextHelper; -import amerifrance.guideapi.gui.BaseScreen; -import net.minecraft.block.Blocks; -import net.minecraft.client.gui.FontRenderer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.text.ITextComponent; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; - - -import java.util.ArrayList; -import java.util.List; - -public class PageFurnaceRecipe extends Page { - - public ItemStack input; - public ItemStack output; -// -// /** -// * @param input - Input ItemStack to draw smelting result of -// */ -// public PageFurnaceRecipe(ItemStack input) { -// this.input = input; -// this.output = FurnaceRecipe.instance().getSmeltingResult(input); -// } -// -// /** -// * @param input - Input Item to draw smelting result of -// */ -// public PageFurnaceRecipe(Item input) { -// this.input = new ItemStack(input); -// this.output = FurnaceRecipes.instance().getSmeltingResult(new ItemStack(input)); -// } -// -// /** -// * @param input - Input Block to draw smelting result of -// */ -// public PageFurnaceRecipe(Block input) { -// this.input = new ItemStack(input); -// this.output = FurnaceRecipes.instance().getSmeltingResult(new ItemStack(input)); -// } -// -// /** -// * @param input - Input OreDict entry to draw smelting result of -// */ -// public PageFurnaceRecipe(String input) { -// -// this.input = new ItemStack(Blocks.FIRE); -// -// if (!OreDictionary.getOres(input).isEmpty()) -// for (int i = 0; i < OreDictionary.getOres(input).size(); i++) { -// ItemStack stack = OreDictionary.getOres(input).get(i); -// -// this.input = stack; -// this.output = FurnaceRecipes.instance().getSmeltingResult(stack); -// } -// } - - - - @Override - @OnlyIn(Dist.CLIENT) - @SuppressWarnings("unchecked") - public void draw(Book book, CategoryAbstract category, EntryAbstract entry, int guiLeft, int guiTop, int mouseX, int mouseY, BaseScreen guiBase, FontRenderer fontRendererObj) { - SubTexture.FURNACE_GRID.draw(guiLeft + 64, guiTop + 71); - - List badTip = new ArrayList(); - badTip.add(TextHelper.localizeEffect("text.furnace.error")); - - guiBase.drawCenteredString(fontRendererObj, TextHelper.localizeEffect("text.furnace.smelting"), guiLeft + guiBase.xSize / 2, guiTop + 12, 0); - - int x = guiLeft + 66; - int y = guiTop + 77; - GuiHelper.drawItemStack(input, x, y); - - List tooltip = null; - if (GuiHelper.isMouseBetween(mouseX, mouseY, x, y, 15, 15)) - tooltip = GuiHelper.getTooltip(input); - - if (output.isEmpty()) - output = new ItemStack(Blocks.BARRIER); - - x = guiLeft + 109; - GuiHelper.drawItemStack(output, x, y); - if (GuiHelper.isMouseBetween(mouseX, mouseY, x, y, 15, 15)) - tooltip = output.getItem() == Item.getItemFromBlock(Blocks.BARRIER) ? badTip : GuiHelper.getTooltip(output); - - if (output.getItem() == Item.getItemFromBlock(Blocks.BARRIER)) - guiBase.drawCenteredString(fontRendererObj, TextHelper.localizeEffect("text.furnace.error"), guiLeft + guiBase.xSize / 2, guiTop + 4 * guiBase.ySize / 6, 0xED073D); - - if (tooltip != null) - guiBase.drawHoveringTextComponents(tooltip, mouseX, mouseY); - } - - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (!(o instanceof PageFurnaceRecipe)) return false; - if (!super.equals(o)) return false; - - PageFurnaceRecipe that = (PageFurnaceRecipe) o; - - if (input != null ? !input.equals(that.input) : that.input != null) return false; - return output != null ? output.equals(that.output) : that.output == null; - } - - @Override - public int hashCode() { - int result = input != null ? input.hashCode() : 0; - result = 31 * result + (output != null ? output.hashCode() : 0); - return result; - } -} diff --git a/src/main/java/amerifrance/guideapi/page/PageIRecipe.java b/src/main/java/amerifrance/guideapi/page/PageIRecipe.java index 2e4cf162..7dbf78c4 100644 --- a/src/main/java/amerifrance/guideapi/page/PageIRecipe.java +++ b/src/main/java/amerifrance/guideapi/page/PageIRecipe.java @@ -77,7 +77,7 @@ public boolean canSee(Book book, CategoryAbstract category, EntryAbstract entry, } - static IRecipeRenderer getRenderer(IRecipe recipe) { + protected static IRecipeRenderer getRenderer(IRecipe recipe) { if (recipe == null) { LogHelper.error("Cannot get renderer for null recipe."); return null; diff --git a/src/main/java/amerifrance/guideapi/page/PageJsonRecipe.java b/src/main/java/amerifrance/guideapi/page/PageJsonRecipe.java index 17c9b378..0851294d 100644 --- a/src/main/java/amerifrance/guideapi/page/PageJsonRecipe.java +++ b/src/main/java/amerifrance/guideapi/page/PageJsonRecipe.java @@ -9,22 +9,30 @@ import net.minecraft.client.Minecraft; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.IRecipe; import net.minecraft.util.ResourceLocation; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; +import javax.annotation.Nonnull; +import java.util.function.Function; +import java.util.function.Supplier; + public class PageJsonRecipe extends PageIRecipe { + @Nonnull private final ResourceLocation recipeId; + @Nonnull + private final Function,IRecipeRenderer> recipeRendererSupplier; public PageJsonRecipe(ResourceLocation recipeId) { - super(null, null); - this.recipeId = recipeId; + this(recipeId,PageIRecipe::getRenderer); } - public PageJsonRecipe(ResourceLocation recipeId, IRecipeRenderer render){ - super(null,render); + public PageJsonRecipe(ResourceLocation recipeId, Function,IRecipeRenderer> rendererSupplier){ + super(null,null); this.recipeId = recipeId; + this.recipeRendererSupplier=rendererSupplier; } @OnlyIn(Dist.CLIENT) @@ -37,8 +45,8 @@ public void onInit(Book book, CategoryAbstract category, EntryAbstract entry, Pl LogHelper.error("Cannot find recipe "+recipeId.toString()); } else{ - if(iRecipeRenderer!=null){ - iRecipeRenderer = getRenderer(recipe); + if(iRecipeRenderer==null){ + iRecipeRenderer = recipeRendererSupplier.apply(recipe); } } } diff --git a/src/main/java/amerifrance/guideapi/page/reciperenderer/BasicRecipeRenderer.java b/src/main/java/amerifrance/guideapi/page/reciperenderer/CraftingRecipeRenderer.java similarity index 75% rename from src/main/java/amerifrance/guideapi/page/reciperenderer/BasicRecipeRenderer.java rename to src/main/java/amerifrance/guideapi/page/reciperenderer/CraftingRecipeRenderer.java index dd92e017..faa2753c 100644 --- a/src/main/java/amerifrance/guideapi/page/reciperenderer/BasicRecipeRenderer.java +++ b/src/main/java/amerifrance/guideapi/page/reciperenderer/CraftingRecipeRenderer.java @@ -13,32 +13,24 @@ import net.minecraft.client.gui.FontRenderer; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; +import net.minecraft.item.crafting.Ingredient; +import java.util.Optional; import java.util.Random; -public class BasicRecipeRenderer> extends RecipeRendererBase { +public abstract class CraftingRecipeRenderer> extends RecipeRendererBase { + - private long lastCycle = -1; - private int cycleIdx = 0; - private Random rand = new Random(); private String customDisplay; - public BasicRecipeRenderer(T recipe) { + public CraftingRecipeRenderer(T recipe) { super(recipe); } @Override public void draw(Book book, CategoryAbstract category, EntryAbstract entry, int guiLeft, int guiTop, int mouseX, int mouseY, BaseScreen guiBase, FontRenderer fontRendererObj) { - Minecraft mc = Minecraft.getInstance(); + super.draw(book, category, entry, guiLeft, guiTop, mouseX, mouseY, guiBase, fontRendererObj); - long time = mc.world.getGameTime(); - if (lastCycle < 0 || lastCycle < time - 20) { - if (lastCycle > 0) { - cycleIdx++; - cycleIdx = Math.max(0, cycleIdx); - } - lastCycle = mc.world.getGameTime(); - } SubTexture.CRAFTING_GRID.draw(guiLeft + 42, guiTop + 53); @@ -61,10 +53,6 @@ public void draw(Book book, CategoryAbstract category, EntryAbstract entry, int // return subItems.get(getRandomizedCycle(position, subItems.size())); // } - protected int getRandomizedCycle(int index, int max) { - rand.setSeed(index); - return (index + rand.nextInt(max) + cycleIdx) % max; - } protected String getRecipeName() { return TextHelper.localizeEffect("text.shaped.crafting"); @@ -73,4 +61,6 @@ protected String getRecipeName() { public void setCustomTitle(String customDisplay) { this.customDisplay = customDisplay; } + + } diff --git a/src/main/java/amerifrance/guideapi/page/reciperenderer/FurnaceRecipeRenderer.java b/src/main/java/amerifrance/guideapi/page/reciperenderer/FurnaceRecipeRenderer.java index 5ee3618e..63cc9aa9 100644 --- a/src/main/java/amerifrance/guideapi/page/reciperenderer/FurnaceRecipeRenderer.java +++ b/src/main/java/amerifrance/guideapi/page/reciperenderer/FurnaceRecipeRenderer.java @@ -1,10 +1,55 @@ package amerifrance.guideapi.page.reciperenderer; +import amerifrance.guideapi.api.IRecipeRenderer; +import amerifrance.guideapi.api.SubTexture; +import amerifrance.guideapi.api.impl.Book; +import amerifrance.guideapi.api.impl.abstraction.CategoryAbstract; +import amerifrance.guideapi.api.impl.abstraction.EntryAbstract; +import amerifrance.guideapi.api.util.GuiHelper; +import amerifrance.guideapi.api.util.TextHelper; +import amerifrance.guideapi.gui.BaseScreen; +import net.minecraft.client.gui.FontRenderer; +import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.FurnaceRecipe; +import net.minecraft.item.crafting.Ingredient; +import net.minecraft.util.text.ITextComponent; +import java.util.ArrayList; +import java.util.List; -public class FurnaceRecipeRenderer extends BasicRecipeRenderer { + +public class FurnaceRecipeRenderer extends IRecipeRenderer.RecipeRendererBase { public FurnaceRecipeRenderer(FurnaceRecipe recipe) { super(recipe); } + + @Override + public void draw(Book book, CategoryAbstract category, EntryAbstract entry, int guiLeft, int guiTop, int mouseX, int mouseY, BaseScreen guiBase, FontRenderer fontRendererObj) { + super.draw(book, category, entry, guiLeft, guiTop, mouseX, mouseY, guiBase, fontRendererObj); + SubTexture.FURNACE_GRID.draw(guiLeft + 64, guiTop + 71); + + guiBase.drawCenteredString(fontRendererObj, TextHelper.localizeEffect("text.furnace.smelting"), guiLeft + guiBase.xSize / 2, guiTop + 12, 0); + + int x = guiLeft + 66; + int y = guiTop + 77; + + Ingredient input = recipe.getIngredients().get(0); + getCycledIngredientStack(input,0).ifPresent(stack -> { + GuiHelper.drawItemStack(stack, x, y); + + List tooltip = null; + if (GuiHelper.isMouseBetween(mouseX, mouseY, x, y, 15, 15)) + tooltips = GuiHelper.getTooltip(stack); + }); + + + + ItemStack output = recipe.getRecipeOutput(); + + int x2 = guiLeft + 109; + GuiHelper.drawItemStack(output, x2, y); + if (GuiHelper.isMouseBetween(mouseX, mouseY, x2, y, 15, 15)) + tooltips = GuiHelper.getTooltip(output); + + } } diff --git a/src/main/java/amerifrance/guideapi/page/reciperenderer/ShapedRecipesRenderer.java b/src/main/java/amerifrance/guideapi/page/reciperenderer/ShapedRecipesRenderer.java index 9169d2ba..c7e99d3d 100644 --- a/src/main/java/amerifrance/guideapi/page/reciperenderer/ShapedRecipesRenderer.java +++ b/src/main/java/amerifrance/guideapi/page/reciperenderer/ShapedRecipesRenderer.java @@ -13,7 +13,7 @@ import java.util.Arrays; import java.util.List; -public class ShapedRecipesRenderer extends BasicRecipeRenderer { +public class ShapedRecipesRenderer extends CraftingRecipeRenderer { public ShapedRecipesRenderer(ShapedRecipe recipe) { super(recipe); @@ -23,18 +23,17 @@ public ShapedRecipesRenderer(ShapedRecipe recipe) { public void draw(Book book, CategoryAbstract category, EntryAbstract entry, int guiLeft, int guiTop, int mouseX, int mouseY, BaseScreen guiBase, FontRenderer fontRendererObj) { super.draw(book, category, entry, guiLeft, guiTop, mouseX, mouseY, guiBase, fontRendererObj); for (int y = 0; y < recipe.getRecipeHeight(); y++) { - for (int x = 0; x < recipe.getRecipeHeight(); x++) { + for (int x = 0; x < recipe.getRecipeWidth(); x++) { + int i = y*recipe.getRecipeWidth()+x; int stackX = (x + 1) * 17 + (guiLeft + 27) + x; int stackY = (y + 1) * 17 + (guiTop + 38) + y; - Ingredient ingredient = recipe.getIngredients().get(y * recipe.getRecipeWidth() + x); - List list = Arrays.asList(ingredient.getMatchingStacks()); - if (!list.isEmpty()) { - ItemStack stack = list.get(getRandomizedCycle(x + (y * 3), list.size())); + Ingredient ingredient = recipe.getIngredients().get(i); + getCycledIngredientStack(ingredient,i).ifPresent(stack -> { GuiHelper.drawItemStack(stack, stackX, stackY); if (GuiHelper.isMouseBetween(mouseX, mouseY, stackX, stackY, 15, 15)) tooltips = GuiHelper.getTooltip(stack); - } + }); } } } diff --git a/src/main/java/amerifrance/guideapi/page/reciperenderer/ShapelessRecipesRenderer.java b/src/main/java/amerifrance/guideapi/page/reciperenderer/ShapelessRecipesRenderer.java index a601555d..ada2e547 100644 --- a/src/main/java/amerifrance/guideapi/page/reciperenderer/ShapelessRecipesRenderer.java +++ b/src/main/java/amerifrance/guideapi/page/reciperenderer/ShapelessRecipesRenderer.java @@ -14,7 +14,7 @@ import java.util.Arrays; import java.util.List; -public class ShapelessRecipesRenderer extends BasicRecipeRenderer { +public class ShapelessRecipesRenderer extends CraftingRecipeRenderer { public ShapelessRecipesRenderer(ShapelessRecipe recipe) { super(recipe); @@ -30,13 +30,11 @@ public void draw(Book book, CategoryAbstract category, EntryAbstract entry, int int stackY = (y + 1) * 17 + (guiTop + 38) + y; if (i < recipe.getIngredients().size()) { Ingredient ingredient = recipe.getIngredients().get(i); - List list = Arrays.asList(ingredient.getMatchingStacks()); - if (!list.isEmpty()) { - ItemStack stack = list.get(getRandomizedCycle(x + (y * 3), list.size())); + getCycledIngredientStack(ingredient,i).ifPresent(stack -> { GuiHelper.drawItemStack(stack, stackX, stackY); if (GuiHelper.isMouseBetween(mouseX, mouseY, stackX, stackY, 15, 15)) tooltips = GuiHelper.getTooltip(stack); - } + }); } } } diff --git a/src/main/java/amerifrance/guideapi/test/TestBook.java b/src/main/java/amerifrance/guideapi/test/TestBook.java index 01528413..5eee7f39 100644 --- a/src/main/java/amerifrance/guideapi/test/TestBook.java +++ b/src/main/java/amerifrance/guideapi/test/TestBook.java @@ -13,6 +13,7 @@ import amerifrance.guideapi.page.PageIRecipe; import amerifrance.guideapi.page.PageJsonRecipe; import amerifrance.guideapi.page.PageText; +import amerifrance.guideapi.page.reciperenderer.ShapedRecipesRenderer; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import net.minecraft.block.Blocks; @@ -55,15 +56,13 @@ private void buildContent(List categories){ List pages = Lists.newArrayList(); pages.add(new PageText("Hello, this is\nsome text")); - //pages.add(new PageFurnaceRecipe(Blocks.COBBLESTONE)); + pages.add(new PageJsonRecipe(new ResourceLocation("minecraft","stone"))); + pages.add(new PageJsonRecipe(new ResourceLocation("minecraft","stick"),recipe -> recipe instanceof ShapedRecipe ? new ShapedRecipesRenderer((ShapedRecipe) recipe) : null)); //Probably want to use your own method as render supplier and print proper logs + pages.add(new PageIRecipe(new ShapedRecipe(new ResourceLocation("guideapi","test11"), "test",1,1,NonNullList.from(Ingredient.EMPTY,Ingredient.fromStacks(new ItemStack(Items.PUMPKIN))),new ItemStack(Blocks.OAK_LOG)))); - //pages.add(PageIRecipe.newShaped(new ItemStack(Items.ACACIA_BOAT), "X X", "XXX", 'X', "plankWood")); pages.add(new PageJsonRecipe(new ResourceLocation("minecraft", "acacia_fence"))); Entry entry = new EntryItemStack(pages, "test.entry.name", new ItemStack(Items.POTATO)); entries.put(new ResourceLocation("guideapi", "entry"), entry); - - //pages.add(PageIRecipe.newShapeless(new ItemStack(Blocks.IRON_BLOCK), "ingotIron", "ingotIron", "ingotIron", "ingotIron", "ingotIron", "ingotIron", "ingotIron", "ingotIron", "ingotIron")); - //pages.add(PageIRecipe.newShapeless(new ItemStack(Blocks.OAK_PLANKS, 4), new ItemStack(Blocks.OAK_LOG))); categories.add(new CategoryItemStack(entries, "test.category.name", new ItemStack(Items.BLUE_BANNER))); } } From 42c1d7f8ad6e1a225d6f7936bf6e5f64b6a9123d Mon Sep 17 00:00:00 2001 From: maxanier Date: Sat, 28 Mar 2020 19:16:11 +0100 Subject: [PATCH 11/28] Extract ingredient cycling function for general purposes --- .../guideapi/api/IRecipeRenderer.java | 36 +----------- .../guideapi/api/util/IngredientCycler.java | 56 +++++++++++++++++++ .../guideapi/page/PageBrewingRecipe.java | 34 ++--------- .../guideapi/page/PageIRecipe.java | 6 +- .../guideapi/page/PageItemStack.java | 26 ++++++--- .../CraftingRecipeRenderer.java | 5 +- .../reciperenderer/FurnaceRecipeRenderer.java | 6 +- .../reciperenderer/ShapedRecipesRenderer.java | 7 ++- .../ShapelessRecipesRenderer.java | 7 ++- .../amerifrance/guideapi/test/TestBook.java | 7 +++ 10 files changed, 104 insertions(+), 86 deletions(-) create mode 100644 src/main/java/amerifrance/guideapi/api/util/IngredientCycler.java diff --git a/src/main/java/amerifrance/guideapi/api/IRecipeRenderer.java b/src/main/java/amerifrance/guideapi/api/IRecipeRenderer.java index 3dc7e448..05f16de5 100644 --- a/src/main/java/amerifrance/guideapi/api/IRecipeRenderer.java +++ b/src/main/java/amerifrance/guideapi/api/IRecipeRenderer.java @@ -1,5 +1,6 @@ package amerifrance.guideapi.api; +import amerifrance.guideapi.api.util.IngredientCycler; import amerifrance.guideapi.gui.BaseScreen; import amerifrance.guideapi.api.impl.Book; import amerifrance.guideapi.api.impl.abstraction.CategoryAbstract; @@ -21,7 +22,7 @@ public interface IRecipeRenderer { @OnlyIn(Dist.CLIENT) - void draw(Book book, CategoryAbstract category, EntryAbstract entry, int guiLeft, int guiTop, int mouseX, int mouseY, BaseScreen guiBase, FontRenderer fontRendererObj); + void draw(Book book, CategoryAbstract category, EntryAbstract entry, int guiLeft, int guiTop, int mouseX, int mouseY, BaseScreen guiBase, FontRenderer fontRendererObj, IngredientCycler cycler); @OnlyIn(Dist.CLIENT) void drawExtras(Book book, CategoryAbstract category, EntryAbstract entry, int guiLeft, int guiTop, int mouseX, int mouseY, BaseScreen guiBase, FontRenderer fontRendererObj); @@ -31,44 +32,11 @@ abstract class RecipeRendererBase> implements IRecipeRender protected T recipe; protected List tooltips = Lists.newArrayList(); - private long lastCycle = -1; - private int cycleIdx = 0; - private Random rand = new Random(); public RecipeRendererBase(T recipe) { this.recipe = recipe; } - @Override - public void draw(Book book, CategoryAbstract category, EntryAbstract entry, int guiLeft, int guiTop, int mouseX, int mouseY, BaseScreen guiBase, FontRenderer fontRendererObj) { - Minecraft mc = guiBase.getMinecraft(); - long time = mc.world.getGameTime(); - if (lastCycle < 0 || lastCycle < time - 20) { - if (lastCycle > 0) { - cycleIdx++; - cycleIdx = Math.max(0, cycleIdx); - } - lastCycle = mc.world.getGameTime(); - } - } - - /** - * Retrieves a itemstack that matches the ingredient. - * Cycles though all matching stacks. - * Must call {@link IRecipeRenderer#draw(Book, CategoryAbstract, EntryAbstract, int, int, int, int, BaseScreen, FontRenderer)} if you are overriding it. - * @param ingredient The ingredient - * @param index An "unique" id for this ingredient, so multiple ingredients can be cycled independently - * @return Optional. Can be empty if ingredient is invalid and has no matching stacks - */ - protected Optional getCycledIngredientStack(Ingredient ingredient, int index){ - ItemStack[] itemStacks = ingredient.getMatchingStacks(); - if(itemStacks.length>0){ - rand.setSeed(index); - int id = (index + rand.nextInt(itemStacks.length) + cycleIdx) %itemStacks.length; - return Optional.of(itemStacks[id]); - } - return Optional.empty(); - } @Override public void drawExtras(Book book, CategoryAbstract category, EntryAbstract entry, int guiLeft, int guiTop, int mouseX, int mouseY, BaseScreen guiBase, FontRenderer fontRendererObj) { diff --git a/src/main/java/amerifrance/guideapi/api/util/IngredientCycler.java b/src/main/java/amerifrance/guideapi/api/util/IngredientCycler.java new file mode 100644 index 00000000..f1a78e43 --- /dev/null +++ b/src/main/java/amerifrance/guideapi/api/util/IngredientCycler.java @@ -0,0 +1,56 @@ +package amerifrance.guideapi.api.util; + + +import amerifrance.guideapi.api.IRecipeRenderer; +import amerifrance.guideapi.api.impl.Book; +import amerifrance.guideapi.api.impl.abstraction.CategoryAbstract; +import amerifrance.guideapi.api.impl.abstraction.EntryAbstract; +import amerifrance.guideapi.gui.BaseScreen; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.FontRenderer; +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.Ingredient; + +import javax.annotation.Nonnull; +import java.util.Optional; +import java.util.Random; + + +/** + * Allows convenient consistent cycling through all matching stacks of an ingredient + */ +public class IngredientCycler { + + private long lastCycle = -1; + private int cycleIdx = 0; + private Random rand = new Random(); + + public void tick(@Nonnull Minecraft mc){ + long time = mc.world!=null?mc.world.getGameTime():0; + if (lastCycle < 0 || lastCycle < time - 20) { + if (lastCycle > 0) { + cycleIdx++; + cycleIdx = Math.max(0, cycleIdx); + } + lastCycle = time; + } + } + + /** + * Retrieves a itemstack that matches the ingredient. + * Cycles though all matching stacks. + * Must call {@link IngredientCycler#tick(Minecraft)} before (e.g. once per onDraw) + * @param ingredient The ingredient + * @param index An "unique" id for this ingredient, so multiple ingredients can be cycled independently + * @return Optional. Can be empty if ingredient is invalid and has no matching stacks + */ + public Optional getCycledIngredientStack(@Nonnull Ingredient ingredient, int index){ + ItemStack[] itemStacks = ingredient.getMatchingStacks(); + if(itemStacks.length>0){ + rand.setSeed(index); + int id = (index + rand.nextInt(itemStacks.length) + cycleIdx) %itemStacks.length; + return Optional.of(itemStacks[id]); + } + return Optional.empty(); + } +} diff --git a/src/main/java/amerifrance/guideapi/page/PageBrewingRecipe.java b/src/main/java/amerifrance/guideapi/page/PageBrewingRecipe.java index 612dce3d..71ee1925 100644 --- a/src/main/java/amerifrance/guideapi/page/PageBrewingRecipe.java +++ b/src/main/java/amerifrance/guideapi/page/PageBrewingRecipe.java @@ -7,6 +7,7 @@ import amerifrance.guideapi.api.impl.abstraction.CategoryAbstract; import amerifrance.guideapi.api.impl.abstraction.EntryAbstract; import amerifrance.guideapi.api.util.GuiHelper; +import amerifrance.guideapi.api.util.IngredientCycler; import amerifrance.guideapi.api.util.TextHelper; import amerifrance.guideapi.gui.BaseScreen; import net.minecraft.block.Blocks; @@ -33,10 +34,7 @@ public class PageBrewingRecipe extends Page { public Ingredient input; public ItemStack output; - //Used for ingredient cycling - private long lastCycle = -1; - private int cycleIdx = 0; - private Random rand = new Random(); + private IngredientCycler cycler = new IngredientCycler(); /** * Your brewing recipe - what you pass to BrewingRecipeRegistry.addRecipe @@ -64,15 +62,7 @@ public PageBrewingRecipe(Ingredient input, Ingredient ingredient, ItemStack outp @Override @OnlyIn(Dist.CLIENT) public void draw(Book book, CategoryAbstract category, EntryAbstract entry, int guiLeft, int guiTop, int mouseX, int mouseY, BaseScreen guiBase, FontRenderer fontRendererObj) { - Minecraft mc = guiBase.getMinecraft(); - long time = mc.world.getGameTime(); - if (lastCycle < 0 || lastCycle < time - 20) { - if (lastCycle > 0) { - cycleIdx++; - cycleIdx = Math.max(0, cycleIdx); - } - lastCycle = mc.world.getGameTime(); - } + cycler.tick(guiBase.getMinecraft()); int xStart = guiLeft + 62; int yStart = guiTop + 52; @@ -90,7 +80,7 @@ public void draw(Book book, CategoryAbstract category, EntryAbstract entry, int //start input int finalX = x; int finalY = y; - getCycledIngredientStack(ingredient,0).ifPresent(stack -> { + cycler.getCycledIngredientStack(ingredient,0).ifPresent(stack -> { GuiHelper.drawItemStack(stack, finalX, finalY); }); @@ -132,20 +122,4 @@ public void draw(Book book, CategoryAbstract category, EntryAbstract entry, int } - /** - * Copied from {@link IRecipeRenderer} because brewing does not use real recipes - * @param ingredient - * @param index - * @return - */ - private Optional getCycledIngredientStack(Ingredient ingredient, int index){ - ItemStack[] itemStacks = ingredient.getMatchingStacks(); - if(itemStacks.length>0){ - rand.setSeed(index); - int id = (index + rand.nextInt(itemStacks.length) + cycleIdx) %itemStacks.length; - return Optional.of(itemStacks[id]); - } - return Optional.empty(); - } - } diff --git a/src/main/java/amerifrance/guideapi/page/PageIRecipe.java b/src/main/java/amerifrance/guideapi/page/PageIRecipe.java index 7dbf78c4..07fbe584 100644 --- a/src/main/java/amerifrance/guideapi/page/PageIRecipe.java +++ b/src/main/java/amerifrance/guideapi/page/PageIRecipe.java @@ -1,5 +1,6 @@ package amerifrance.guideapi.page; +import amerifrance.guideapi.api.util.IngredientCycler; import amerifrance.guideapi.page.reciperenderer.FurnaceRecipeRenderer; import amerifrance.guideapi.api.IRecipeRenderer; import amerifrance.guideapi.api.impl.Book; @@ -27,7 +28,7 @@ public class PageIRecipe extends Page { public IRecipe recipe; public IRecipeRenderer iRecipeRenderer; protected boolean isValid; - + private IngredientCycler ingredientCycler = new IngredientCycler(); /** * Use this if you are creating a page for a standard recipe, one of: *

@@ -58,7 +59,8 @@ public PageIRecipe(IRecipe recipe, IRecipeRenderer iRecipeRenderer) { public void draw(Book book, CategoryAbstract category, EntryAbstract entry, int guiLeft, int guiTop, int mouseX, int mouseY, BaseScreen guiBase, FontRenderer fontRendererObj) { if(isValid) { super.draw(book, category, entry, guiLeft, guiTop, mouseX, mouseY, guiBase, fontRendererObj); - iRecipeRenderer.draw(book, category, entry, guiLeft, guiTop, mouseX, mouseY, guiBase, fontRendererObj); + ingredientCycler.tick(guiBase.getMinecraft()); + iRecipeRenderer.draw(book, category, entry, guiLeft, guiTop, mouseX, mouseY, guiBase, fontRendererObj,ingredientCycler); } } diff --git a/src/main/java/amerifrance/guideapi/page/PageItemStack.java b/src/main/java/amerifrance/guideapi/page/PageItemStack.java index cc6e859f..eb059165 100644 --- a/src/main/java/amerifrance/guideapi/page/PageItemStack.java +++ b/src/main/java/amerifrance/guideapi/page/PageItemStack.java @@ -4,25 +4,32 @@ import amerifrance.guideapi.api.impl.abstraction.CategoryAbstract; import amerifrance.guideapi.api.impl.abstraction.EntryAbstract; import amerifrance.guideapi.api.util.GuiHelper; +import amerifrance.guideapi.api.util.IngredientCycler; import amerifrance.guideapi.gui.BaseScreen; import net.minecraft.block.Block; import net.minecraft.client.gui.FontRenderer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.Ingredient; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; public class PageItemStack extends PageText { - public ItemStack stack; + public Ingredient ingredient; + private IngredientCycler ingredientCycler = new IngredientCycler(); + + public PageItemStack(String draw, Ingredient ingredient){ + super(draw,60); + this.ingredient=ingredient; + } /** * @param draw - Unlocalized text to draw - * @param stack - ItemStack to render + * @param ingredient - ItemStack to render */ - public PageItemStack(String draw, ItemStack stack) { - super(draw, 60); - this.stack = stack; + public PageItemStack(String draw, ItemStack ingredient) { + this(draw,Ingredient.fromStacks(ingredient)); } /** @@ -45,7 +52,10 @@ public PageItemStack(String draw, Block block) { @Override @OnlyIn(Dist.CLIENT) public void drawExtras(Book book, CategoryAbstract category, EntryAbstract entry, int guiLeft, int guiTop, int mouseX, int mouseY, BaseScreen guiBase, FontRenderer fontRendererObj) { - GuiHelper.drawScaledItemStack(stack, guiLeft + 75, guiTop + 20, 3); + ingredientCycler.tick(guiBase.getMinecraft()); + ingredientCycler.getCycledIngredientStack(ingredient,0).ifPresent(stack -> { + GuiHelper.drawScaledItemStack(stack, guiLeft + 75, guiTop + 20, 3); + }); } @Override @@ -56,13 +66,13 @@ public boolean equals(Object o) { PageItemStack that = (PageItemStack) o; - return stack != null ? stack.equals(that.stack) : that.stack == null; + return ingredient != null ? ingredient.equals(that.ingredient) : that.ingredient == null; } @Override public int hashCode() { int result = super.hashCode(); - result = 31 * result + (stack != null ? stack.hashCode() : 0); + result = 31 * result + (ingredient != null ? ingredient.hashCode() : 0); return result; } } diff --git a/src/main/java/amerifrance/guideapi/page/reciperenderer/CraftingRecipeRenderer.java b/src/main/java/amerifrance/guideapi/page/reciperenderer/CraftingRecipeRenderer.java index faa2753c..5dc0fa1b 100644 --- a/src/main/java/amerifrance/guideapi/page/reciperenderer/CraftingRecipeRenderer.java +++ b/src/main/java/amerifrance/guideapi/page/reciperenderer/CraftingRecipeRenderer.java @@ -6,6 +6,7 @@ import amerifrance.guideapi.api.impl.abstraction.CategoryAbstract; import amerifrance.guideapi.api.impl.abstraction.EntryAbstract; import amerifrance.guideapi.api.util.GuiHelper; +import amerifrance.guideapi.api.util.IngredientCycler; import amerifrance.guideapi.api.util.TextHelper; import amerifrance.guideapi.gui.BaseScreen; import com.google.common.base.Strings; @@ -28,9 +29,7 @@ public CraftingRecipeRenderer(T recipe) { } @Override - public void draw(Book book, CategoryAbstract category, EntryAbstract entry, int guiLeft, int guiTop, int mouseX, int mouseY, BaseScreen guiBase, FontRenderer fontRendererObj) { - super.draw(book, category, entry, guiLeft, guiTop, mouseX, mouseY, guiBase, fontRendererObj); - + public void draw(Book book, CategoryAbstract category, EntryAbstract entry, int guiLeft, int guiTop, int mouseX, int mouseY, BaseScreen guiBase, FontRenderer fontRendererObj, IngredientCycler cycler) { SubTexture.CRAFTING_GRID.draw(guiLeft + 42, guiTop + 53); diff --git a/src/main/java/amerifrance/guideapi/page/reciperenderer/FurnaceRecipeRenderer.java b/src/main/java/amerifrance/guideapi/page/reciperenderer/FurnaceRecipeRenderer.java index 63cc9aa9..d0121402 100644 --- a/src/main/java/amerifrance/guideapi/page/reciperenderer/FurnaceRecipeRenderer.java +++ b/src/main/java/amerifrance/guideapi/page/reciperenderer/FurnaceRecipeRenderer.java @@ -6,6 +6,7 @@ import amerifrance.guideapi.api.impl.abstraction.CategoryAbstract; import amerifrance.guideapi.api.impl.abstraction.EntryAbstract; import amerifrance.guideapi.api.util.GuiHelper; +import amerifrance.guideapi.api.util.IngredientCycler; import amerifrance.guideapi.api.util.TextHelper; import amerifrance.guideapi.gui.BaseScreen; import net.minecraft.client.gui.FontRenderer; @@ -24,8 +25,7 @@ public FurnaceRecipeRenderer(FurnaceRecipe recipe) { } @Override - public void draw(Book book, CategoryAbstract category, EntryAbstract entry, int guiLeft, int guiTop, int mouseX, int mouseY, BaseScreen guiBase, FontRenderer fontRendererObj) { - super.draw(book, category, entry, guiLeft, guiTop, mouseX, mouseY, guiBase, fontRendererObj); + public void draw(Book book, CategoryAbstract category, EntryAbstract entry, int guiLeft, int guiTop, int mouseX, int mouseY, BaseScreen guiBase, FontRenderer fontRendererObj, IngredientCycler cycler) { SubTexture.FURNACE_GRID.draw(guiLeft + 64, guiTop + 71); guiBase.drawCenteredString(fontRendererObj, TextHelper.localizeEffect("text.furnace.smelting"), guiLeft + guiBase.xSize / 2, guiTop + 12, 0); @@ -34,7 +34,7 @@ public void draw(Book book, CategoryAbstract category, EntryAbstract entry, int int y = guiTop + 77; Ingredient input = recipe.getIngredients().get(0); - getCycledIngredientStack(input,0).ifPresent(stack -> { + cycler.getCycledIngredientStack(input,0).ifPresent(stack -> { GuiHelper.drawItemStack(stack, x, y); List tooltip = null; diff --git a/src/main/java/amerifrance/guideapi/page/reciperenderer/ShapedRecipesRenderer.java b/src/main/java/amerifrance/guideapi/page/reciperenderer/ShapedRecipesRenderer.java index c7e99d3d..9591bad7 100644 --- a/src/main/java/amerifrance/guideapi/page/reciperenderer/ShapedRecipesRenderer.java +++ b/src/main/java/amerifrance/guideapi/page/reciperenderer/ShapedRecipesRenderer.java @@ -4,6 +4,7 @@ import amerifrance.guideapi.api.impl.abstraction.CategoryAbstract; import amerifrance.guideapi.api.impl.abstraction.EntryAbstract; import amerifrance.guideapi.api.util.GuiHelper; +import amerifrance.guideapi.api.util.IngredientCycler; import amerifrance.guideapi.gui.BaseScreen; import net.minecraft.client.gui.FontRenderer; import net.minecraft.item.ItemStack; @@ -20,8 +21,8 @@ public ShapedRecipesRenderer(ShapedRecipe recipe) { } @Override - public void draw(Book book, CategoryAbstract category, EntryAbstract entry, int guiLeft, int guiTop, int mouseX, int mouseY, BaseScreen guiBase, FontRenderer fontRendererObj) { - super.draw(book, category, entry, guiLeft, guiTop, mouseX, mouseY, guiBase, fontRendererObj); + public void draw(Book book, CategoryAbstract category, EntryAbstract entry, int guiLeft, int guiTop, int mouseX, int mouseY, BaseScreen guiBase, FontRenderer fontRendererObj, IngredientCycler cycler) { + super.draw(book, category, entry, guiLeft, guiTop, mouseX, mouseY, guiBase, fontRendererObj, cycler); for (int y = 0; y < recipe.getRecipeHeight(); y++) { for (int x = 0; x < recipe.getRecipeWidth(); x++) { int i = y*recipe.getRecipeWidth()+x; @@ -29,7 +30,7 @@ public void draw(Book book, CategoryAbstract category, EntryAbstract entry, int int stackY = (y + 1) * 17 + (guiTop + 38) + y; Ingredient ingredient = recipe.getIngredients().get(i); - getCycledIngredientStack(ingredient,i).ifPresent(stack -> { + cycler.getCycledIngredientStack(ingredient,i).ifPresent(stack -> { GuiHelper.drawItemStack(stack, stackX, stackY); if (GuiHelper.isMouseBetween(mouseX, mouseY, stackX, stackY, 15, 15)) tooltips = GuiHelper.getTooltip(stack); diff --git a/src/main/java/amerifrance/guideapi/page/reciperenderer/ShapelessRecipesRenderer.java b/src/main/java/amerifrance/guideapi/page/reciperenderer/ShapelessRecipesRenderer.java index ada2e547..a6541aaf 100644 --- a/src/main/java/amerifrance/guideapi/page/reciperenderer/ShapelessRecipesRenderer.java +++ b/src/main/java/amerifrance/guideapi/page/reciperenderer/ShapelessRecipesRenderer.java @@ -4,6 +4,7 @@ import amerifrance.guideapi.api.impl.abstraction.CategoryAbstract; import amerifrance.guideapi.api.impl.abstraction.EntryAbstract; import amerifrance.guideapi.api.util.GuiHelper; +import amerifrance.guideapi.api.util.IngredientCycler; import amerifrance.guideapi.api.util.TextHelper; import amerifrance.guideapi.gui.BaseScreen; import net.minecraft.client.gui.FontRenderer; @@ -21,8 +22,8 @@ public ShapelessRecipesRenderer(ShapelessRecipe recipe) { } @Override - public void draw(Book book, CategoryAbstract category, EntryAbstract entry, int guiLeft, int guiTop, int mouseX, int mouseY, BaseScreen guiBase, FontRenderer fontRendererObj) { - super.draw(book, category, entry, guiLeft, guiTop, mouseX, mouseY, guiBase, fontRendererObj); + public void draw(Book book, CategoryAbstract category, EntryAbstract entry, int guiLeft, int guiTop, int mouseX, int mouseY, BaseScreen guiBase, FontRenderer fontRendererObj, IngredientCycler cycler) { + super.draw(book, category, entry, guiLeft, guiTop, mouseX, mouseY, guiBase, fontRendererObj, cycler); for (int y = 0; y < 3; y++) { for (int x = 0; x < 3; x++) { int i = 3 * y + x; @@ -30,7 +31,7 @@ public void draw(Book book, CategoryAbstract category, EntryAbstract entry, int int stackY = (y + 1) * 17 + (guiTop + 38) + y; if (i < recipe.getIngredients().size()) { Ingredient ingredient = recipe.getIngredients().get(i); - getCycledIngredientStack(ingredient,i).ifPresent(stack -> { + cycler.getCycledIngredientStack(ingredient,i).ifPresent(stack -> { GuiHelper.drawItemStack(stack, stackX, stackY); if (GuiHelper.isMouseBetween(mouseX, mouseY, stackX, stackY, 15, 15)) tooltips = GuiHelper.getTooltip(stack); diff --git a/src/main/java/amerifrance/guideapi/test/TestBook.java b/src/main/java/amerifrance/guideapi/test/TestBook.java index 5eee7f39..2f175a36 100644 --- a/src/main/java/amerifrance/guideapi/test/TestBook.java +++ b/src/main/java/amerifrance/guideapi/test/TestBook.java @@ -11,6 +11,7 @@ import amerifrance.guideapi.category.CategoryItemStack; import amerifrance.guideapi.entry.EntryItemStack; import amerifrance.guideapi.page.PageIRecipe; +import amerifrance.guideapi.page.PageItemStack; import amerifrance.guideapi.page.PageJsonRecipe; import amerifrance.guideapi.page.PageText; import amerifrance.guideapi.page.reciperenderer.ShapedRecipesRenderer; @@ -22,6 +23,8 @@ import net.minecraft.item.crafting.IRecipe; import net.minecraft.item.crafting.Ingredient; import net.minecraft.item.crafting.ShapedRecipe; +import net.minecraft.tags.BlockTags; +import net.minecraft.tags.ItemTags; import net.minecraft.util.NonNullList; import net.minecraft.util.ResourceLocation; import net.minecraftforge.common.Tags; @@ -57,10 +60,14 @@ private void buildContent(List categories){ List pages = Lists.newArrayList(); pages.add(new PageText("Hello, this is\nsome text")); pages.add(new PageJsonRecipe(new ResourceLocation("minecraft","stone"))); + pages.add(new PageJsonRecipe(new ResourceLocation("minecraft","charcoal"))); + pages.add(new PageJsonRecipe(new ResourceLocation("minecraft","stick"),recipe -> recipe instanceof ShapedRecipe ? new ShapedRecipesRenderer((ShapedRecipe) recipe) : null)); //Probably want to use your own method as render supplier and print proper logs pages.add(new PageIRecipe(new ShapedRecipe(new ResourceLocation("guideapi","test11"), "test",1,1,NonNullList.from(Ingredient.EMPTY,Ingredient.fromStacks(new ItemStack(Items.PUMPKIN))),new ItemStack(Blocks.OAK_LOG)))); pages.add(new PageJsonRecipe(new ResourceLocation("minecraft", "acacia_fence"))); + pages.add(new PageItemStack("These are all logs",Ingredient.fromTag(ItemTags.LOGS))); + Entry entry = new EntryItemStack(pages, "test.entry.name", new ItemStack(Items.POTATO)); entries.put(new ResourceLocation("guideapi", "entry"), entry); categories.add(new CategoryItemStack(entries, "test.category.name", new ItemStack(Items.BLUE_BANNER))); From a0ba8deaadf696da3095a24365bb67927e6534e2 Mon Sep 17 00:00:00 2001 From: maxanier Date: Sat, 28 Mar 2020 19:18:58 +0100 Subject: [PATCH 12/28] Remove crafting recipe functions for books. They have to be added via json --- src/main/java/amerifrance/guideapi/api/IGuideBook.java | 10 ---------- src/main/java/amerifrance/guideapi/test/TestBook.java | 5 ----- src/main/java/amerifrance/guideapi/test/TestBook2.java | 6 ------ 3 files changed, 21 deletions(-) diff --git a/src/main/java/amerifrance/guideapi/api/IGuideBook.java b/src/main/java/amerifrance/guideapi/api/IGuideBook.java index 40449854..4e962239 100644 --- a/src/main/java/amerifrance/guideapi/api/IGuideBook.java +++ b/src/main/java/amerifrance/guideapi/api/IGuideBook.java @@ -29,16 +29,6 @@ default void handleModel(@Nonnull ItemStack bookStack) { GuideAPI.setModel(((IGuideItem) bookStack.getItem()).getBook(bookStack)); } - /** - * An IRecipe to use for your book. Called from {@link net.minecraftforge.event.RegistryEvent.Register} - * - * @return an IRecipe to register for your book or null to not include one. - */ - @Nullable - default IRecipe getRecipe(@Nonnull ItemStack bookStack) { - return null; - } - /** * Called during Post Initialization. */ diff --git a/src/main/java/amerifrance/guideapi/test/TestBook.java b/src/main/java/amerifrance/guideapi/test/TestBook.java index 2f175a36..60af5c53 100644 --- a/src/main/java/amerifrance/guideapi/test/TestBook.java +++ b/src/main/java/amerifrance/guideapi/test/TestBook.java @@ -48,11 +48,6 @@ public Book buildBook() { return (book = binder.build()); } - @Override - public IRecipe getRecipe(@Nonnull ItemStack bookStack) { - return new ShapedRecipe(book.getRegistryName(), "", 3,1,NonNullList.from(Ingredient.EMPTY,Ingredient.EMPTY,Ingredient.fromTag(Tags.Items.INGOTS_IRON),Ingredient.EMPTY),bookStack); - } - private void buildContent(List categories){ Map entries = Maps.newHashMap(); diff --git a/src/main/java/amerifrance/guideapi/test/TestBook2.java b/src/main/java/amerifrance/guideapi/test/TestBook2.java index 7ebda1f8..a09348e2 100644 --- a/src/main/java/amerifrance/guideapi/test/TestBook2.java +++ b/src/main/java/amerifrance/guideapi/test/TestBook2.java @@ -41,12 +41,6 @@ public Book buildBook() { return (book = binder.build()); } - @Nullable - @Override - public IRecipe getRecipe(@Nonnull ItemStack bookStack) { - return new ShapedRecipe(book.getRegistryName(), "", 3,1, NonNullList.from(Ingredient.EMPTY,Ingredient.EMPTY,Ingredient.fromTag(Tags.Items.INGOTS_GOLD),Ingredient.EMPTY),bookStack); - } - private void buildContent(List categories) { CategoryAbstract testCategory = new CategoryItemStack("test.category.name", new ItemStack(Items.BLUE_BANNER)).withKeyBase("guideapi"); testCategory.addEntry("entry", new EntryItemStack("test.entry.name", new ItemStack(Items.POTATO))); From ebddbd3a856b1b16c9f076b6d0733bf636497128 Mon Sep 17 00:00:00 2001 From: maxanier Date: Tue, 31 Mar 2020 17:28:02 +0200 Subject: [PATCH 13/28] Fix search --- .../guideapi/gui/SearchScreen.java | 21 ++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/src/main/java/amerifrance/guideapi/gui/SearchScreen.java b/src/main/java/amerifrance/guideapi/gui/SearchScreen.java index 030b6782..32e6b82a 100644 --- a/src/main/java/amerifrance/guideapi/gui/SearchScreen.java +++ b/src/main/java/amerifrance/guideapi/gui/SearchScreen.java @@ -140,8 +140,6 @@ public boolean mouseClicked(double mouseX, double mouseY, int typeofClick) { @Override public boolean mouseScrolled(double p_mouseScrolled_1_, double p_mouseScrolled_3_, double movement) { - - if (movement < 0 && buttonNext.visible && currentPage <= searchResults.size()) currentPage++; else if (movement > 0 && buttonPrev.visible && currentPage > 0) @@ -160,17 +158,30 @@ public boolean keyPressed(int keyCode, int p_keyPressed_2_, int p_keyPressed_3_) if (keyCode == GLFW.GLFW_KEY_ESCAPE) searchField.changeFocus(false); - searchField.keyPressed(keyCode, p_keyPressed_2_, p_keyPressed_3_); + if(searchField.keyPressed(keyCode, p_keyPressed_2_, p_keyPressed_3_)) { + this.updateSearch(); + } + + return true; + } + + private void updateSearch(){ if (!searchField.getText().equalsIgnoreCase(lastQuery)) { lastQuery = searchField.getText(); searchResults = getMatches(book, searchField.getText(), player, bookStack); if (currentPage > searchResults.size()) currentPage = searchResults.size() - 1; } - return true; } - + @Override + public boolean charTyped(char p_charTyped_1_, int p_charTyped_2_) { + if (this.searchField.charTyped(p_charTyped_1_, p_charTyped_2_)) { + this.updateSearch(); + return true; + } + return super.charTyped(p_charTyped_1_, p_charTyped_2_); + } @Nonnull static List>> getMatches(Book book, @Nullable String query, PlayerEntity player, ItemStack bookStack) { From 8bcda6ecc9a1472011056535015a2cc7d4f1371e Mon Sep 17 00:00:00 2001 From: maxanier Date: Tue, 31 Mar 2020 17:38:26 +0200 Subject: [PATCH 14/28] Fix localization --- .../guideapi/api/impl/BookBinder.java | 2 +- .../guideapi/button/ButtonBack.java | 4 +-- .../guideapi/button/ButtonNext.java | 4 +-- .../guideapi/button/ButtonPrev.java | 4 +-- .../guideapi/button/ButtonSearch.java | 4 +-- .../guideapi/page/PageBrewingRecipe.java | 6 ++-- .../CraftingRecipeRenderer.java | 2 +- .../reciperenderer/FurnaceRecipeRenderer.java | 2 +- .../ShapelessRecipesRenderer.java | 2 +- .../amerifrance/guideapi/test/TestBook.java | 4 +-- .../amerifrance/guideapi/test/TestBook2.java | 7 ++-- .../guideapi/util/EventHandler.java | 2 +- .../resources/assets/guideapi/lang/de_de.json | 18 ++++++++++ .../resources/assets/guideapi/lang/en_US.lang | 32 ------------------ .../resources/assets/guideapi/lang/en_us.json | 33 +++++++++++++++++++ .../resources/assets/guideapi/lang/ru_RU.lang | 22 ------------- .../resources/assets/guideapi/lang/ru_ru.json | 21 ++++++++++++ .../resources/assets/guideapi/lang/zh_CN.lang | 22 ------------- .../resources/assets/guideapi/lang/zh_cn.json | 21 ++++++++++++ 19 files changed, 116 insertions(+), 96 deletions(-) create mode 100644 src/main/resources/assets/guideapi/lang/de_de.json delete mode 100644 src/main/resources/assets/guideapi/lang/en_US.lang create mode 100644 src/main/resources/assets/guideapi/lang/en_us.json delete mode 100644 src/main/resources/assets/guideapi/lang/ru_RU.lang create mode 100644 src/main/resources/assets/guideapi/lang/ru_ru.json delete mode 100644 src/main/resources/assets/guideapi/lang/zh_CN.lang create mode 100644 src/main/resources/assets/guideapi/lang/zh_cn.json diff --git a/src/main/java/amerifrance/guideapi/api/impl/BookBinder.java b/src/main/java/amerifrance/guideapi/api/impl/BookBinder.java index cc7a17f6..15808f35 100644 --- a/src/main/java/amerifrance/guideapi/api/impl/BookBinder.java +++ b/src/main/java/amerifrance/guideapi/api/impl/BookBinder.java @@ -17,7 +17,7 @@ public class BookBinder { private final ResourceLocation registryName; private Consumer> contentProvider; - private String guideTitle = "item.guideapi.book.name"; + private String guideTitle = "item.guideapi.book"; private String header; private String itemName; private String author; diff --git a/src/main/java/amerifrance/guideapi/button/ButtonBack.java b/src/main/java/amerifrance/guideapi/button/ButtonBack.java index 0a381470..8f71deb7 100644 --- a/src/main/java/amerifrance/guideapi/button/ButtonBack.java +++ b/src/main/java/amerifrance/guideapi/button/ButtonBack.java @@ -31,7 +31,7 @@ public void renderButton(int mouseX, int mouseY, float partialTicks) { Minecraft.getInstance().getTextureManager().bindTexture(new ResourceLocation(GuideMod.ID, "textures/gui/book_colored.png")); if (GuiHelper.isMouseBetween(mouseX, mouseY, x, y, width, height)) { this.blit(x,y+1,70,201,18,10); - GuiUtils.drawHoveringText(getHoveringText(),mouseX,mouseY,width,height,width,Minecraft.getInstance().fontRenderer); + GuiUtils.drawHoveringText(getHoveringText(),mouseX,mouseY,guiBase.width,guiBase.height,-1,Minecraft.getInstance().fontRenderer); } else { this.blit(x,y,94,201,18,10); } @@ -42,7 +42,7 @@ public void renderButton(int mouseX, int mouseY, float partialTicks) { public List getHoveringText() { ArrayList list = new ArrayList(); - String s = TextHelper.localizeEffect("button.back.name"); + String s = TextHelper.localizeEffect("guideapi.button.back"); list.add(s); return list; } diff --git a/src/main/java/amerifrance/guideapi/button/ButtonNext.java b/src/main/java/amerifrance/guideapi/button/ButtonNext.java index 32f4a699..df9917da 100644 --- a/src/main/java/amerifrance/guideapi/button/ButtonNext.java +++ b/src/main/java/amerifrance/guideapi/button/ButtonNext.java @@ -30,7 +30,7 @@ public void renderButton( int mouseX, int mouseY, float partialTicks) { Minecraft.getInstance().getTextureManager().bindTexture(new ResourceLocation(GuideMod.ID, "textures/gui/book_colored.png")); if (GuiHelper.isMouseBetween(mouseX, mouseY, x, y, width, height)) { this.blit(x,y+1,47,201,18,10); - GuiUtils.drawHoveringText(getHoveringText(),mouseX,mouseY,width,height,width,Minecraft.getInstance().fontRenderer); + GuiUtils.drawHoveringText(getHoveringText(),mouseX,mouseY,guiBase.width,guiBase.height,-1,Minecraft.getInstance().fontRenderer); } else { this.blit(x,y,24,201,18,10); } @@ -41,7 +41,7 @@ public void renderButton( int mouseX, int mouseY, float partialTicks) { public List getHoveringText() { ArrayList list = new ArrayList(); - list.add(TextHelper.localizeEffect("button.next.name")); + list.add(TextHelper.localizeEffect("guideapi.button.next")); return list; } } diff --git a/src/main/java/amerifrance/guideapi/button/ButtonPrev.java b/src/main/java/amerifrance/guideapi/button/ButtonPrev.java index b78d598b..2efd593e 100644 --- a/src/main/java/amerifrance/guideapi/button/ButtonPrev.java +++ b/src/main/java/amerifrance/guideapi/button/ButtonPrev.java @@ -31,7 +31,7 @@ public void renderButton(int mouseX, int mouseY, float partialTicks) { Minecraft.getInstance().getTextureManager().bindTexture(new ResourceLocation(GuideMod.ID, "textures/gui/book_colored.png")); if (GuiHelper.isMouseBetween(mouseX, mouseY, x, y, width, height)) { this.blit(x,y+1,47,214,18,10); - GuiUtils.drawHoveringText(getHoveringText(),mouseX,mouseY,width,height,width,Minecraft.getInstance().fontRenderer); + GuiUtils.drawHoveringText(getHoveringText(),mouseX,mouseY,guiBase.width,guiBase.height,-1,Minecraft.getInstance().fontRenderer); } else { this.blit(x,y,24,214,18,10); } @@ -42,7 +42,7 @@ public void renderButton(int mouseX, int mouseY, float partialTicks) { public List getHoveringText() { ArrayList list = new ArrayList(); - list.add(TextHelper.localizeEffect("button.prev.name")); + list.add(TextHelper.localizeEffect("guideapi.button.prev")); return list; } } \ No newline at end of file diff --git a/src/main/java/amerifrance/guideapi/button/ButtonSearch.java b/src/main/java/amerifrance/guideapi/button/ButtonSearch.java index f55f57ca..f75b06b2 100644 --- a/src/main/java/amerifrance/guideapi/button/ButtonSearch.java +++ b/src/main/java/amerifrance/guideapi/button/ButtonSearch.java @@ -29,7 +29,7 @@ public void renderButton(int mouseX, int mouseY, float partialTicks) { GlStateManager.disableLighting(); if (GuiHelper.isMouseBetween(mouseX, mouseY, x, y, width, height)) { SubTexture.MAGNIFYING_GLASS.draw(x, y + 1); - GuiUtils.drawHoveringText(getHoveringText(),mouseX,mouseY,width,height,width,Minecraft.getInstance().fontRenderer); + GuiUtils.drawHoveringText(getHoveringText(),mouseX,mouseY,guiBase.width,guiBase.height,-1,Minecraft.getInstance().fontRenderer); } else { SubTexture.MAGNIFYING_GLASS.draw(x, y); } @@ -40,7 +40,7 @@ public void renderButton(int mouseX, int mouseY, float partialTicks) { public List getHoveringText() { ArrayList list = new ArrayList(); - list.add(TextHelper.localizeEffect("button.search.name")); + list.add(TextHelper.localizeEffect("guideapi.button.search")); return list; } } diff --git a/src/main/java/amerifrance/guideapi/page/PageBrewingRecipe.java b/src/main/java/amerifrance/guideapi/page/PageBrewingRecipe.java index 71ee1925..2b8ab1ae 100644 --- a/src/main/java/amerifrance/guideapi/page/PageBrewingRecipe.java +++ b/src/main/java/amerifrance/guideapi/page/PageBrewingRecipe.java @@ -70,9 +70,9 @@ public void draw(Book book, CategoryAbstract category, EntryAbstract entry, int SubTexture.POTION_GRID.draw(xStart, yStart); List badTip = new ArrayList<>(); - badTip.add(new TranslationTextComponent("text.brewing.error")); + badTip.add(new TranslationTextComponent("guideapi.text.brewing.error")); - guiBase.drawCenteredString(fontRendererObj, TextHelper.localizeEffect("text.brewing.brew"), guiLeft + guiBase.xSize / 2, guiTop + 12, 0); + guiBase.drawCenteredString(fontRendererObj, TextHelper.localizeEffect("guideapi.text.brewing.brew"), guiLeft + guiBase.xSize / 2, guiTop + 12, 0); //int xmiddle = guiLeft + guiBase.xSize / 2 - 6; int x = xStart + 25;//since item stack is approx 16 wide @@ -115,7 +115,7 @@ public void draw(Book book, CategoryAbstract category, EntryAbstract entry, int tooltip = output.getItem() == Item.getItemFromBlock(Blocks.BARRIER) ? badTip : GuiHelper.getTooltip(output); if (output.getItem() == Item.getItemFromBlock(Blocks.BARRIER)) - guiBase.drawCenteredString(fontRendererObj, TextHelper.localizeEffect("text.brewing.error"), guiLeft + guiBase.xSize / 2, guiTop + 4 * guiBase.ySize / 6, 0xED073D); + guiBase.drawCenteredString(fontRendererObj, TextHelper.localizeEffect("guideapi.text.brewing.error"), guiLeft + guiBase.xSize / 2, guiTop + 4 * guiBase.ySize / 6, 0xED073D); if (tooltip != null) guiBase.drawHoveringTextComponents(tooltip, mouseX, mouseY); diff --git a/src/main/java/amerifrance/guideapi/page/reciperenderer/CraftingRecipeRenderer.java b/src/main/java/amerifrance/guideapi/page/reciperenderer/CraftingRecipeRenderer.java index 5dc0fa1b..4bb34fc9 100644 --- a/src/main/java/amerifrance/guideapi/page/reciperenderer/CraftingRecipeRenderer.java +++ b/src/main/java/amerifrance/guideapi/page/reciperenderer/CraftingRecipeRenderer.java @@ -54,7 +54,7 @@ public void draw(Book book, CategoryAbstract category, EntryAbstract entry, int protected String getRecipeName() { - return TextHelper.localizeEffect("text.shaped.crafting"); + return TextHelper.localizeEffect("guideapi.text.crafting.shaped"); } public void setCustomTitle(String customDisplay) { diff --git a/src/main/java/amerifrance/guideapi/page/reciperenderer/FurnaceRecipeRenderer.java b/src/main/java/amerifrance/guideapi/page/reciperenderer/FurnaceRecipeRenderer.java index d0121402..1d4d3911 100644 --- a/src/main/java/amerifrance/guideapi/page/reciperenderer/FurnaceRecipeRenderer.java +++ b/src/main/java/amerifrance/guideapi/page/reciperenderer/FurnaceRecipeRenderer.java @@ -28,7 +28,7 @@ public FurnaceRecipeRenderer(FurnaceRecipe recipe) { public void draw(Book book, CategoryAbstract category, EntryAbstract entry, int guiLeft, int guiTop, int mouseX, int mouseY, BaseScreen guiBase, FontRenderer fontRendererObj, IngredientCycler cycler) { SubTexture.FURNACE_GRID.draw(guiLeft + 64, guiTop + 71); - guiBase.drawCenteredString(fontRendererObj, TextHelper.localizeEffect("text.furnace.smelting"), guiLeft + guiBase.xSize / 2, guiTop + 12, 0); + guiBase.drawCenteredString(fontRendererObj, TextHelper.localizeEffect("guideapi.text.furnace.smelting"), guiLeft + guiBase.xSize / 2, guiTop + 12, 0); int x = guiLeft + 66; int y = guiTop + 77; diff --git a/src/main/java/amerifrance/guideapi/page/reciperenderer/ShapelessRecipesRenderer.java b/src/main/java/amerifrance/guideapi/page/reciperenderer/ShapelessRecipesRenderer.java index a6541aaf..e62a82c9 100644 --- a/src/main/java/amerifrance/guideapi/page/reciperenderer/ShapelessRecipesRenderer.java +++ b/src/main/java/amerifrance/guideapi/page/reciperenderer/ShapelessRecipesRenderer.java @@ -43,6 +43,6 @@ public void draw(Book book, CategoryAbstract category, EntryAbstract entry, int @Override protected String getRecipeName() { - return TextHelper.localizeEffect("text.shapeless.crafting"); + return TextHelper.localizeEffect("guideapi.text.crafting.shapeless"); } } diff --git a/src/main/java/amerifrance/guideapi/test/TestBook.java b/src/main/java/amerifrance/guideapi/test/TestBook.java index 60af5c53..eb5f0283 100644 --- a/src/main/java/amerifrance/guideapi/test/TestBook.java +++ b/src/main/java/amerifrance/guideapi/test/TestBook.java @@ -63,8 +63,8 @@ private void buildContent(List categories){ pages.add(new PageJsonRecipe(new ResourceLocation("minecraft", "acacia_fence"))); pages.add(new PageItemStack("These are all logs",Ingredient.fromTag(ItemTags.LOGS))); - Entry entry = new EntryItemStack(pages, "test.entry.name", new ItemStack(Items.POTATO)); + Entry entry = new EntryItemStack(pages, "guideapi.test.entry", new ItemStack(Items.POTATO)); entries.put(new ResourceLocation("guideapi", "entry"), entry); - categories.add(new CategoryItemStack(entries, "test.category.name", new ItemStack(Items.BLUE_BANNER))); + categories.add(new CategoryItemStack(entries, "guideapi.test.category", new ItemStack(Items.BLUE_BANNER))); } } diff --git a/src/main/java/amerifrance/guideapi/test/TestBook2.java b/src/main/java/amerifrance/guideapi/test/TestBook2.java index a09348e2..007aa8c1 100644 --- a/src/main/java/amerifrance/guideapi/test/TestBook2.java +++ b/src/main/java/amerifrance/guideapi/test/TestBook2.java @@ -5,6 +5,7 @@ import amerifrance.guideapi.api.impl.Book; import amerifrance.guideapi.api.impl.BookBinder; import amerifrance.guideapi.api.impl.abstraction.CategoryAbstract; +import amerifrance.guideapi.api.util.PageHelper; import amerifrance.guideapi.category.CategoryItemStack; import amerifrance.guideapi.entry.EntryItemStack; import amerifrance.guideapi.page.*; @@ -42,14 +43,16 @@ public Book buildBook() { } private void buildContent(List categories) { - CategoryAbstract testCategory = new CategoryItemStack("test.category.name", new ItemStack(Items.BLUE_BANNER)).withKeyBase("guideapi"); - testCategory.addEntry("entry", new EntryItemStack("test.entry.name", new ItemStack(Items.POTATO))); + CategoryAbstract testCategory = new CategoryItemStack("guideapi.test.category", new ItemStack(Items.BLUE_BANNER)).withKeyBase("guideapi"); + testCategory.addEntry("entry", new EntryItemStack("guideapi.test.entry", new ItemStack(Items.POTATO))); testCategory.getEntry("entry").addPage(new PageText("Hello, this is\nsome text")); //testCategory.getEntry("entry").addPage(new PageFurnaceRecipe(Blocks.COBBLESTONE)); //testCategory.getEntry("entry").addPage(PageIRecipe.newShaped(new ItemStack(Items.ACACIA_BOAT), "X X", "XXX", 'X', new ItemStack(Blocks.ACACIA_PLANKS, 1, 4))); testCategory.getEntry("entry").addPage(new PageBrewingRecipe(new BrewingRecipe(Ingredient.fromStacks(PotionUtils.addPotionToItemStack(new ItemStack(Items.POTION), Potions.AWKWARD)),Ingredient.fromStacks( new ItemStack(Items.GLISTERING_MELON_SLICE)), PotionUtils.addPotionToItemStack(new ItemStack(Items.POTION), Potions.HEALING))) ); testCategory.getEntry("entry").addPage(new PageJsonRecipe(new ResourceLocation("bread"))); + testCategory.getEntry("entry").addPage(new PageJsonRecipe(new ResourceLocation("redstone"))); + testCategory.getEntry("entry").addPageList(PageHelper.pagesForLongText("guideapi.test.format")); categories.add(testCategory); } } diff --git a/src/main/java/amerifrance/guideapi/util/EventHandler.java b/src/main/java/amerifrance/guideapi/util/EventHandler.java index 1384bb2b..e6362b31 100644 --- a/src/main/java/amerifrance/guideapi/util/EventHandler.java +++ b/src/main/java/amerifrance/guideapi/util/EventHandler.java @@ -106,7 +106,7 @@ public static void renderOverlay(RenderGameOverlayEvent.Pre event) { drawY -= 2; drawX += 20; fontRenderer.drawStringWithShadow(TextFormatting.WHITE + linkedEntry, drawX, drawY, 0); - fontRenderer.drawStringWithShadow(TextFormatting.WHITE.toString() + TextFormatting.ITALIC.toString() + TextHelper.localize("text.linked.open"), drawX, drawY + 12, 0); + fontRenderer.drawStringWithShadow(TextFormatting.WHITE.toString() + TextFormatting.ITALIC.toString() + TextHelper.localize("guideapi.text.linked.open"), drawX, drawY + 12, 0); } if (state.getBlock() instanceof IInfoRenderer.Block) { diff --git a/src/main/resources/assets/guideapi/lang/de_de.json b/src/main/resources/assets/guideapi/lang/de_de.json new file mode 100644 index 00000000..dd010fa2 --- /dev/null +++ b/src/main/resources/assets/guideapi/lang/de_de.json @@ -0,0 +1,18 @@ +{ + "_comment": "Item", + "item.guideapi.book": "Handbuch", + + "_comment": "Button hovering text", + "guideapi.button.back": "Zurück", + "guideapi.button.next": "Nächste", + "guideapi.button.prev": "Vorherige", + "guideapi.button.search": "Suche", + + "_comment": "Text to draw", + "guideapi.text.crafting.shaped": "Crafting", + "guideapi.text.crafting.shapeless": "Formloses Crafting", + "guideapi.text.furnace.smelting": "Schmelzen", + "guideapi.text.linked.open": "Schleiche + Nutze zum Öffnen", + "guideapi.text.brewing.brew": "Brauen", + "guidepai.text.brewing.error": "&cFehler in diesem Rezept" +} \ No newline at end of file diff --git a/src/main/resources/assets/guideapi/lang/en_US.lang b/src/main/resources/assets/guideapi/lang/en_US.lang deleted file mode 100644 index d940dcd4..00000000 --- a/src/main/resources/assets/guideapi/lang/en_US.lang +++ /dev/null @@ -1,32 +0,0 @@ -#Creative Tab -itemGroup.guideapi.creativeTab=Guide-API - -#Item -item.guideapi.book.name=Guide Book - -#Button hovering text -button.back.name=Back -button.next.name=Next -button.prev.name=Previous -button.search.name=Search - -#Text to draw -text.shaped.crafting=Shaped Crafting -text.shapeless.crafting=Shapeless Crafting -text.furnace.smelting=Smelting -text.furnace.error=&cError in the recipe -text.book.warning=&c[WARNING] Delete this item, it has no associated book! -text.book.creative=Creative Book -text.book=Book: %s -text.category=Category: %s -text.entry=Entry: %s -text.page=Page: %s -text.brewing.brew=Brewing -text.brewing.error=&cError in the recipe -text.linked.open=Sneak + Use to open -text.open.failed=Something stopped you from opening this book - -#Test -test.guide.format=This i\ns a formatting\n\ttest -test.category.name=Test Category -test.entry.name=Test Entry \ No newline at end of file diff --git a/src/main/resources/assets/guideapi/lang/en_us.json b/src/main/resources/assets/guideapi/lang/en_us.json new file mode 100644 index 00000000..de652506 --- /dev/null +++ b/src/main/resources/assets/guideapi/lang/en_us.json @@ -0,0 +1,33 @@ +{ + "_comment": "Item", + "item.guideapi.book": "Guide Book", + + "_comment": "Button hovering text", + "guideapi.button.back": "Back", + "guideapi.button.next": "Next", + "guideapi.button.prev": "Previous", + "guideapi.button.search": "Search", + + "_comment": "Text to draw", + "guideapi.text.crafting.shaped": "Shaped Crafting", + "guideapi.text.crafting.shapeless": "Shapeless Crafting", + "guideapi.text.furnace.smelting": "Smelting", + "guideapi.text.linked.open": "Sneak + Use to open", + "guideapi.text.brewing.brew": "Brewing", + "guidepai.text.brewing.error": "&cError in the recipe", + + "_comment": "Test", + "guideapi.test.format": "This i\\ns a formatting\\n\\ttest", + "guideapi.test.category": "Test Category", + "guideapi.test.entry": "Test Entry", + + "_comment": "Unused", + "text.furnace.error": "&cError in the recipe", + "text.book.warning": "&c[WARNING] Delete this item, it has no associated book!", + "text.book.creative": "Creative Book", + "text.book": "Book: %s", + "text.category": "Category: %s", + "text.entry": "Entry: %s", + "text.page": "Page: %s", + "text.open.failed": "Something stopped you from opening this book" +} \ No newline at end of file diff --git a/src/main/resources/assets/guideapi/lang/ru_RU.lang b/src/main/resources/assets/guideapi/lang/ru_RU.lang deleted file mode 100644 index c433f3f6..00000000 --- a/src/main/resources/assets/guideapi/lang/ru_RU.lang +++ /dev/null @@ -1,22 +0,0 @@ -#Creative Tab -itemGroup.guideapi.creativeTab=Guide-API - -#Item -item.GuideBook.name=Стандартная книга Guide-API - -#Button hovering text -button.back.name=Назад -button.next.name=След. -button.prev.name=Пред. - -#Text to draw -text.shaped.crafting=Форменное создание -text.shapeless.crafting=Бесформенное создание -text.furnace.smelting=Плавка -text.furnace.error=&cОшибка в рецепте -text.book.warning=&c[ВНИМАНИЕ] Выкиньте этот предмет, у него нет связанной книги! -text.book.creative=Творческая книга -text.book=Книга: %s -text.category=Категория: %s -text.entry=Запись: %s -text.page=Страница: %s diff --git a/src/main/resources/assets/guideapi/lang/ru_ru.json b/src/main/resources/assets/guideapi/lang/ru_ru.json new file mode 100644 index 00000000..7ec19e7b --- /dev/null +++ b/src/main/resources/assets/guideapi/lang/ru_ru.json @@ -0,0 +1,21 @@ +{ + "_comment": "Item", + "item.guideapi.book": "Стандартная книга Guide-API", + + "_comment": "Button hovering text", + "guideapi.button.back": "Назад", + "guideapi.button.next": "След.", + "guideapi.button.prev": "Пред.", + + "_comment": "Text to draw", + "guideapi.text.crafting.shaped": "Форменное создание", + "guideapi.text.crafting.shapeless": "Бесформенное создание", + "guideapi.text.furnace.smelting": "Плавка", + "text.furnace.error": "&cОшибка в рецепте", + "text.book.warning": "&c[ВНИМАНИЕ] Выкиньте этот предмет, у него нет связанной книги!", + "text.book.creative": "Творческая книга", + "text.book": "Книга: %s", + "text.category": "Категория: %s", + "text.entry": "Запись: %s", + "text.page": "Страница: %s" +} \ No newline at end of file diff --git a/src/main/resources/assets/guideapi/lang/zh_CN.lang b/src/main/resources/assets/guideapi/lang/zh_CN.lang deleted file mode 100644 index ee344656..00000000 --- a/src/main/resources/assets/guideapi/lang/zh_CN.lang +++ /dev/null @@ -1,22 +0,0 @@ -#Creative Tab -itemGroup.guideapi.creativeTab=Guide-API - -#Item -item.guideapi.book.name=Guide-API 默认书 - -#Button hovering text -button.back.name=返回 -button.next.name=下一页 -button.prev.name=上一页 - -#Text to draw -text.shaped.crafting=普通配方 -text.shapeless.crafting=无形配方 -text.furnace.smelting=冶炼 -text.furnace.error=&c合成配方出错 -text.book.warning=&c[警告] 删除这个物品, 它没有关联的书! -text.book.creative=创造模式书本 -text.book=书: %s -text.category=类别: %s -text.entry=条目: %s -text.page=页码: %s diff --git a/src/main/resources/assets/guideapi/lang/zh_cn.json b/src/main/resources/assets/guideapi/lang/zh_cn.json new file mode 100644 index 00000000..b53e2544 --- /dev/null +++ b/src/main/resources/assets/guideapi/lang/zh_cn.json @@ -0,0 +1,21 @@ +{ + "_comment": "Item", + "item.guideapi.book": "Guide-API 默认书", + + "_comment": "Button hovering text", + "guideapi.button.back": "返回", + "guideapi.button.next": "下一页", + "guideapi.button.prev": "上一页", + + "_comment": "Text to draw", + "guideapi.text.crafting.shaped": "普通配方", + "guideapi.text.crafting.shapeless": "无形配方", + "guideapi.text.furnace.smelting": "冶炼", + "text.furnace.error": "&c合成配方出错", + "text.book.warning": "&c[警告] 删除这个物品, 它没有关联的书!", + "text.book.creative": "创造模式书本", + "text.book": "书: %s", + "text.category": "类别: %s", + "text.entry": "条目: %s", + "text.page": "页码: %s" +} \ No newline at end of file From 1227fac7d4a6d53adb0b6e3d3804e28d2ab8a287 Mon Sep 17 00:00:00 2001 From: maxanier Date: Tue, 31 Mar 2020 18:50:54 +0200 Subject: [PATCH 15/28] Fix models. Still prints a missing model warning --- .../guideapi/RegistrarGuideAPI.java | 52 ++++++++++++------ .../amerifrance/guideapi/api/GuideAPI.java | 38 +------------ .../amerifrance/guideapi/api/IGuideBook.java | 10 ++-- .../guideapi/item/ItemGuideBook.java | 9 ++- .../amerifrance/guideapi/test/TestBook.java | 2 +- .../amerifrance/guideapi/test/TestBook2.java | 2 +- .../{itemguidebook.json => guidebook.json} | 0 .../guideapi/textures/items/book_base.png | Bin 16111 -> 7660 bytes 8 files changed, 51 insertions(+), 62 deletions(-) rename src/main/resources/assets/guideapi/models/item/{itemguidebook.json => guidebook.json} (100%) diff --git a/src/main/java/amerifrance/guideapi/RegistrarGuideAPI.java b/src/main/java/amerifrance/guideapi/RegistrarGuideAPI.java index 476eaab7..7f30de79 100644 --- a/src/main/java/amerifrance/guideapi/RegistrarGuideAPI.java +++ b/src/main/java/amerifrance/guideapi/RegistrarGuideAPI.java @@ -6,9 +6,17 @@ import amerifrance.guideapi.item.ItemGuideBook; import amerifrance.guideapi.util.APISetter; import amerifrance.guideapi.util.AnnotationHandler; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.model.IBakedModel; +import net.minecraft.client.renderer.model.ModelResourceLocation; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; +import net.minecraftforge.client.event.ModelBakeEvent; import net.minecraftforge.client.event.ModelRegistryEvent; +import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; @@ -31,26 +39,34 @@ public static void registerItems(RegistryEvent.Register event) { APISetter.setBookForStack(book, new ItemStack(guideBook)); } } -// TODO -// @SubscribeEvent(priority = EventPriority.LOWEST) -// public static void registerRecipes(RegistryEvent.Register event) { -// for (Pair guide : AnnotationHandler.BOOK_CLASSES) { -// IRecipe recipe = guide.getRight().getRecipe(GuideAPI.getStackFromBook(guide.getLeft())); -// if (recipe != null) -// event.getRegistry().register(recipe); -// } -// -// for (Book book : GuideAPI.getBooks().values()) -// for (CategoryAbstract cat : book.getCategoryList()) -// for (EntryAbstract entry : cat.entries.values()) -// for (IPage page : entry.pageList) -// if (page instanceof PageJsonRecipe) -// ((PageJsonRecipe) page).init(); -// } + @SubscribeEvent + @OnlyIn(Dist.CLIENT) public static void registerModels(ModelRegistryEvent event) { - for (Pair guide : AnnotationHandler.BOOK_CLASSES) - guide.getRight().handleModel(GuideAPI.getStackFromBook(guide.getLeft())); + for (Pair guide : AnnotationHandler.BOOK_CLASSES){ + ResourceLocation loc=guide.getRight().getModel(); + if (loc!=null){ + ModelLoader.addSpecialModel(new ModelResourceLocation(loc,"inventory")); + } + } + } + + @SubscribeEvent + @OnlyIn(Dist.CLIENT) + public static void bakeModel(ModelBakeEvent event) { + for (Pair guide : AnnotationHandler.BOOK_CLASSES) { + ResourceLocation loc=guide.getRight().getModel(); + if (loc!=null){ + ModelResourceLocation newMrl = new ModelResourceLocation(loc,"inventory"); + Item bookItem = GuideAPI.getStackFromBook(guide.getLeft()).getItem(); + ModelResourceLocation oldMrl = new ModelResourceLocation(bookItem.getRegistryName(),"inventory"); + IBakedModel model= event.getModelRegistry().get(newMrl); + + event.getModelRegistry().put(oldMrl, model); + + } + } + } } diff --git a/src/main/java/amerifrance/guideapi/api/GuideAPI.java b/src/main/java/amerifrance/guideapi/api/GuideAPI.java index 8f6e0413..613fb3c2 100644 --- a/src/main/java/amerifrance/guideapi/api/GuideAPI.java +++ b/src/main/java/amerifrance/guideapi/api/GuideAPI.java @@ -3,7 +3,10 @@ import amerifrance.guideapi.api.impl.Book; import com.google.common.collect.*; import net.minecraft.block.Block; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.ItemModelMesher; import net.minecraft.client.renderer.model.ModelResourceLocation; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraftforge.api.distmarker.Dist; @@ -44,41 +47,6 @@ public static void registerInfoRenderer(Book book, IInfoRenderer infoRenderer, C INFO_RENDERERS.get(book).put(blockClass, infoRenderer); } - /** - * Helper method for setting a model for your book. - *

- * Use if you wish to use a custom model. - *

- * Only call AFTER you have registered your book. - * - * @param book - Book to set model for - * @param modelLoc - Location of the model file - * @param variantName - Variant to use - */ - @OnlyIn(Dist.CLIENT) - public static void setModel(Book book, ResourceLocation modelLoc, String variantName) { - ModelResourceLocation mrl = new ModelResourceLocation(modelLoc, variantName); -// ModelLoader.setCustomModelResourceLocation( -// getStackFromBook(book).getItem(), -// 0, -// mrl -// ); TODO - } - - /** - * Helper method for setting a model for your book. - *

- * Use if you wish to use the default model with color. - *

- * Only call AFTER you have registered your book. - * - * @param book - Book to set model for - */ - @OnlyIn(Dist.CLIENT) - public static void setModel(Book book) { - setModel(book, new ResourceLocation("guideapi", "ItemGuideBook"), "inventory"); - } - public static void initialize() { // No-op. Just here to initialize fields. } diff --git a/src/main/java/amerifrance/guideapi/api/IGuideBook.java b/src/main/java/amerifrance/guideapi/api/IGuideBook.java index 4e962239..af81a475 100644 --- a/src/main/java/amerifrance/guideapi/api/IGuideBook.java +++ b/src/main/java/amerifrance/guideapi/api/IGuideBook.java @@ -3,6 +3,7 @@ import amerifrance.guideapi.api.impl.Book; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; +import net.minecraft.util.ResourceLocation; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import javax.annotation.Nonnull; @@ -20,13 +21,12 @@ public interface IGuideBook { Book buildBook(); /** - * Use this to handle setting the model of your book. Only exists on the client. - * - * @param bookStack - The ItemStack assigned to your book. + * @return The resource location of your own model or null if you want handle rendering yourself somehow */ + @Nullable @OnlyIn(Dist.CLIENT) - default void handleModel(@Nonnull ItemStack bookStack) { - GuideAPI.setModel(((IGuideItem) bookStack.getItem()).getBook(bookStack)); + default ResourceLocation getModel(){ + return new ResourceLocation("guideapi","guidebook"); } /** diff --git a/src/main/java/amerifrance/guideapi/item/ItemGuideBook.java b/src/main/java/amerifrance/guideapi/item/ItemGuideBook.java index 46e91abb..1267e658 100644 --- a/src/main/java/amerifrance/guideapi/item/ItemGuideBook.java +++ b/src/main/java/amerifrance/guideapi/item/ItemGuideBook.java @@ -24,6 +24,7 @@ import net.minecraftforge.common.MinecraftForge; import javax.annotation.Nonnull; +import javax.annotation.Nullable; import java.util.List; public class ItemGuideBook extends Item implements IGuideItem { @@ -36,11 +37,15 @@ public class ItemGuideBook extends Item implements IGuideItem { public ItemGuideBook(Book book) { super(new Item.Properties().maxStackSize(1).group(book.getCreativeTab())); this.book = book; - - setTranslation_key(GuideMod.ID + ".book." + book.getRegistryName().getNamespace() + "." + book.getRegistryName().getPath()); } + @Nullable + @Override + public String getCreatorModId(ItemStack itemStack) { + return book.getRegistryName().getNamespace(); + } + @Override protected String getDefaultTranslationKey() { if (this.translation_key == null) { diff --git a/src/main/java/amerifrance/guideapi/test/TestBook.java b/src/main/java/amerifrance/guideapi/test/TestBook.java index eb5f0283..42d5997f 100644 --- a/src/main/java/amerifrance/guideapi/test/TestBook.java +++ b/src/main/java/amerifrance/guideapi/test/TestBook.java @@ -44,7 +44,7 @@ public class TestBook implements IGuideBook { @Override public Book buildBook() { BookBinder binder = new BookBinder(new ResourceLocation("guideapi","test_book")); - binder.setAuthor("TehNut").setColor(Color.GRAY).setItemName("Display Name").setHeader("Hello there").setGuideTitle("Title message").setContentProvider(this::buildContent); + binder.setAuthor("TehNut").setColor(Color.PINK).setItemName("Display Name").setHeader("Hello there").setGuideTitle("Title message").setContentProvider(this::buildContent); return (book = binder.build()); } diff --git a/src/main/java/amerifrance/guideapi/test/TestBook2.java b/src/main/java/amerifrance/guideapi/test/TestBook2.java index 007aa8c1..1360bb86 100644 --- a/src/main/java/amerifrance/guideapi/test/TestBook2.java +++ b/src/main/java/amerifrance/guideapi/test/TestBook2.java @@ -35,7 +35,7 @@ public class TestBook2 implements IGuideBook { @Override public Book buildBook() { BookBinder binder = new BookBinder(new ResourceLocation("guideapi","test_book2")); - binder.setAuthor("TehNut").setColor(Color.GRAY).setItemName("Display Name").setHeader("Hello there").setGuideTitle("Title message").setContentProvider(this::buildContent); + binder.setAuthor("TehNut").setColor(new Color(80,50,5)).setItemName("Display Name").setHeader("Hello there").setGuideTitle("Title message").setContentProvider(this::buildContent); diff --git a/src/main/resources/assets/guideapi/models/item/itemguidebook.json b/src/main/resources/assets/guideapi/models/item/guidebook.json similarity index 100% rename from src/main/resources/assets/guideapi/models/item/itemguidebook.json rename to src/main/resources/assets/guideapi/models/item/guidebook.json diff --git a/src/main/resources/assets/guideapi/textures/items/book_base.png b/src/main/resources/assets/guideapi/textures/items/book_base.png index d66560bc717a3e99937541af6aaef7dad99703e2..2e6710aadbf5472e3db144bbe1b2931efae2ceac 100644 GIT binary patch literal 7660 zcmeHLdpuP6`=4|n%aSeWYMLlrX6DSzT-JSD5`$%miOQLC&M?fanZeMVe3L|_+bUbw zh(b%2FZE3qMJTqUw5d%O-6+ycw%?fzA}XN( zgHg5Q`v?BoW@YduWL)ux%__qBd(7fE-k)QwPyYM)gcvD8Rf^$5e|C-$AK*C5DOc%0zl0%<gqQ1 zI1a=<6~`^R5x3gmO%c$U&>lYA$}r{ep^zlgv+egfih3L_5nY6q?RBK~01VUol+FCg zw&3+y7TXRK7hrSl=Y2DuR%0A6;atE)PwP|9vI??s&K~JHVVUz+yu|6w=SFwIA*48+ znUdg5WxoFV8p)3X>VA>1E+3r1zawbaZZLyl)>WIis`;h+574F2W6pP;(O=fcC7j$< zS5J>wYfLefc3=X|WiCD5uIoE8u44_8AIICNNW4|IA8)4;JX0LF;0JO;!*v|il}w2x z8H_qYf0RUL8IOe4KqDL{Z22y5c5o%b&Cqcx^89BVm$Y!m6L4E9zb!1^vfE)DbYa-< z7U!|Gi*)-&Ov=c3bcJ_sPt*yQJ6mgiI@WW3x%nGUIa7A{#7J|eglX}UnJw*^DbvpE z;(Ki~V>VdsbxNGIe~&vdcN@vy^{s(-#>pyE{}rPxcW~wLEAsLSUQY}=lzZ28)1=>= zyYWY^_|{%OknGtgj=KJ$0rIvr3Kc&&e9F-NWWw}KM|pvV?9S;P`mt)_6wmrqVDYFz zeaCEol3rFb!EAbXrD~UfLj#q0u`$3S_1`r=daYysq32j$vnfnK9;Gj)-~QLt-xt>% ztJ*Dpif?WAuFG}5{`SNkoe1yN|A6`R%L}F^rRT`_c@uJsR+3%f-NKLl8Qzz*p{%%q zp6h+DTFlE12$@R|cRWp)_fXPD?LJz%I_RKuQp|a}QP(T|nw~pOVGMRxL%{;ok=%&# zyY+piTBzfylEir96(+TYzZ}7uB<>uOUMF|D{lK!EQg*r3F!pp84=B=EV|pdaEMIiK zO?A`4I63#x?!txlf2xaHzWjxX=TlJY&GpcQ{jRp!&5J91%$p++_9i@WIX-z`CDG0O+m?koMLlQ26K~n{ zS=w%{zgFV*Y_{FZ2RZn;5%q6op9|lSW4gY(BCGY6ykF^uOS!cItLrp|yzEHKEXv~8 zI^}4&dHL@hT^Aou_#@-gchlccO@nHyu9n5W)=Q6SJ-Fa;+^;=rdm~4}9g`mZx%2+g z>latG^cMKLUdv%VP68rN(%i~@Qq$_4TE?@(%(IvDczLzzUWxA&yhvZSwB+%Q-c^y7 zxi=Pn_lG||u)=@i>nFI$fe)q7GcdnZk57Gb)&H$dhv(^Pt4?td1~V*P$Y%Svv)S)T z8d}KqtlVNd@07#js-=GWapOjQpP(l=5F6~sJ^jN$pLO~f3qzYu-2Tld!=1hL)-9_t z)5&iF4zbD@43KXyVYrk7~Y+GS4EMxJ$B@uf%p|iPrF(*Q9&X>Nfr3JrE zeHP}oaq6(^*D9+b{QRD;shzT~vt~2r>h@S_{EDe6`z+}>onxgA_wt$pA@dv~hqUtf ztr*?)m9n)(%_~~3H?~|m9x}174|D9HylP+e0Rs$X>=_~2V*)syEJ!LQfUuO05L99r z+Ji6{8+(-ugu)RemXCx8CAPTEisLw}5Vpnn(>MS}#zsPg^J3(PUyK(QiV269FwWji z-$unk0mO(B#Hz$1iGroF#c6O^=>O_vA`YuzQHI;%0ysWcwp5N_sRSwkz`Lk~kz|~m zKGsGK3s}C+uKf_`lPxY(sg$vZ#Hgq!LKKA{m4^^XOeT{Ekcnh69_7F*q9saDg_kI% zt0A-)&WHk%3uQ{7RDxAwf_!O&(iVq9>DYd7lnS}1(8YcQ>SqnSLJ1Sy(FZE(56VC! z0{{aLknvRgqlPF@WYT;5>XBqX;yr)Vl#dLNg-VrDMW|HvX_*1?M}kVB;4k#3 zDIc+;ZhczAyM594tl2-7vlNO@JLm5FE?r?MB!pQ5#;{1%0vIAO$aomCrr=2=gofu^ zTSIt02$PvqCJkg#=|ceBB?=`dfequo_EJq)ATO64H46gWyK&3z`7u(`Ig^~!>Ab~3sBYsLy9Xb+?L9?b)$W(wvrPHX^ zgG>t%xdJ^>YD^M9ATcx)7-G4ih#;EULNOSE5M`1O4MCj*EVfi6mHVLu1wnxamwkjP zL=@nRDwSvvNm?};84Z#5F>!EHG^iXYjDk`$pz1_mp@BoU5>%i1cgi&D>hmOuP%kf# z2vIY&!Pbxh25Gi9I(pOrfJjpR4x;it%YtqUi!Db$CE|=;C^kT{)>I2?E&#B|G!{U@ z0}NI_-~hK&&Xr0iOC{SS+oz~&?pE6(SOISu8dfl z{+h?~ltP*)X$^-pL~Y@80z-&eUgGDNKSJ^gl}1VaJDfq*0Tf5MGD<2B_m+F}!w^XM zd7Mu%4sXTg!em`WH_DLHakx*G6sqL2!dQJ@@g3_(-d7U!sL)mWc*l@yDPRA|Ogu~z;< z2`r6L%zEF3s8B?GTK_U9wR_#)H2=am1sI8Z;2IPPNe24q3AIrVKOdZ78})F+a#wdHzX+L3Bt+!z zpKUFY4e>AdhRAD5rSxybhq7s<*-}|F+R#Il-cgdzs{aI|7Qs^ppFqh<4W z3Jm6(@6^{YOxhkZbWvC7&T-MbJ>1-wICkRqYdIK<4%^+?k;|yvpL)!r2pqej5hZPxqOc8_P%de$r~^-hm! z=Nx#EzrXk=qw}46Zdm4>lRDkKdw12`YMA```Eysm?B_-K=bDdpFK(-=OVV-9`XQ*f zs@oqQi$PD=RTqMGKcKSz=~xe%37O?e^fLMj0b1 z?_5*UxXX)X%$T8+O1*=cM+QR>dss(jXRlo6j2Z1rC~iw|OiWr%&P>C2r-1M=V|amq z7rVO^m>oNI{Cx5LzPvt;4kj)xj*-mHxd^Uaz0}pst!de00+IN1)qt${6q^GELU&7F6!i7yf*iL4J+R8*LxoGod7xJ)iT+1R+n#?G#&q{Q-$ zoL5j-cmp922zhOcLxqJNtaL$iG%vNr!u(W6M@RJ?Ihjm$vM`yJ?&X)iaF*%DnB~iR z|BSzQ(eKyN(w-+zeEyv3v3~vf9~LB5W!7D|kUGx-HQ-P|L0IXvsuwE{m2|px*%;k; z!Q=57TmURz;m_nyY*)Hzvds; zMR@vRytP}SsKvJ#zXjCO=^Bc1k0`+|y({odK~kd@QC361l8VM*Z>VcX#YL$f=%x_p zQDPqR<-@O;O^WO>Z?Om1K)ea`Dy_o_uz9#GC=K^ZF4^4Rt#YRX=pYJo(UgitVw#Zh zm@|F_cx^N@W>cn%-tRFt8UamRfp$}qngAxd#ZF5s&zYPq3um`Go%~%Up5<%|%Q2jl z=3Ii!Ca|n2cbL6Z@XDQ#!$OCzB^M4#9&@j*#|4H-CX<$=)uJYP7|!K#F)YvUJPmu$ z+E7dvQ*=zbGwUSp#|Jbip~Q7XjhPI;Vn`j(J!Z2JsBq-w6^$1H#k3qdNRdg2afY+7 zOeG^(D%iva5|PZ%WQhS05Ct(^gLYg+yLhjvt6Hx*PsoCL-oP*?fj}X4#qma?6+>%! z^B_c!Lt4>N3l7Br(*ZPfAR&R~K{%B=E6rY4!o}p2c``Kfjvb_wdCUw=)-1CWvKey2 zxe84QAnIx&sHzcfc9pf~5t^EsGONl|yG4n~YEr9nGpI>1-$if0C+ffp*Q0}Gd75_w zSytff0?W~CJzSL~PO?1_9|2WX!b7MJxTZOqU@!Ag(i8Oo_m3><;thEz?OWnUmV~gH zh>E&biHbddiN|`}OtG<~XJJ(dO=?6 z4%!LqAqUHeY$z;d)<(H`ab!8y`RLH~JQH_>Wr?fj@e|LEv&7k)K;KFzu$+sLl0L>< zWH=W|bh1vT3()nPB+)!;V{p0nlC{HfF666}1wc>nj(U;xiXmwLrm50Je~ zerEZG|E0{`SUt>6_)}#Ly=DF%WG=fC%WGo3&d#l&ZsTc5fb|#F0x?tfI5#t=t+-~g z{kx1h8X3s+ck(Pe7|!_5nU<4T@FKy5=YwboE(8c(B)IT=5G}!l z0Ktm{7oHEICAbhEc#+`3^Fg!(7Xkz?5?pvbh?d|&fZ#=f3(p795?lxnyhw22`5;t8Yqt z^4`?7(POdSubWu$nEIsSXQOA9e`WWgMQ`ek6?N+#99g`~EKg1U+5Ex8j^EUEq{9!p z-kMDRaP4eM?eePY_f#+Hv#m;;nC`lMwz2=fD~Eo2n-6xk# z9(=#v`}zX^lflF9b-p&W(*Jg!eff^&8tLwi=TF@_v`?yE{r<&^n;NTUoD2Nj{a>9t zIKK8&#Iex7d(*n~zJ1Sq@73*pJ#wz^kUlh2H+8kSqt~`-cx2=Y$2{jJCvR!}dB;nC znVnrd5!%);litO(bU*d%*$;2}L(PGA`tMq?cxSNYVe?DV`eV1Bkoh<6_uk?kos?eb z{D#}(xx+usESkDH@W2COd-klXk*+*5^VX$Hm)M#mJ71_fckUd!`b*22Pp#bWZ2Rlb zbYkKmZ$rbudoAMQXTIyZeED+io;N=lS=0U09ZQ;A7vuxi`k_@?>pQgd-Po_XEPMX= z%Ox+rT{Si~_G0JDwYxXPPaL~?ZTsD~KlsRgVeb=vcTXNYy6}b5b9pSJEzr|q->vVF_9$Bj?Y{mpH@ KUu?MVNB;quL&&fI From 9cfa7fa62199ddb029fc70225d954b2030b308f8 Mon Sep 17 00:00:00 2001 From: maxanier Date: Tue, 31 Mar 2020 22:03:33 +0200 Subject: [PATCH 16/28] Remove unicode flag. I am not sure what this was required for, but both unicode and non unicode seems to be working fine in 1.14 --- gradle.properties | 4 ++-- .../java/amerifrance/guideapi/api/impl/Entry.java | 9 +-------- .../api/impl/abstraction/EntryAbstract.java | 15 +++------------ .../guideapi/entry/EntryItemStack.java | 12 ++---------- .../guideapi/entry/EntryResourceLocation.java | 13 ++----------- .../java/amerifrance/guideapi/test/TestBook2.java | 2 ++ 6 files changed, 12 insertions(+), 43 deletions(-) diff --git a/gradle.properties b/gradle.properties index cd2ce77f..78c79a4e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,8 +9,8 @@ forge_version=28.2.0 mcp_mappings=58-1.14.4 mcp_channel=stable -mod_version=2.1.8 -api_version=2.0.0 +mod_version=2.2.0 +api_version=2.2.0 curse_id=228832 jei_version=6.0.0.13 diff --git a/src/main/java/amerifrance/guideapi/api/impl/Entry.java b/src/main/java/amerifrance/guideapi/api/impl/Entry.java index df96c081..7f636a96 100644 --- a/src/main/java/amerifrance/guideapi/api/impl/Entry.java +++ b/src/main/java/amerifrance/guideapi/api/impl/Entry.java @@ -21,16 +21,9 @@ public class Entry extends EntryAbstract { - public Entry(List pageList, String name, boolean unicode) { - super(pageList, name, unicode); - } public Entry(List pageList, String name) { - super(pageList, name, false); - } - - public Entry(String name, boolean unicode) { - super(name, unicode); + super(pageList, name); } public Entry(String name) { diff --git a/src/main/java/amerifrance/guideapi/api/impl/abstraction/EntryAbstract.java b/src/main/java/amerifrance/guideapi/api/impl/abstraction/EntryAbstract.java index a12cc752..1ccc490a 100644 --- a/src/main/java/amerifrance/guideapi/api/impl/abstraction/EntryAbstract.java +++ b/src/main/java/amerifrance/guideapi/api/impl/abstraction/EntryAbstract.java @@ -18,26 +18,17 @@ public abstract class EntryAbstract { public final List pageList; public final String name; - public boolean unicode; - public EntryAbstract(List pageList, String name, boolean unicode) { + public EntryAbstract(List pageList, String name) { this.pageList = pageList; this.name = name; - this.unicode = unicode; - } - - public EntryAbstract(List pageList, String name) { - this(pageList, name, false); - } - - public EntryAbstract(String name, boolean unicode) { - this(Lists.newArrayList(), name, unicode); } public EntryAbstract(String name) { - this(name, false); + this(Lists.newArrayList(), name); } + public void addPage(IPage page) { this.pageList.add(page); } diff --git a/src/main/java/amerifrance/guideapi/entry/EntryItemStack.java b/src/main/java/amerifrance/guideapi/entry/EntryItemStack.java index 73869273..448e610d 100644 --- a/src/main/java/amerifrance/guideapi/entry/EntryItemStack.java +++ b/src/main/java/amerifrance/guideapi/entry/EntryItemStack.java @@ -17,20 +17,12 @@ public class EntryItemStack extends Entry { public ItemStack stack; - public EntryItemStack(List pageList, String name, ItemStack stack, boolean unicode) { - super(pageList, name, unicode); - this.stack = stack; - } - public EntryItemStack(List pageList, String name, ItemStack stack) { - this(pageList, name, stack, false); - } - - public EntryItemStack(String name, boolean unicode, ItemStack stack) { - super(name, unicode); + super(pageList, name); this.stack = stack; } + public EntryItemStack(String name, ItemStack stack) { super(name); this.stack = stack; diff --git a/src/main/java/amerifrance/guideapi/entry/EntryResourceLocation.java b/src/main/java/amerifrance/guideapi/entry/EntryResourceLocation.java index d14f45e0..677a8852 100644 --- a/src/main/java/amerifrance/guideapi/entry/EntryResourceLocation.java +++ b/src/main/java/amerifrance/guideapi/entry/EntryResourceLocation.java @@ -18,18 +18,9 @@ public class EntryResourceLocation extends Entry { public ResourceLocation image; - public EntryResourceLocation(List pageList, String name, ResourceLocation resourceLocation, boolean unicode) { - super(pageList, name, unicode); - this.image = resourceLocation; - } - public EntryResourceLocation(List pageList, String name, ResourceLocation resourceLocation) { - this(pageList, name, resourceLocation, false); - } - - public EntryResourceLocation(String name, boolean unicode, ResourceLocation image) { - super(name, unicode); - this.image = image; + super(pageList, name); + this.image = resourceLocation; } public EntryResourceLocation(String name, ResourceLocation image) { diff --git a/src/main/java/amerifrance/guideapi/test/TestBook2.java b/src/main/java/amerifrance/guideapi/test/TestBook2.java index 1360bb86..5571e45f 100644 --- a/src/main/java/amerifrance/guideapi/test/TestBook2.java +++ b/src/main/java/amerifrance/guideapi/test/TestBook2.java @@ -53,6 +53,8 @@ private void buildContent(List categories) { testCategory.getEntry("entry").addPage(new PageJsonRecipe(new ResourceLocation("bread"))); testCategory.getEntry("entry").addPage(new PageJsonRecipe(new ResourceLocation("redstone"))); testCategory.getEntry("entry").addPageList(PageHelper.pagesForLongText("guideapi.test.format")); + testCategory.addEntry("unicode",new EntryItemStack("Творческая книга",new ItemStack(Items.BEEF))); + testCategory.getEntry("unicode").addPage(new PageText("Творческая книга \u0F06")); categories.add(testCategory); } } From aeb6f232261f3d9584ab5f3c23b139d681dd2551 Mon Sep 17 00:00:00 2001 From: maxanier Date: Fri, 3 Apr 2020 12:30:42 +0200 Subject: [PATCH 17/28] Cleanup and fixes --- src/main/java/amerifrance/guideapi/api/impl/Entry.java | 3 +-- src/main/java/amerifrance/guideapi/api/impl/Page.java | 6 ------ .../java/amerifrance/guideapi/api/util/PageHelper.java | 10 +--------- .../java/amerifrance/guideapi/api/util/TextHelper.java | 3 ++- .../guideapi/category/CategoryItemStack.java | 2 +- .../guideapi/category/CategoryResourceLocation.java | 2 +- src/main/java/amerifrance/guideapi/gui/HomeScreen.java | 5 +++-- .../java/amerifrance/guideapi/page/PageIRecipe.java | 6 ++++-- .../java/amerifrance/guideapi/page/PageJsonRecipe.java | 3 +++ src/main/java/amerifrance/guideapi/page/PageText.java | 3 ++- .../java/amerifrance/guideapi/page/PageTextImage.java | 1 - src/main/resources/assets/guideapi/lang/en_us.json | 2 +- 12 files changed, 19 insertions(+), 27 deletions(-) diff --git a/src/main/java/amerifrance/guideapi/api/impl/Entry.java b/src/main/java/amerifrance/guideapi/api/impl/Entry.java index 7f636a96..e225450b 100644 --- a/src/main/java/amerifrance/guideapi/api/impl/Entry.java +++ b/src/main/java/amerifrance/guideapi/api/impl/Entry.java @@ -66,8 +66,7 @@ public void drawExtras(Book book, CategoryAbstract category, int entryX, int ent cutString = true; if (GuiHelper.isMouseBetween(mouseX, mouseY, entryX, entryY, entryWidth, entryHeight) && cutString) { - - GuiUtils.drawHoveringText(Collections.singletonList(getLocalizedName()), entryX, entryY + 12,entryWidth,entryHeight,-1,fontRendererObj); + guiBase.renderTooltip(getLocalizedName(),entryX,entryY+12); } diff --git a/src/main/java/amerifrance/guideapi/api/impl/Page.java b/src/main/java/amerifrance/guideapi/api/impl/Page.java index 20a601d9..9632dcd9 100644 --- a/src/main/java/amerifrance/guideapi/api/impl/Page.java +++ b/src/main/java/amerifrance/guideapi/api/impl/Page.java @@ -13,8 +13,6 @@ public class Page implements IPage { - protected boolean unicode; - @Override @OnlyIn(Dist.CLIENT) public void draw(Book book, CategoryAbstract category, EntryAbstract entry, int guiLeft, int guiTop, int mouseX, int mouseY, BaseScreen guiBase, FontRenderer fontRendererObj) { @@ -45,10 +43,6 @@ public void onRightClicked(Book book, CategoryAbstract category, EntryAbstract e public void onInit(Book book, CategoryAbstract category, EntryAbstract entry, PlayerEntity player, ItemStack bookStack, EntryScreen guiEntry) { } - public void setUnicodeFlag(boolean flag) { - this.unicode = flag; - } - @Override public boolean equals(Object o) { if (this == o) return true; diff --git a/src/main/java/amerifrance/guideapi/api/util/PageHelper.java b/src/main/java/amerifrance/guideapi/api/util/PageHelper.java index 127f6025..0d6d89ba 100644 --- a/src/main/java/amerifrance/guideapi/api/util/PageHelper.java +++ b/src/main/java/amerifrance/guideapi/api/util/PageHelper.java @@ -18,15 +18,7 @@ import java.util.List; public class PageHelper { - - public static List setPagesToUnicode(List pages) { - for (IPage page : pages) - if (page instanceof Page) - ((Page) page).setUnicodeFlag(true); - - return pages; - } - + public static List pagesForLongText(String locText, int maxLength) { List pageList = new ArrayList(); for (String s : WordUtils.wrap(locText, maxLength, "/cut", false).split("/cut")) pageList.add(new PageText(s)); diff --git a/src/main/java/amerifrance/guideapi/api/util/TextHelper.java b/src/main/java/amerifrance/guideapi/api/util/TextHelper.java index d50bdd5e..f135691b 100644 --- a/src/main/java/amerifrance/guideapi/api/util/TextHelper.java +++ b/src/main/java/amerifrance/guideapi/api/util/TextHelper.java @@ -1,6 +1,7 @@ package amerifrance.guideapi.api.util; import net.minecraft.client.resources.I18n; +import net.minecraftforge.fml.ForgeI18n; import org.apache.commons.lang3.text.WordUtils; import java.util.ArrayList; @@ -13,7 +14,7 @@ public static String getFormattedText(String string) { } public static String localize(String input, Object... format) { - return I18n.format(input, format); + return ForgeI18n.parseMessage(input, format); } public static String localizeEffect(String input, Object... format) { diff --git a/src/main/java/amerifrance/guideapi/category/CategoryItemStack.java b/src/main/java/amerifrance/guideapi/category/CategoryItemStack.java index 46219d7f..64973a89 100644 --- a/src/main/java/amerifrance/guideapi/category/CategoryItemStack.java +++ b/src/main/java/amerifrance/guideapi/category/CategoryItemStack.java @@ -39,7 +39,7 @@ public void draw(Book book, int categoryX, int categoryY, int categoryWidth, int @OnlyIn(Dist.CLIENT) public void drawExtras(Book book, int categoryX, int categoryY, int categoryWidth, int categoryHeight, int mouseX, int mouseY, BaseScreen guiBase, boolean drawOnLeft, ItemRenderer renderItem) { if (canSee(guiBase.player, guiBase.bookStack) && GuiHelper.isMouseBetween(mouseX, mouseY, categoryX, categoryY, categoryWidth, categoryHeight)) - GuiUtils.drawHoveringText(this.getTooltip(), mouseX, mouseY, categoryWidth,categoryHeight,-1,Minecraft.getInstance().fontRenderer); + guiBase.renderTooltip(this.getTooltip(),mouseX,mouseY); } @Override diff --git a/src/main/java/amerifrance/guideapi/category/CategoryResourceLocation.java b/src/main/java/amerifrance/guideapi/category/CategoryResourceLocation.java index 6cac89f8..0e5dda90 100644 --- a/src/main/java/amerifrance/guideapi/category/CategoryResourceLocation.java +++ b/src/main/java/amerifrance/guideapi/category/CategoryResourceLocation.java @@ -39,7 +39,7 @@ public void draw(Book book, int categoryX, int categoryY, int categoryWidth, int @OnlyIn(Dist.CLIENT) public void drawExtras(Book book, int categoryX, int categoryY, int categoryWidth, int categoryHeight, int mouseX, int mouseY, BaseScreen guiBase, boolean drawOnLeft, ItemRenderer renderItem) { if (canSee(guiBase.player, guiBase.bookStack) && GuiHelper.isMouseBetween(mouseX, mouseY, categoryX, categoryY, categoryWidth, categoryHeight)) - GuiUtils.drawHoveringText(this.getTooltip(), mouseX, mouseY, categoryWidth,categoryHeight,-1,Minecraft.getInstance().fontRenderer); + guiBase.renderTooltip(this.getTooltip(),mouseX,mouseY); } @Override diff --git a/src/main/java/amerifrance/guideapi/gui/HomeScreen.java b/src/main/java/amerifrance/guideapi/gui/HomeScreen.java index 2330e6ab..7b309e3b 100644 --- a/src/main/java/amerifrance/guideapi/gui/HomeScreen.java +++ b/src/main/java/amerifrance/guideapi/gui/HomeScreen.java @@ -2,6 +2,7 @@ import amerifrance.guideapi.api.impl.Book; import amerifrance.guideapi.api.impl.abstraction.CategoryAbstract; +import amerifrance.guideapi.api.util.TextHelper; import amerifrance.guideapi.button.ButtonNext; import amerifrance.guideapi.button.ButtonPrev; import amerifrance.guideapi.button.ButtonSearch; @@ -114,7 +115,7 @@ public void render(int mouseX, int mouseY, float renderPartialTicks) { blit(guiLeft, guiTop, 0, 0, xSize, ySize); minecraft.getTextureManager().bindTexture(outlineTexture); drawTexturedModalRectWithColor(guiLeft, guiTop, 0, 0, xSize, ySize, book.getColor()); - drawCenteredString(font, I18n.format(book.getHeader()).replace("\\n", "\n").replace("&", "\u00a7"), guiLeft + xSize / 2 + 1, guiTop + 15, 0); + drawCenteredString(font, TextHelper.localize(book.getHeader()).replace("\\n", "\n").replace("&", "\u00a7"), guiLeft + xSize / 2 + 1, guiTop + 15, 0); categoryPage = MathHelper.clamp(categoryPage, 0, categoryWrapperMap.size() - 1); @@ -127,7 +128,7 @@ public void render(int mouseX, int mouseY, float renderPartialTicks) { wrapper.drawExtras(mouseX, mouseY, this); drawCenteredString(font, String.format("%d/%d", categoryPage + 1, categoryWrapperMap.asMap().size()), guiLeft + xSize / 2, guiTop + 5 * ySize / 6, 0); - drawCenteredStringWithShadow(font, I18n.format(book.getTitle()), guiLeft + xSize / 2, guiTop - 10, Color.WHITE.getRGB()); + drawCenteredStringWithShadow(font, TextHelper.localize(book.getTitle()), guiLeft + xSize / 2, guiTop - 10, Color.WHITE.getRGB()); buttonPrev.visible = categoryPage != 0; buttonNext.visible = categoryPage != categoryWrapperMap.asMap().size() - 1 && !categoryWrapperMap.asMap().isEmpty(); diff --git a/src/main/java/amerifrance/guideapi/page/PageIRecipe.java b/src/main/java/amerifrance/guideapi/page/PageIRecipe.java index 07fbe584..321b009c 100644 --- a/src/main/java/amerifrance/guideapi/page/PageIRecipe.java +++ b/src/main/java/amerifrance/guideapi/page/PageIRecipe.java @@ -22,6 +22,8 @@ import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; +import javax.annotation.Nullable; + public class PageIRecipe extends Page { @@ -79,7 +81,8 @@ public boolean canSee(Book book, CategoryAbstract category, EntryAbstract entry, } - protected static IRecipeRenderer getRenderer(IRecipe recipe) { + @Nullable + public static IRecipeRenderer getRenderer(IRecipe recipe) { if (recipe == null) { LogHelper.error("Cannot get renderer for null recipe."); return null; @@ -91,7 +94,6 @@ protected static IRecipeRenderer getRenderer(IRecipe recipe) { return new FurnaceRecipeRenderer((FurnaceRecipe)recipe); } else { - LogHelper.error("Cannot get renderer for recipe type "+recipe.getClass().toString()); return null; } } diff --git a/src/main/java/amerifrance/guideapi/page/PageJsonRecipe.java b/src/main/java/amerifrance/guideapi/page/PageJsonRecipe.java index 0851294d..cc126ba2 100644 --- a/src/main/java/amerifrance/guideapi/page/PageJsonRecipe.java +++ b/src/main/java/amerifrance/guideapi/page/PageJsonRecipe.java @@ -47,6 +47,9 @@ public void onInit(Book book, CategoryAbstract category, EntryAbstract entry, Pl else{ if(iRecipeRenderer==null){ iRecipeRenderer = recipeRendererSupplier.apply(recipe); + if(iRecipeRenderer==null){ + LogHelper.error("Did not get renderer for recipe type "+recipe.getClass().toString()+" for recipe "+recipeId.toString()); + } } } } diff --git a/src/main/java/amerifrance/guideapi/page/PageText.java b/src/main/java/amerifrance/guideapi/page/PageText.java index 4b369864..d9e968de 100644 --- a/src/main/java/amerifrance/guideapi/page/PageText.java +++ b/src/main/java/amerifrance/guideapi/page/PageText.java @@ -10,6 +10,7 @@ import net.minecraft.client.resources.I18n; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; +import net.minecraftforge.fml.ForgeI18n; public class PageText extends Page { @@ -35,7 +36,7 @@ public PageText(String draw) { public void draw(Book book, CategoryAbstract category, EntryAbstract entry, int guiLeft, int guiTop, int mouseX, int mouseY, BaseScreen guiBase, FontRenderer fontRendererObj) { - PageHelper.drawFormattedText(guiLeft + 39, guiTop + 12 + yOffset, guiBase, I18n.format(draw)); + PageHelper.drawFormattedText(guiLeft + 39, guiTop + 12 + yOffset, guiBase, ForgeI18n.getPattern(draw)); } diff --git a/src/main/java/amerifrance/guideapi/page/PageTextImage.java b/src/main/java/amerifrance/guideapi/page/PageTextImage.java index 7ae3ae33..a53722f4 100644 --- a/src/main/java/amerifrance/guideapi/page/PageTextImage.java +++ b/src/main/java/amerifrance/guideapi/page/PageTextImage.java @@ -35,7 +35,6 @@ public void draw(Book book, CategoryAbstract category, EntryAbstract entry, int Minecraft.getInstance().getTextureManager().bindTexture(image); GuiHelper.drawSizedIconWithoutColor(guiLeft + 50, guiTop + (drawAtTop ? 60 : 12), guiBase.xSize, guiBase.ySize, 0); - pageText.setUnicodeFlag(unicode); pageText.draw(book, category, entry, guiLeft, guiTop, mouseX, mouseY, guiBase, fontRendererObj); } diff --git a/src/main/resources/assets/guideapi/lang/en_us.json b/src/main/resources/assets/guideapi/lang/en_us.json index de652506..4ca35aff 100644 --- a/src/main/resources/assets/guideapi/lang/en_us.json +++ b/src/main/resources/assets/guideapi/lang/en_us.json @@ -19,7 +19,7 @@ "_comment": "Test", "guideapi.test.format": "This i\\ns a formatting\\n\\ttest", "guideapi.test.category": "Test Category", - "guideapi.test.entry": "Test Entry", + "guideapi.test.entry": "Test Entry which is very very very long", "_comment": "Unused", "text.furnace.error": "&cError in the recipe", From b756bb11def037b8df4ff651bf0a700fe9b54b28 Mon Sep 17 00:00:00 2001 From: maxanier Date: Fri, 3 Apr 2020 12:55:46 +0200 Subject: [PATCH 18/28] Open stored screen. Only initialize content client side --- src/main/java/amerifrance/guideapi/GuideMod.java | 3 ++- src/main/java/amerifrance/guideapi/proxy/ClientProxy.java | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/amerifrance/guideapi/GuideMod.java b/src/main/java/amerifrance/guideapi/GuideMod.java index 2793e097..70638007 100644 --- a/src/main/java/amerifrance/guideapi/GuideMod.java +++ b/src/main/java/amerifrance/guideapi/GuideMod.java @@ -7,6 +7,7 @@ import amerifrance.guideapi.network.PacketHandler; import amerifrance.guideapi.proxy.CommonProxy; import amerifrance.guideapi.util.AnnotationHandler; +import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.fml.DistExecutor; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; @@ -49,7 +50,7 @@ private void loadComplete(final FMLLoadCompleteEvent event){ } private void interModMsg(final InterModProcessEvent event){ - GuideAPI.getBooks().values().parallelStream().forEach(Book::initializeContent); + DistExecutor.runWhenOn(Dist.CLIENT,()-> () -> GuideAPI.getBooks().values().parallelStream().forEach(Book::initializeContent)); } diff --git a/src/main/java/amerifrance/guideapi/proxy/ClientProxy.java b/src/main/java/amerifrance/guideapi/proxy/ClientProxy.java index 0d42353e..6c5ac148 100644 --- a/src/main/java/amerifrance/guideapi/proxy/ClientProxy.java +++ b/src/main/java/amerifrance/guideapi/proxy/ClientProxy.java @@ -64,17 +64,20 @@ public void openGuidebook(PlayerEntity player, World world, Book book, ItemStack EntryScreen guiEntry = new EntryScreen(book, category, entry, player, bookStack); guiEntry.pageNumber = pageNumber; Minecraft.getInstance().displayGuiScreen( guiEntry); + return; } else if (tagCompound.contains(NBTBookTags.CATEGORY_TAG)) { CategoryAbstract category = book.getCategoryList().get(tagCompound.getInt(NBTBookTags.CATEGORY_TAG)); int entryPage = tagCompound.getInt(NBTBookTags.ENTRY_PAGE_TAG); CategoryScreen guiCategory = new CategoryScreen(book, category, player, bookStack, null); guiCategory.entryPage = entryPage; Minecraft.getInstance().displayGuiScreen( guiCategory); + return; } else { int categoryNumber = tagCompound.getInt(NBTBookTags.CATEGORY_PAGE_TAG); HomeScreen guiHome = new HomeScreen(book, player, bookStack); guiHome.categoryPage = categoryNumber; Minecraft.getInstance().displayGuiScreen( guiHome); + return; } } } catch (Exception e) { From 092376788518750600b11a030856dc6b344190e4 Mon Sep 17 00:00:00 2001 From: maxanier Date: Fri, 3 Apr 2020 13:21:29 +0200 Subject: [PATCH 19/28] Delay book content initialization until the book is first used. --- src/main/java/amerifrance/guideapi/GuideMod.java | 8 -------- src/main/java/amerifrance/guideapi/api/BookEvent.java | 2 +- src/main/java/amerifrance/guideapi/api/impl/Book.java | 8 +++++++- .../java/amerifrance/guideapi/api/impl/BookBinder.java | 2 +- .../java/amerifrance/guideapi/item/ItemGuideBook.java | 5 +++++ src/main/java/amerifrance/guideapi/proxy/ClientProxy.java | 1 + 6 files changed, 15 insertions(+), 11 deletions(-) diff --git a/src/main/java/amerifrance/guideapi/GuideMod.java b/src/main/java/amerifrance/guideapi/GuideMod.java index 70638007..7298ec54 100644 --- a/src/main/java/amerifrance/guideapi/GuideMod.java +++ b/src/main/java/amerifrance/guideapi/GuideMod.java @@ -35,7 +35,6 @@ public GuideMod(){ GuideAPI.initialize(); FMLJavaModLoadingContext.get().getModEventBus().addListener(this::setup); FMLJavaModLoadingContext.get().getModEventBus().addListener(this::loadComplete); - FMLJavaModLoadingContext.get().getModEventBus().addListener(this::interModMsg); } private void setup(final FMLCommonSetupEvent event){ @@ -49,13 +48,6 @@ private void loadComplete(final FMLLoadCompleteEvent event){ guide.getRight().handlePost(GuideAPI.getStackFromBook(guide.getLeft())); } - private void interModMsg(final InterModProcessEvent event){ - DistExecutor.runWhenOn(Dist.CLIENT,()-> () -> GuideAPI.getBooks().values().parallelStream().forEach(Book::initializeContent)); - } - - - - private void checkDevEnv() { String launchTarget = System.getenv().get("target"); if (launchTarget != null && launchTarget.contains("dev")) { diff --git a/src/main/java/amerifrance/guideapi/api/BookEvent.java b/src/main/java/amerifrance/guideapi/api/BookEvent.java index a92ad2ff..6cdc7ec4 100644 --- a/src/main/java/amerifrance/guideapi/api/BookEvent.java +++ b/src/main/java/amerifrance/guideapi/api/BookEvent.java @@ -44,7 +44,7 @@ public PlayerEntity getPlayer() { } /** - * Called whenever a book is opened. + * Called client side whenever a book is opened. * * {@link #canceledText} is a status message sent to the player when the book fails to open. */ diff --git a/src/main/java/amerifrance/guideapi/api/impl/Book.java b/src/main/java/amerifrance/guideapi/api/impl/Book.java index 0011c3ae..e1578ff9 100644 --- a/src/main/java/amerifrance/guideapi/api/impl/Book.java +++ b/src/main/java/amerifrance/guideapi/api/impl/Book.java @@ -1,6 +1,7 @@ package amerifrance.guideapi.api.impl; import amerifrance.guideapi.api.impl.abstraction.CategoryAbstract; +import amerifrance.guideapi.util.LogHelper; import com.google.common.base.Joiner; import net.minecraft.item.ItemGroup; import net.minecraft.util.ResourceLocation; @@ -28,6 +29,7 @@ public class Book { private final boolean spawnWithBook; private final ResourceLocation registryName; private final ItemGroup creativeTab; + private boolean isInitialized; protected Book(Consumer> contentProvider, String title, String header, String displayName, String author, ResourceLocation pageTexture, ResourceLocation outlineTexture, boolean customModel, Color color, boolean spawnWithBook, ResourceLocation registryName, ItemGroup creativeTab) { @@ -46,7 +48,11 @@ protected Book(Consumer> contentProvider, String title, S } public void initializeContent(){ - contentProvider.accept(categories); + if(!isInitialized){ + LogHelper.debug("Opening book "+registryName.toString()+" for the first time -> Initializing content"); + contentProvider.accept(categories); + isInitialized=true; + } } public List getCategoryList() { diff --git a/src/main/java/amerifrance/guideapi/api/impl/BookBinder.java b/src/main/java/amerifrance/guideapi/api/impl/BookBinder.java index 15808f35..cad5fde6 100644 --- a/src/main/java/amerifrance/guideapi/api/impl/BookBinder.java +++ b/src/main/java/amerifrance/guideapi/api/impl/BookBinder.java @@ -40,7 +40,7 @@ public BookBinder(ResourceLocation registryName) { /** * Set a consumer (method) that will generate the content for your book and add it to the provided list - * It will be called during GuideAPI's {@link InterModProcessEvent} (so it might execute in parallel with your mod) + * This will be called on client side when the book is opened for the first time. * * @param contentProvider The consumer. Categories are displayed in which they are added to the provided list * @return the builder instance for chaining. diff --git a/src/main/java/amerifrance/guideapi/item/ItemGuideBook.java b/src/main/java/amerifrance/guideapi/item/ItemGuideBook.java index 1267e658..60a5e80e 100644 --- a/src/main/java/amerifrance/guideapi/item/ItemGuideBook.java +++ b/src/main/java/amerifrance/guideapi/item/ItemGuideBook.java @@ -64,8 +64,13 @@ protected void setTranslation_key(String name) { @Override public ActionResult onItemRightClick(World world, PlayerEntity player, Hand hand) { + ItemStack heldStack = player.getHeldItem(hand); + //Only handle book client side + if(!world.isRemote())return ActionResult.newResult(ActionResultType.SUCCESS,heldStack); + + BookEvent.Open event = new BookEvent.Open(book, heldStack, player); if (MinecraftForge.EVENT_BUS.post(event)) { player.sendStatusMessage(event.getCanceledText(), true); diff --git a/src/main/java/amerifrance/guideapi/proxy/ClientProxy.java b/src/main/java/amerifrance/guideapi/proxy/ClientProxy.java index 6c5ac148..0c5f7a22 100644 --- a/src/main/java/amerifrance/guideapi/proxy/ClientProxy.java +++ b/src/main/java/amerifrance/guideapi/proxy/ClientProxy.java @@ -54,6 +54,7 @@ public void initColors() { @Override public void openGuidebook(PlayerEntity player, World world, Book book, ItemStack bookStack) { if (!bookStack.isEmpty() && bookStack.getItem() instanceof IGuideItem) { + book.initializeContent(); try { if (bookStack.hasTag()) { CompoundNBT tagCompound = bookStack.getTag(); From c8575f1d6d3c0c4c4dddbf68347c2f42cd9cc421 Mon Sep 17 00:00:00 2001 From: maxanier Date: Fri, 3 Apr 2020 19:36:26 +0200 Subject: [PATCH 20/28] Add a debug way to reload a book without having to restart the game --- .../java/amerifrance/guideapi/GuideMod.java | 14 ++++++ .../amerifrance/guideapi/api/impl/Book.java | 11 +++++ .../guideapi/util/ReloadCommand.java | 48 +++++++++++++++++++ 3 files changed, 73 insertions(+) create mode 100644 src/main/java/amerifrance/guideapi/util/ReloadCommand.java diff --git a/src/main/java/amerifrance/guideapi/GuideMod.java b/src/main/java/amerifrance/guideapi/GuideMod.java index 7298ec54..ece39fa0 100644 --- a/src/main/java/amerifrance/guideapi/GuideMod.java +++ b/src/main/java/amerifrance/guideapi/GuideMod.java @@ -7,12 +7,18 @@ import amerifrance.guideapi.network.PacketHandler; import amerifrance.guideapi.proxy.CommonProxy; import amerifrance.guideapi.util.AnnotationHandler; +import amerifrance.guideapi.util.ReloadCommand; +import com.mojang.brigadier.builder.LiteralArgumentBuilder; +import net.minecraft.command.CommandSource; +import net.minecraft.command.Commands; import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.DistExecutor; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; import net.minecraftforge.fml.event.lifecycle.FMLLoadCompleteEvent; import net.minecraftforge.fml.event.lifecycle.InterModProcessEvent; +import net.minecraftforge.fml.event.server.FMLServerStartingEvent; import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; import org.apache.commons.lang3.tuple.Pair; @@ -35,6 +41,8 @@ public GuideMod(){ GuideAPI.initialize(); FMLJavaModLoadingContext.get().getModEventBus().addListener(this::setup); FMLJavaModLoadingContext.get().getModEventBus().addListener(this::loadComplete); + MinecraftForge.EVENT_BUS.addListener(this::onServerStarting); + FMLJavaModLoadingContext.get().getModEventBus().addListener(this::onServerStarting); } private void setup(final FMLCommonSetupEvent event){ @@ -54,4 +62,10 @@ private void checkDevEnv() { inDev = true; } } + + private void onServerStarting(FMLServerStartingEvent event){ + if(inDev){ + event.getCommandDispatcher().register(LiteralArgumentBuilder.literal("guide-api").then(ReloadCommand.register())); + } + } } diff --git a/src/main/java/amerifrance/guideapi/api/impl/Book.java b/src/main/java/amerifrance/guideapi/api/impl/Book.java index e1578ff9..91f5c0ae 100644 --- a/src/main/java/amerifrance/guideapi/api/impl/Book.java +++ b/src/main/java/amerifrance/guideapi/api/impl/Book.java @@ -55,6 +55,17 @@ public void initializeContent(){ } } + /** + * Can be used to force content initialisation independent of first use regardless of if it was initialized previously. + * Use at own risk. Might cause crashes if the book is currently open. + */ + public void forceInitializeContent(){ + LogHelper.info("Force initializing book content "+registryName.toString()); + categories.clear(); + isInitialized=false; + initializeContent(); + } + public List getCategoryList() { return this.categories; } diff --git a/src/main/java/amerifrance/guideapi/util/ReloadCommand.java b/src/main/java/amerifrance/guideapi/util/ReloadCommand.java new file mode 100644 index 00000000..a37d28b8 --- /dev/null +++ b/src/main/java/amerifrance/guideapi/util/ReloadCommand.java @@ -0,0 +1,48 @@ +package amerifrance.guideapi.util; + +import amerifrance.guideapi.api.GuideAPI; +import amerifrance.guideapi.api.impl.Book; +import com.mojang.brigadier.LiteralMessage; +import com.mojang.brigadier.arguments.StringArgumentType; +import com.mojang.brigadier.builder.ArgumentBuilder; +import com.mojang.brigadier.exceptions.CommandSyntaxException; +import com.mojang.brigadier.exceptions.DynamicCommandExceptionType; +import com.mojang.brigadier.exceptions.SimpleCommandExceptionType; +import net.minecraft.command.CommandSource; +import net.minecraft.command.Commands; +import net.minecraft.command.ISuggestionProvider; +import net.minecraft.command.arguments.ResourceLocationArgument; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.text.StringTextComponent; +import net.minecraft.util.text.TranslationTextComponent; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.fml.DistExecutor; +import net.minecraftforge.fml.common.thread.EffectiveSide; +import net.minecraftforge.fml.loading.FMLEnvironment; + +/** + * Command to be able to reload the book content ingame for debugging purposes. + * Only registered in dev environment and only works in single player + */ +public class ReloadCommand { + + private static final DynamicCommandExceptionType BOOK_NOT_FOUND = new DynamicCommandExceptionType((id) -> new StringTextComponent("Book with registry id "+ id+ " not found")); + private static final SimpleCommandExceptionType NOT_CLIENT = new SimpleCommandExceptionType(new LiteralMessage("This command can only be used in singleplayer")); + + public static ArgumentBuilder register() { + return Commands.literal("reload") + .then(Commands.argument("bookid", ResourceLocationArgument.resourceLocation()).executes((context) -> { + if(FMLEnvironment.dist != Dist.CLIENT){ + throw NOT_CLIENT.create(); + } + ResourceLocation id = ResourceLocationArgument.getResourceLocation(context,"bookid"); + Book b = GuideAPI.getBooks().get(id); + if(b == null){ + throw BOOK_NOT_FOUND.create(id.toString()); + } + b.forceInitializeContent(); + return 0; + })); + + } +} From 325afb71034ed44be5f89d124c7f7833b35aa08e Mon Sep 17 00:00:00 2001 From: maxanier Date: Wed, 8 Apr 2020 01:06:29 +0200 Subject: [PATCH 21/28] Increase book width. Provide proper line and page wrapping. Extend test book --- .../amerifrance/guideapi/api/impl/Book.java | 2 - .../guideapi/api/util/PageHelper.java | 74 ++++++++++++++---- .../amerifrance/guideapi/gui/BaseScreen.java | 2 +- .../guideapi/page/PageBrewingRecipe.java | 2 +- .../amerifrance/guideapi/page/PageImage.java | 2 +- .../guideapi/page/PageItemStack.java | 2 +- .../amerifrance/guideapi/page/PageText.java | 5 +- .../guideapi/page/PageTextImage.java | 2 +- .../CraftingRecipeRenderer.java | 6 +- .../reciperenderer/FurnaceRecipeRenderer.java | 6 +- .../reciperenderer/ShapedRecipesRenderer.java | 2 +- .../ShapelessRecipesRenderer.java | 2 +- .../amerifrance/guideapi/test/TestBook.java | 19 +++-- .../resources/assets/guideapi/lang/en_us.json | 1 + .../guideapi/textures/gui/book_colored.png | Bin 25477 -> 28515 bytes .../guideapi/textures/gui/book_greyscale.png | Bin 24461 -> 20396 bytes 16 files changed, 87 insertions(+), 40 deletions(-) diff --git a/src/main/java/amerifrance/guideapi/api/impl/Book.java b/src/main/java/amerifrance/guideapi/api/impl/Book.java index 91f5c0ae..56765004 100644 --- a/src/main/java/amerifrance/guideapi/api/impl/Book.java +++ b/src/main/java/amerifrance/guideapi/api/impl/Book.java @@ -14,8 +14,6 @@ public class Book { - private static final String GUITEXLOC = "guideapi:textures/gui/"; - private final List categories = new ArrayList<>(); private final Consumer> contentProvider; private final String title; diff --git a/src/main/java/amerifrance/guideapi/api/util/PageHelper.java b/src/main/java/amerifrance/guideapi/api/util/PageHelper.java index 0d6d89ba..7a596136 100644 --- a/src/main/java/amerifrance/guideapi/api/util/PageHelper.java +++ b/src/main/java/amerifrance/guideapi/api/util/PageHelper.java @@ -11,7 +11,9 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; +import net.minecraft.item.crafting.Ingredient; import org.apache.commons.lang3.StringEscapeUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.text.WordUtils; import java.util.ArrayList; @@ -19,36 +21,67 @@ public class PageHelper { - public static List pagesForLongText(String locText, int maxLength) { - List pageList = new ArrayList(); - for (String s : WordUtils.wrap(locText, maxLength, "/cut", false).split("/cut")) pageList.add(new PageText(s)); - return pageList; - } + /** - * @param locText - Text - * @return a list of IPages with the text cut to fit on page + * Split the given text into multiple section if it does not fit one page. + * The first page can have a different number of lines than the subsequent ones if desired + * Insert new line characters to wrap the text to the available line width. + * @param locText Text to process + * @param lineWidth Available width (pixel) + * @param firstHeight Available height on the first page (pixel) + * @param subsequentHeight Available height on subsequent pages (pixel) + * @return Each list element should be drawn on a individual page. Lines are wrapped using '\n' */ - public static List pagesForLongText(String locText) { - return pagesForLongText(locText, 450); + public static List prepareForLongText(String locText, int lineWidth, int firstHeight, int subsequentHeight){ + FontRenderer fontRenderer = Minecraft.getInstance().fontRenderer; + int firstCount = firstHeight/fontRenderer.FONT_HEIGHT; + int count = subsequentHeight/fontRenderer.FONT_HEIGHT; + List lines = new ArrayList<>(fontRenderer.listFormattedStringToWidth(locText,lineWidth)); //Create a new list from returned list so we can later remove items + List pages = new ArrayList<>(); + + List pageLines = lines.size()>firstCount ? lines.subList(0,firstCount):lines; + pages.add(StringUtils.join( pageLines, "\n")); + pageLines.clear(); + while(lines.size()>0){ + pageLines = lines.size()>count ? lines.subList(0,count):lines; + pages.add(StringUtils.join(pageLines,"\n")); + pageLines.clear(); + } + return pages; } - public static List pagesForLongText(String locText, ItemStack stack) { - List pageList = new ArrayList(); - String[] strings = WordUtils.wrap(locText, 450, "/cut", false).split("/cut"); - for (int i = 0; i < strings.length; i++) { - if (i == 0) pageList.add(new PageItemStack(strings[i], stack)); - else pageList.add(new PageText(strings[i])); + /** + * Spread the text over multiple pages if necessary. Display ingredient at first page + */ + public static List pagesForLongText(String locText, Ingredient ingredient){ + List pageText = prepareForLongText(locText,164,79,120); + List pageList = new ArrayList<>(); + for(int i=0;i pagesForLongText(String locText){ + List pageList = new ArrayList<>(); + prepareForLongText(locText,164,120,120).forEach(t->pageList.add(new PageText(t))); + return pageList; + } + + public static void drawFormattedText(int x, int y, BaseScreen guiBase, String toDraw) { FontRenderer fontRenderer = Minecraft.getInstance().fontRenderer; toDraw = StringEscapeUtils.unescapeJava(toDraw).replaceAll("\\t", " "); String[] lines = toDraw.split("\n"); for (String line : lines) { - List cutLines = fontRenderer.listFormattedStringToWidth(line, 3 * guiBase.xSize / 5); + List cutLines = fontRenderer.listFormattedStringToWidth(line, 2 * guiBase.xSize / 3); for (String cut : cutLines) { fontRenderer.drawString(cut, x, y, 0); y += 10; @@ -74,6 +107,15 @@ public static List pagesForLongText(String locText, Block block) { return pagesForLongText(locText, new ItemStack(block)); } + /** + * @param locText - Text + * @param item - The stack to put on the first page + * @return a list of IPages with the text cut to fit on page + */ + public static List pagesForLongText(String locText, ItemStack item) { + return pagesForLongText(locText, Ingredient.fromStacks(item)); + } + /** * @param recipe1 - The first IRecipe to compare * @param recipe2 - The second IRecipe to compare diff --git a/src/main/java/amerifrance/guideapi/gui/BaseScreen.java b/src/main/java/amerifrance/guideapi/gui/BaseScreen.java index 8783404e..e8c13701 100644 --- a/src/main/java/amerifrance/guideapi/gui/BaseScreen.java +++ b/src/main/java/amerifrance/guideapi/gui/BaseScreen.java @@ -22,7 +22,7 @@ public class BaseScreen extends Screen { public int guiLeft, guiTop; - public int xSize = 192; + public int xSize = 245; public int ySize = 192; public PlayerEntity player; public ItemStack bookStack; diff --git a/src/main/java/amerifrance/guideapi/page/PageBrewingRecipe.java b/src/main/java/amerifrance/guideapi/page/PageBrewingRecipe.java index 2b8ab1ae..d9e4d4b4 100644 --- a/src/main/java/amerifrance/guideapi/page/PageBrewingRecipe.java +++ b/src/main/java/amerifrance/guideapi/page/PageBrewingRecipe.java @@ -64,7 +64,7 @@ public PageBrewingRecipe(Ingredient input, Ingredient ingredient, ItemStack outp public void draw(Book book, CategoryAbstract category, EntryAbstract entry, int guiLeft, int guiTop, int mouseX, int mouseY, BaseScreen guiBase, FontRenderer fontRendererObj) { cycler.tick(guiBase.getMinecraft()); - int xStart = guiLeft + 62; + int xStart = guiLeft + 88; int yStart = guiTop + 52; SubTexture.POTION_GRID.draw(xStart, yStart); diff --git a/src/main/java/amerifrance/guideapi/page/PageImage.java b/src/main/java/amerifrance/guideapi/page/PageImage.java index dc3cce5d..28305821 100644 --- a/src/main/java/amerifrance/guideapi/page/PageImage.java +++ b/src/main/java/amerifrance/guideapi/page/PageImage.java @@ -27,7 +27,7 @@ public PageImage(ResourceLocation image) { @OnlyIn(Dist.CLIENT) public void draw(Book book, CategoryAbstract category, EntryAbstract entry, int guiLeft, int guiTop, int mouseX, int mouseY, BaseScreen guiBase, FontRenderer fontRendererObj) { Minecraft.getInstance().getTextureManager().bindTexture(image); - GuiHelper.drawSizedIconWithoutColor(guiLeft + 50, guiTop + 34, guiBase.xSize, guiBase.ySize, 1F); + GuiHelper.drawSizedIconWithoutColor(guiLeft + 60, guiTop + 34, guiBase.xSize, guiBase.ySize, 1F); } @Override diff --git a/src/main/java/amerifrance/guideapi/page/PageItemStack.java b/src/main/java/amerifrance/guideapi/page/PageItemStack.java index eb059165..f7af0eaa 100644 --- a/src/main/java/amerifrance/guideapi/page/PageItemStack.java +++ b/src/main/java/amerifrance/guideapi/page/PageItemStack.java @@ -54,7 +54,7 @@ public PageItemStack(String draw, Block block) { public void drawExtras(Book book, CategoryAbstract category, EntryAbstract entry, int guiLeft, int guiTop, int mouseX, int mouseY, BaseScreen guiBase, FontRenderer fontRendererObj) { ingredientCycler.tick(guiBase.getMinecraft()); ingredientCycler.getCycledIngredientStack(ingredient,0).ifPresent(stack -> { - GuiHelper.drawScaledItemStack(stack, guiLeft + 75, guiTop + 20, 3); + GuiHelper.drawScaledItemStack(stack, guiLeft + 101, guiTop + 20, 3); }); } diff --git a/src/main/java/amerifrance/guideapi/page/PageText.java b/src/main/java/amerifrance/guideapi/page/PageText.java index d9e968de..18d1ce5c 100644 --- a/src/main/java/amerifrance/guideapi/page/PageText.java +++ b/src/main/java/amerifrance/guideapi/page/PageText.java @@ -28,15 +28,14 @@ public PageText(String draw, int yOffset) { } public PageText(String draw) { - this(draw, 0); + this(draw, 5); } @Override @OnlyIn(Dist.CLIENT) public void draw(Book book, CategoryAbstract category, EntryAbstract entry, int guiLeft, int guiTop, int mouseX, int mouseY, BaseScreen guiBase, FontRenderer fontRendererObj) { - - PageHelper.drawFormattedText(guiLeft + 39, guiTop + 12 + yOffset, guiBase, ForgeI18n.getPattern(draw)); + PageHelper.drawFormattedText(guiLeft + 44, guiTop + 12 + yOffset, guiBase, ForgeI18n.getPattern(draw)); } diff --git a/src/main/java/amerifrance/guideapi/page/PageTextImage.java b/src/main/java/amerifrance/guideapi/page/PageTextImage.java index a53722f4..ad2083aa 100644 --- a/src/main/java/amerifrance/guideapi/page/PageTextImage.java +++ b/src/main/java/amerifrance/guideapi/page/PageTextImage.java @@ -33,7 +33,7 @@ public PageTextImage(String draw, ResourceLocation image, boolean drawAtTop) { @OnlyIn(Dist.CLIENT) public void draw(Book book, CategoryAbstract category, EntryAbstract entry, int guiLeft, int guiTop, int mouseX, int mouseY, BaseScreen guiBase, FontRenderer fontRendererObj) { Minecraft.getInstance().getTextureManager().bindTexture(image); - GuiHelper.drawSizedIconWithoutColor(guiLeft + 50, guiTop + (drawAtTop ? 60 : 12), guiBase.xSize, guiBase.ySize, 0); + GuiHelper.drawSizedIconWithoutColor(guiLeft + 60, guiTop + (drawAtTop ? 60 : 12), guiBase.xSize, guiBase.ySize, 0); pageText.draw(book, category, entry, guiLeft, guiTop, mouseX, mouseY, guiBase, fontRendererObj); } diff --git a/src/main/java/amerifrance/guideapi/page/reciperenderer/CraftingRecipeRenderer.java b/src/main/java/amerifrance/guideapi/page/reciperenderer/CraftingRecipeRenderer.java index 4bb34fc9..915e8598 100644 --- a/src/main/java/amerifrance/guideapi/page/reciperenderer/CraftingRecipeRenderer.java +++ b/src/main/java/amerifrance/guideapi/page/reciperenderer/CraftingRecipeRenderer.java @@ -31,13 +31,13 @@ public CraftingRecipeRenderer(T recipe) { @Override public void draw(Book book, CategoryAbstract category, EntryAbstract entry, int guiLeft, int guiTop, int mouseX, int mouseY, BaseScreen guiBase, FontRenderer fontRendererObj, IngredientCycler cycler) { - SubTexture.CRAFTING_GRID.draw(guiLeft + 42, guiTop + 53); + SubTexture.CRAFTING_GRID.draw(guiLeft + 68, guiTop + 53); String recipeName = Strings.isNullOrEmpty(customDisplay) ? getRecipeName() : customDisplay; guiBase.drawCenteredString(fontRendererObj, recipeName, guiLeft + guiBase.xSize / 2, guiTop + 12, 0); - int outputX = (5 * 18) + (guiLeft + guiBase.xSize / 7) + 5; - int outputY = (2 * 18) + (guiTop + guiBase.xSize / 5); + int outputX = guiLeft + 148; + int outputY = guiTop + 73; ItemStack stack = recipe.getRecipeOutput(); diff --git a/src/main/java/amerifrance/guideapi/page/reciperenderer/FurnaceRecipeRenderer.java b/src/main/java/amerifrance/guideapi/page/reciperenderer/FurnaceRecipeRenderer.java index 1d4d3911..6f939a6a 100644 --- a/src/main/java/amerifrance/guideapi/page/reciperenderer/FurnaceRecipeRenderer.java +++ b/src/main/java/amerifrance/guideapi/page/reciperenderer/FurnaceRecipeRenderer.java @@ -26,11 +26,11 @@ public FurnaceRecipeRenderer(FurnaceRecipe recipe) { @Override public void draw(Book book, CategoryAbstract category, EntryAbstract entry, int guiLeft, int guiTop, int mouseX, int mouseY, BaseScreen guiBase, FontRenderer fontRendererObj, IngredientCycler cycler) { - SubTexture.FURNACE_GRID.draw(guiLeft + 64, guiTop + 71); + SubTexture.FURNACE_GRID.draw(guiLeft + 90, guiTop + 71); guiBase.drawCenteredString(fontRendererObj, TextHelper.localizeEffect("guideapi.text.furnace.smelting"), guiLeft + guiBase.xSize / 2, guiTop + 12, 0); - int x = guiLeft + 66; + int x = guiLeft + 92; int y = guiTop + 77; Ingredient input = recipe.getIngredients().get(0); @@ -46,7 +46,7 @@ public void draw(Book book, CategoryAbstract category, EntryAbstract entry, int ItemStack output = recipe.getRecipeOutput(); - int x2 = guiLeft + 109; + int x2 = guiLeft + 135; GuiHelper.drawItemStack(output, x2, y); if (GuiHelper.isMouseBetween(mouseX, mouseY, x2, y, 15, 15)) tooltips = GuiHelper.getTooltip(output); diff --git a/src/main/java/amerifrance/guideapi/page/reciperenderer/ShapedRecipesRenderer.java b/src/main/java/amerifrance/guideapi/page/reciperenderer/ShapedRecipesRenderer.java index 9591bad7..b9e9d614 100644 --- a/src/main/java/amerifrance/guideapi/page/reciperenderer/ShapedRecipesRenderer.java +++ b/src/main/java/amerifrance/guideapi/page/reciperenderer/ShapedRecipesRenderer.java @@ -26,7 +26,7 @@ public void draw(Book book, CategoryAbstract category, EntryAbstract entry, int for (int y = 0; y < recipe.getRecipeHeight(); y++) { for (int x = 0; x < recipe.getRecipeWidth(); x++) { int i = y*recipe.getRecipeWidth()+x; - int stackX = (x + 1) * 17 + (guiLeft + 27) + x; + int stackX = (x + 1) * 17 + (guiLeft + 53) + x; int stackY = (y + 1) * 17 + (guiTop + 38) + y; Ingredient ingredient = recipe.getIngredients().get(i); diff --git a/src/main/java/amerifrance/guideapi/page/reciperenderer/ShapelessRecipesRenderer.java b/src/main/java/amerifrance/guideapi/page/reciperenderer/ShapelessRecipesRenderer.java index e62a82c9..6903519a 100644 --- a/src/main/java/amerifrance/guideapi/page/reciperenderer/ShapelessRecipesRenderer.java +++ b/src/main/java/amerifrance/guideapi/page/reciperenderer/ShapelessRecipesRenderer.java @@ -27,7 +27,7 @@ public void draw(Book book, CategoryAbstract category, EntryAbstract entry, int for (int y = 0; y < 3; y++) { for (int x = 0; x < 3; x++) { int i = 3 * y + x; - int stackX = (x + 1) * 17 + (guiLeft + 27) + x; + int stackX = (x + 1) * 17 + (guiLeft + 53) + x; int stackY = (y + 1) * 17 + (guiTop + 38) + y; if (i < recipe.getIngredients().size()) { Ingredient ingredient = recipe.getIngredients().get(i); diff --git a/src/main/java/amerifrance/guideapi/test/TestBook.java b/src/main/java/amerifrance/guideapi/test/TestBook.java index 42d5997f..fab5c830 100644 --- a/src/main/java/amerifrance/guideapi/test/TestBook.java +++ b/src/main/java/amerifrance/guideapi/test/TestBook.java @@ -8,12 +8,10 @@ import amerifrance.guideapi.api.impl.Entry; import amerifrance.guideapi.api.impl.abstraction.CategoryAbstract; import amerifrance.guideapi.api.impl.abstraction.EntryAbstract; +import amerifrance.guideapi.api.util.PageHelper; import amerifrance.guideapi.category.CategoryItemStack; import amerifrance.guideapi.entry.EntryItemStack; -import amerifrance.guideapi.page.PageIRecipe; -import amerifrance.guideapi.page.PageItemStack; -import amerifrance.guideapi.page.PageJsonRecipe; -import amerifrance.guideapi.page.PageText; +import amerifrance.guideapi.page.*; import amerifrance.guideapi.page.reciperenderer.ShapedRecipesRenderer; import com.google.common.collect.Lists; import com.google.common.collect.Maps; @@ -53,7 +51,11 @@ private void buildContent(List categories){ Map entries = Maps.newHashMap(); List pages = Lists.newArrayList(); - pages.add(new PageText("Hello, this is\nsome text")); + pages.add(new PageText("Hello, this is\nsome text with a new line.")); + pages.add(new PageText("Hello, this is some text without a new line. It is long so it should probably be automaticall wrapped")); + pages.addAll(PageHelper.pagesForLongText("Hello, this is some text. It is very long so it should be split across multiple pages. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua.")); + pages.addAll(PageHelper.pagesForLongText("Hello, this is some text. It is very long so it should be split across multiple pages. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua.",Items.COAL_BLOCK)); + pages.add(new PageJsonRecipe(new ResourceLocation("minecraft","stone"))); pages.add(new PageJsonRecipe(new ResourceLocation("minecraft","charcoal"))); @@ -62,9 +64,14 @@ private void buildContent(List categories){ pages.add(new PageIRecipe(new ShapedRecipe(new ResourceLocation("guideapi","test11"), "test",1,1,NonNullList.from(Ingredient.EMPTY,Ingredient.fromStacks(new ItemStack(Items.PUMPKIN))),new ItemStack(Blocks.OAK_LOG)))); pages.add(new PageJsonRecipe(new ResourceLocation("minecraft", "acacia_fence"))); pages.add(new PageItemStack("These are all logs",Ingredient.fromTag(ItemTags.LOGS))); + pages.add(new PageTextImage("guideapi.test.string",new ResourceLocation("guideapi","textures/gui/testimage.png"),true)); + pages.add(new PageTextImage("guideapi.test.string",new ResourceLocation("guideapi","textures/gui/testimage.png"),false)); + pages.add(new PageImage(new ResourceLocation("guideapi","textures/gui/testimage.png"))); + + Entry entry = new EntryItemStack(pages, "guideapi.test.entry", new ItemStack(Items.POTATO)); entries.put(new ResourceLocation("guideapi", "entry"), entry); - categories.add(new CategoryItemStack(entries, "guideapi.test.category", new ItemStack(Items.BLUE_BANNER))); + categories.add(new CategoryItemStack(entries, "guideapi.test.category", new ItemStack(Items.ACACIA_DOOR))); } } diff --git a/src/main/resources/assets/guideapi/lang/en_us.json b/src/main/resources/assets/guideapi/lang/en_us.json index 4ca35aff..894e48a5 100644 --- a/src/main/resources/assets/guideapi/lang/en_us.json +++ b/src/main/resources/assets/guideapi/lang/en_us.json @@ -20,6 +20,7 @@ "guideapi.test.format": "This i\\ns a formatting\\n\\ttest", "guideapi.test.category": "Test Category", "guideapi.test.entry": "Test Entry which is very very very long", + "guideapi.test.string": "Some translated content string", "_comment": "Unused", "text.furnace.error": "&cError in the recipe", diff --git a/src/main/resources/assets/guideapi/textures/gui/book_colored.png b/src/main/resources/assets/guideapi/textures/gui/book_colored.png index 5aeee55ceaa4499dfcb9deec3003f09a344f6930..e37b9ccf7fadccbe596012397abfca188126e269 100644 GIT binary patch literal 28515 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%0DE_!`pVj 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 Jl_{77{y*gs1epK; literal 25477 zcmeI42T+sExA32YfB{58M*#_;mq6$pLX#pY(nLWZKqykBqXMBRO`0?*f+C`Vbj8qB zkS0Y@5d|rNRHZj*--EuD|NAoc&b>3=eBY26AiHPJ+1=mSJzJiH2)&b79800{UN0>H_@KW6UtZNWd}ZdzwO0DzKi=LZ6$WiSJPLZE}8iKod4T{&x4XJMR; zs})|@*Vzp$4a$^#-Eh{9cu%Ai-p;{A5j9g)heA5oD5B0tp1_=NQ^VUkXkBv08(cbR zXno1iTGj@otVE&UD+d~I#(UzBzRpfA9&)~lsGoM_!1p`ZA}Hj~BA$+lD3zTGktQef zkZP{(c%-DTB-$DyCW@4n6&970l$I6~LW*HTB}6cyBBJ7GQCT?&2{{Y~`P&PnL;=22 zaJR9Q(^o(CTXkSc5oPb`=_V&4;^X5Z>?1Dh>TV|@Dl021f)NuD6GMX~&>ns+o;Y8$ ziwEZ~Bfr~G$9q`2JGgl|xVj*B?Bc9ky*w3BsGW-bc>UHdXSY8pa`E_$9Y|5c7w0A- zDvS~NCnX!}KXlx@+?{?l&Bj^;?}T^8yLftldZPcR=VtHf>FQzc`Y%=fA^z8jL7$vB z@kibN*j{Jnf2`WWQ^OlX@Eg*9)bud)bHj`1<2_ux+^z8%-e6Za|Ec$$4z_&oWysyK*sO?C8sr?)ZzdWP>_Ek>J9gp*LbvJZ%byE5@%JhCmh*VSiIjWF+XB=E? zTzx$F6-0Kc{ORvMt>M*io_M95@rV``LyJloVkG3m#pS^F7#VO>{>8|zlDll2aJ6x; z_50n13>qVj785fRm5~#Zl@rCFG17n7_)E#%Ho*B~gY(4wm#qA?>|gBISj*YEx;x`M zl^mRLc6bpt7dr)!KQsSQ@{ds^r{?P9>JBywuOzM@@=w|SsHN^|?X@$kRa~s`9-uQk z{^BIiRX-=LD$efjxxWjX9F%^A4I5W$2OGIRE0wmg!pPX*#nCuhanKW@cnLI4Rz?(U zD=8rZ~ zr!O{OU#z6?5;l@zIJC8ltQ1;IRKf~vB`YP47MGHg6_vD>l(M#x{k<>$VCFxn(sJ1G zyWcK1?D)n2fAR0RfBOAr;B~{fd*FA%iX!UwxbjD&28;gjQurC3D$C2oIe1|I7`dws>1f0UO&rAi($Z*i0IDm-&Fr9-mQ9eZ`HqwcdP!XY2@PIsU-GWZM(AnqP4T7 z`?cRN08bxyB`HZsaY+S{-PyY}^c;NgPA2LO;C{nnXC)Aml=@9+x8xr+&;G0CUnIY2 z{&Ln|P6|I4vR}F2IRrcciTrT}`j0j4j}_>D^Ua@K`rov=%hrA+yMXMS+{d*ypIy>@ zT)Tkmo!rN@H=kY7eO$YM?48`lwKtz#(tTXJfb5;z$F(<~UDADAyMXMS+{d*ypIy>@ zT)Tkmo!rN@H=kY7eO$YM?48`lwKtz#(tTXJfb5;z$F(<~UDADAyMXMS+{d*ypIy>@ zT)Tkmo!rN@H=kY7eO$YM?48`lwKtz#(tTXJfb5;z$F(<~UDADAyMXMS+{d*ypIy>@ zT)Tkmo!rN@H=kY7eO$YM?48`lwKtz#(tTXJfb5;z$F(<~UDADAyMXMS+{d*ypIy>@ zT)Tkmo!rN@H=kY7eO$YM?48`lwKtz#(tTXJfb5;z6Bosw-zvttfL|r{0lza`ZSZR6 z+sa65E&US!aETiL2q6HlwhjKB001ux08Cl}fLtm7Fu5jJG# )h;IilOhvX@AE! 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 G2LB(sH5pp~ diff --git a/src/main/resources/assets/guideapi/textures/gui/book_greyscale.png b/src/main/resources/assets/guideapi/textures/gui/book_greyscale.png index 768e6b31455c473f4efadd8f93431ef48e7a6fe8..50ab5cadbecb1741b0fc7673115f6215bc1d4e28 100644 GIT binary patch literal 20396 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 oDYXiU21Crc3BoxFeo*RYyADQq_AOHXW literal 24461 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 bV;NXP7#3hFuYs@C0brNGUi}+-PLclw4qfkw From 7829beec83e4e0d6b0984a192ef98a7fe14c68b6 Mon Sep 17 00:00:00 2001 From: maxanier Date: Wed, 8 Apr 2020 23:27:34 +0200 Subject: [PATCH 22/28] Properly update config system to also handle per book configuration --- build.gradle | 1 + .../amerifrance/guideapi/GuideConfig.java | 70 +++++++------------ .../java/amerifrance/guideapi/GuideMod.java | 3 + .../guideapi/RegistrarGuideAPI.java | 2 +- .../amerifrance/guideapi/test/TestBook.java | 2 +- .../amerifrance/guideapi/test/TestBook2.java | 2 +- .../guideapi/util/EventHandler.java | 10 +-- 7 files changed, 40 insertions(+), 50 deletions(-) diff --git a/build.gradle b/build.gradle index 592630b1..2df87488 100644 --- a/build.gradle +++ b/build.gradle @@ -45,6 +45,7 @@ dependencies { ]) compileOnly fg.deobf("mezz.jei:jei-${project.minecraft_version}:${project.jei_version}:api") //API for compile runtimeOnly fg.deobf("mezz.jei:jei-${project.minecraft_version}:${project.jei_version}") //Full for runtime + //runtimeClasspath 'com.electronwill.night-config:hocon:3.6.2' } sourceSets { diff --git a/src/main/java/amerifrance/guideapi/GuideConfig.java b/src/main/java/amerifrance/guideapi/GuideConfig.java index 0e6c941c..7bda4277 100644 --- a/src/main/java/amerifrance/guideapi/GuideConfig.java +++ b/src/main/java/amerifrance/guideapi/GuideConfig.java @@ -1,72 +1,56 @@ package amerifrance.guideapi; +import amerifrance.guideapi.api.GuideAPI; +import amerifrance.guideapi.api.impl.Book; +import com.electronwill.nightconfig.core.CommentedConfig; +import com.google.common.collect.Maps; import net.minecraftforge.common.ForgeConfigSpec; +import net.minecraftforge.fml.ModContainer; import net.minecraftforge.fml.ModLoadingContext; +import net.minecraftforge.fml.config.ConfigFileTypeHandler; import net.minecraftforge.fml.config.ModConfig; import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; import org.apache.commons.lang3.tuple.Pair; +import java.util.HashMap; +import java.util.Map; + public class GuideConfig { - /** - * Synced to clients. - * Only loaded on world load - */ - public static final Server SERVER; + /** * For side independent configuration. Not synced. * Loaded after registry events but before setup */ - public static final Common COMMON; - - private static final ForgeConfigSpec serverSpec; - private static final ForgeConfigSpec commonSpec; - - - static { - final Pair specPair = new ForgeConfigSpec.Builder().configure(Server::new); - serverSpec = specPair.getRight(); - SERVER = specPair.getLeft(); - } - - static { - final Pair specPair = new ForgeConfigSpec.Builder().configure(Common::new); - commonSpec = specPair.getRight(); - COMMON = specPair.getLeft(); - } - - public static void registerConfigs() { - ModLoadingContext.get().registerConfig(ModConfig.Type.COMMON, commonSpec); - ModLoadingContext.get().registerConfig(ModConfig.Type.SERVER, serverSpec); - FMLJavaModLoadingContext.get().getModEventBus().register(GuideConfig.class); - } + public static Common COMMON; - public static class Server { + public static class Common { public final ForgeConfigSpec.BooleanValue canSpawnWithBook; - Server(ForgeConfigSpec.Builder builder) { - builder.comment("Server configuration settings").push("server"); - canSpawnWithBook = builder.comment("Allows books to spawn with new players.\nThis is a global override for all books.").define("canSpawnWithBook",true); - builder.pop(); - } - -// for ( Book book : GuideAPI.getBooks().values()) TODO -// SPAWN_BOOKS.put(book, config.getBoolean(book.getRegistryName().toString(), "Books.Spawn", book.shouldSpawnWithBook(), "")); -// -// config.setCategoryComment("Books.Spawn", "If true, the user will spawn with the book.\nThis defaults to the value the book owner has set and is overridden by this config."); - } - - public static class Common { - public final ForgeConfigSpec.BooleanValue enableLogging; + public final Map SPAWN_BOOKS = new HashMap<>(); Common(ForgeConfigSpec.Builder builder) { builder.comment("Common configurations settings").push("common"); enableLogging = builder.comment("Enables extra information being printed to the console.").define("enableLogging",true); + canSpawnWithBook = builder.comment("Allows books to spawn with new players.\nThis is a global override for all books if set to false.").define("canSpawnWithBook",true); + builder.comment("If the player should spawn with this book").push("spawnBook"); + for(Book book : GuideAPI.getBooks().values()){ + SPAWN_BOOKS.put(book,builder.define(book.getRegistryName().getNamespace()+"-"+book.getRegistryName().getPath(),book.shouldSpawnWithBook())); + } + builder.pop(); builder.pop(); } } + public static void buildConfiguration(){ + final Pair specPair = new ForgeConfigSpec.Builder().configure(Common::new); + ForgeConfigSpec commonSpec = specPair.getRight(); + COMMON = specPair.getLeft(); + ModLoadingContext.get().registerConfig(ModConfig.Type.COMMON, commonSpec); + FMLJavaModLoadingContext.get().getModEventBus().register(GuideConfig.class); + } + } diff --git a/src/main/java/amerifrance/guideapi/GuideMod.java b/src/main/java/amerifrance/guideapi/GuideMod.java index ece39fa0..3171c69e 100644 --- a/src/main/java/amerifrance/guideapi/GuideMod.java +++ b/src/main/java/amerifrance/guideapi/GuideMod.java @@ -46,6 +46,9 @@ public GuideMod(){ } private void setup(final FMLCommonSetupEvent event){ + if(GuideConfig.COMMON==null){ + throw new IllegalStateException("Did not build configuration, before configuration load. Make sure to call GuideConfig#buildConfiguration during one of the registry events"); + } PacketHandler.registerPackets(); } diff --git a/src/main/java/amerifrance/guideapi/RegistrarGuideAPI.java b/src/main/java/amerifrance/guideapi/RegistrarGuideAPI.java index 7f30de79..b70f8620 100644 --- a/src/main/java/amerifrance/guideapi/RegistrarGuideAPI.java +++ b/src/main/java/amerifrance/guideapi/RegistrarGuideAPI.java @@ -31,7 +31,7 @@ public class RegistrarGuideAPI { @SubscribeEvent public static void registerItems(RegistryEvent.Register event) { AnnotationHandler.gatherBooks(); - + GuideConfig.buildConfiguration();//Build configuration now that we know all added books for (Book book : GuideAPI.getBooks().values()) { Item guideBook = new ItemGuideBook(book); guideBook.setRegistryName(book.getRegistryName().toString().replace(":", "-")); diff --git a/src/main/java/amerifrance/guideapi/test/TestBook.java b/src/main/java/amerifrance/guideapi/test/TestBook.java index fab5c830..bf6b0473 100644 --- a/src/main/java/amerifrance/guideapi/test/TestBook.java +++ b/src/main/java/amerifrance/guideapi/test/TestBook.java @@ -42,7 +42,7 @@ public class TestBook implements IGuideBook { @Override public Book buildBook() { BookBinder binder = new BookBinder(new ResourceLocation("guideapi","test_book")); - binder.setAuthor("TehNut").setColor(Color.PINK).setItemName("Display Name").setHeader("Hello there").setGuideTitle("Title message").setContentProvider(this::buildContent); + binder.setAuthor("TehNut").setColor(Color.PINK).setItemName("Display Name").setHeader("Hello there").setGuideTitle("Title message").setSpawnWithBook().setContentProvider(this::buildContent); return (book = binder.build()); } diff --git a/src/main/java/amerifrance/guideapi/test/TestBook2.java b/src/main/java/amerifrance/guideapi/test/TestBook2.java index 5571e45f..4d6c61ab 100644 --- a/src/main/java/amerifrance/guideapi/test/TestBook2.java +++ b/src/main/java/amerifrance/guideapi/test/TestBook2.java @@ -35,7 +35,7 @@ public class TestBook2 implements IGuideBook { @Override public Book buildBook() { BookBinder binder = new BookBinder(new ResourceLocation("guideapi","test_book2")); - binder.setAuthor("TehNut").setColor(new Color(80,50,5)).setItemName("Display Name").setHeader("Hello there").setGuideTitle("Title message").setContentProvider(this::buildContent); + binder.setAuthor("TehNut").setColor(new Color(80,50,5)).setItemName("Display Name").setHeader("Hello there").setSpawnWithBook().setGuideTitle("Title message").setContentProvider(this::buildContent); diff --git a/src/main/java/amerifrance/guideapi/util/EventHandler.java b/src/main/java/amerifrance/guideapi/util/EventHandler.java index e6362b31..03a21479 100644 --- a/src/main/java/amerifrance/guideapi/util/EventHandler.java +++ b/src/main/java/amerifrance/guideapi/util/EventHandler.java @@ -28,6 +28,7 @@ import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.client.event.RenderGameOverlayEvent; +import net.minecraftforge.common.ForgeConfigSpec; import net.minecraftforge.event.entity.EntityJoinWorldEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; @@ -43,12 +44,13 @@ public static void onPlayerJoinWorld(EntityJoinWorldEvent event) { if (!event.getEntity().world.isRemote && event.getEntity() instanceof PlayerEntity) { PlayerEntity player = (PlayerEntity) event.getEntity(); CompoundNBT tag = getModTag(player, GuideMod.ID); - if (GuideConfig.SERVER.canSpawnWithBook.get()) { + if (GuideConfig.COMMON.canSpawnWithBook.get()) { for (Book book : GuideAPI.getBooks().values()) { - //if (ConfigHandler.SPAWN_BOOKS.getOrDefault(book, false) && !tag.getBoolean("hasInitial" + book.getTitle())) { TODO + ForgeConfigSpec.BooleanValue bookSpawnConfig = GuideConfig.COMMON.SPAWN_BOOKS.get(book); + if((bookSpawnConfig==null||bookSpawnConfig.get()) && !tag.getBoolean("hasInitial" + book.getRegistryName().toString())){ ItemHandlerHelper.giveItemToPlayer(player, GuideAPI.getStackFromBook(book)); - tag.putBoolean("hasInitial" + book.getTitle(), true); - //} + tag.putBoolean("hasInitial" + book.getRegistryName().toString(), true); + } } } } From 7a9f6090f62a5eb33d057a09c10709cc04ceb5b2 Mon Sep 17 00:00:00 2001 From: maxanier Date: Wed, 8 Apr 2020 23:35:59 +0200 Subject: [PATCH 23/28] Format code and cleanup imports --- .../amerifrance/guideapi/GuideConfig.java | 16 +++--- .../java/amerifrance/guideapi/GuideMod.java | 21 ++++---- .../guideapi/RegistrarGuideAPI.java | 22 ++++---- .../amerifrance/guideapi/api/BookEvent.java | 6 +-- .../amerifrance/guideapi/api/GuideAPI.java | 9 +--- .../amerifrance/guideapi/api/IGuideBook.java | 6 +-- .../java/amerifrance/guideapi/api/IPage.java | 4 +- .../guideapi/api/IRecipeRenderer.java | 9 +--- .../amerifrance/guideapi/api/SubTexture.java | 8 +-- .../amerifrance/guideapi/api/impl/Book.java | 16 +++--- .../guideapi/api/impl/BookBinder.java | 31 ++++++------ .../amerifrance/guideapi/api/impl/Entry.java | 6 +-- .../amerifrance/guideapi/api/impl/Page.java | 3 +- .../impl/abstraction/CategoryAbstract.java | 10 ++-- .../api/impl/abstraction/EntryAbstract.java | 5 +- .../guideapi/api/util/IngredientCycler.java | 19 +++---- .../guideapi/api/util/PageHelper.java | 50 +++++++++---------- .../guideapi/api/util/TextHelper.java | 1 - .../guideapi/button/ButtonBack.java | 8 +-- .../guideapi/button/ButtonNext.java | 30 +++++------ .../guideapi/button/ButtonPrev.java | 8 +-- .../guideapi/button/ButtonSearch.java | 4 +- .../guideapi/category/CategoryItemStack.java | 4 +- .../category/CategoryResourceLocation.java | 3 +- .../amerifrance/guideapi/gui/BaseScreen.java | 21 ++++---- .../guideapi/gui/CategoryScreen.java | 39 +++++++-------- .../amerifrance/guideapi/gui/EntryScreen.java | 36 +++++++------ .../amerifrance/guideapi/gui/HomeScreen.java | 33 ++++++------ .../guideapi/gui/SearchScreen.java | 30 +++++------ .../info/InfoRendererDescription.java | 4 +- .../guideapi/item/ItemGuideBook.java | 6 +-- .../guideapi/network/PacketHandler.java | 9 ++-- .../guideapi/network/PacketSyncCategory.java | 15 +++--- .../guideapi/network/PacketSyncEntry.java | 20 ++++---- .../guideapi/network/PacketSyncHome.java | 12 ++--- .../guideapi/page/PageBrewingRecipe.java | 6 +-- .../guideapi/page/PageIRecipe.java | 18 +++---- .../guideapi/page/PageItemStack.java | 13 ++--- .../guideapi/page/PageJsonRecipe.java | 32 ++++++------ .../amerifrance/guideapi/page/PageText.java | 1 - .../CraftingRecipeRenderer.java | 5 -- .../reciperenderer/FurnaceRecipeRenderer.java | 4 +- .../reciperenderer/ShapedRecipesRenderer.java | 8 +-- .../ShapelessRecipesRenderer.java | 6 +-- .../guideapi/proxy/ClientProxy.java | 14 +++--- .../guideapi/proxy/CommonProxy.java | 2 +- .../amerifrance/guideapi/test/TestBook.java | 31 +++++------- .../amerifrance/guideapi/test/TestBook2.java | 24 ++++----- .../guideapi/util/AnnotationHandler.java | 12 ++--- .../guideapi/util/EventHandler.java | 4 +- .../guideapi/util/ReloadCommand.java | 16 ++---- .../resources/assets/guideapi/lang/de_de.json | 2 - .../resources/assets/guideapi/lang/en_us.json | 4 -- .../resources/assets/guideapi/lang/ru_ru.json | 2 - .../resources/assets/guideapi/lang/zh_cn.json | 2 - .../guideapi/models/item/guidebook.json | 20 ++++++-- 56 files changed, 327 insertions(+), 423 deletions(-) diff --git a/src/main/java/amerifrance/guideapi/GuideConfig.java b/src/main/java/amerifrance/guideapi/GuideConfig.java index 7bda4277..f37dec0c 100644 --- a/src/main/java/amerifrance/guideapi/GuideConfig.java +++ b/src/main/java/amerifrance/guideapi/GuideConfig.java @@ -3,12 +3,8 @@ import amerifrance.guideapi.api.GuideAPI; import amerifrance.guideapi.api.impl.Book; -import com.electronwill.nightconfig.core.CommentedConfig; -import com.google.common.collect.Maps; import net.minecraftforge.common.ForgeConfigSpec; -import net.minecraftforge.fml.ModContainer; import net.minecraftforge.fml.ModLoadingContext; -import net.minecraftforge.fml.config.ConfigFileTypeHandler; import net.minecraftforge.fml.config.ModConfig; import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; import org.apache.commons.lang3.tuple.Pair; @@ -29,23 +25,23 @@ public static class Common { public final ForgeConfigSpec.BooleanValue canSpawnWithBook; public final ForgeConfigSpec.BooleanValue enableLogging; - public final Map SPAWN_BOOKS = new HashMap<>(); + public final Map SPAWN_BOOKS = new HashMap<>(); Common(ForgeConfigSpec.Builder builder) { builder.comment("Common configurations settings").push("common"); - enableLogging = builder.comment("Enables extra information being printed to the console.").define("enableLogging",true); - canSpawnWithBook = builder.comment("Allows books to spawn with new players.\nThis is a global override for all books if set to false.").define("canSpawnWithBook",true); + enableLogging = builder.comment("Enables extra information being printed to the console.").define("enableLogging", true); + canSpawnWithBook = builder.comment("Allows books to spawn with new players.\nThis is a global override for all books if set to false.").define("canSpawnWithBook", true); builder.comment("If the player should spawn with this book").push("spawnBook"); - for(Book book : GuideAPI.getBooks().values()){ - SPAWN_BOOKS.put(book,builder.define(book.getRegistryName().getNamespace()+"-"+book.getRegistryName().getPath(),book.shouldSpawnWithBook())); + for (Book book : GuideAPI.getBooks().values()) { + SPAWN_BOOKS.put(book, builder.define(book.getRegistryName().getNamespace() + "-" + book.getRegistryName().getPath(), book.shouldSpawnWithBook())); } builder.pop(); builder.pop(); } } - public static void buildConfiguration(){ + public static void buildConfiguration() { final Pair specPair = new ForgeConfigSpec.Builder().configure(Common::new); ForgeConfigSpec commonSpec = specPair.getRight(); COMMON = specPair.getLeft(); diff --git a/src/main/java/amerifrance/guideapi/GuideMod.java b/src/main/java/amerifrance/guideapi/GuideMod.java index 3171c69e..ccb49986 100644 --- a/src/main/java/amerifrance/guideapi/GuideMod.java +++ b/src/main/java/amerifrance/guideapi/GuideMod.java @@ -1,23 +1,20 @@ package amerifrance.guideapi; -import amerifrance.guideapi.proxy.ClientProxy; import amerifrance.guideapi.api.GuideAPI; import amerifrance.guideapi.api.IGuideBook; import amerifrance.guideapi.api.impl.Book; import amerifrance.guideapi.network.PacketHandler; +import amerifrance.guideapi.proxy.ClientProxy; import amerifrance.guideapi.proxy.CommonProxy; import amerifrance.guideapi.util.AnnotationHandler; import amerifrance.guideapi.util.ReloadCommand; import com.mojang.brigadier.builder.LiteralArgumentBuilder; import net.minecraft.command.CommandSource; -import net.minecraft.command.Commands; -import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.DistExecutor; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; import net.minecraftforge.fml.event.lifecycle.FMLLoadCompleteEvent; -import net.minecraftforge.fml.event.lifecycle.InterModProcessEvent; import net.minecraftforge.fml.event.server.FMLServerStartingEvent; import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; import org.apache.commons.lang3.tuple.Pair; @@ -35,8 +32,8 @@ public class GuideMod { public static CommonProxy PROXY = DistExecutor.runForDist(() -> ClientProxy::new, () -> CommonProxy::new); - public GuideMod(){ - INSTANCE=this; + public GuideMod() { + INSTANCE = this; checkDevEnv(); GuideAPI.initialize(); FMLJavaModLoadingContext.get().getModEventBus().addListener(this::setup); @@ -45,14 +42,14 @@ public GuideMod(){ FMLJavaModLoadingContext.get().getModEventBus().addListener(this::onServerStarting); } - private void setup(final FMLCommonSetupEvent event){ - if(GuideConfig.COMMON==null){ - throw new IllegalStateException("Did not build configuration, before configuration load. Make sure to call GuideConfig#buildConfiguration during one of the registry events"); + private void setup(final FMLCommonSetupEvent event) { + if (GuideConfig.COMMON == null) { + throw new IllegalStateException("Did not build configuration, before configuration load. Make sure to call GuideConfig#buildConfiguration during one of the registry events"); } PacketHandler.registerPackets(); } - private void loadComplete(final FMLLoadCompleteEvent event){ + private void loadComplete(final FMLLoadCompleteEvent event) { PROXY.initColors(); for (Pair guide : AnnotationHandler.BOOK_CLASSES) @@ -66,8 +63,8 @@ private void checkDevEnv() { } } - private void onServerStarting(FMLServerStartingEvent event){ - if(inDev){ + private void onServerStarting(FMLServerStartingEvent event) { + if (inDev) { event.getCommandDispatcher().register(LiteralArgumentBuilder.literal("guide-api").then(ReloadCommand.register())); } } diff --git a/src/main/java/amerifrance/guideapi/RegistrarGuideAPI.java b/src/main/java/amerifrance/guideapi/RegistrarGuideAPI.java index b70f8620..84f42719 100644 --- a/src/main/java/amerifrance/guideapi/RegistrarGuideAPI.java +++ b/src/main/java/amerifrance/guideapi/RegistrarGuideAPI.java @@ -6,7 +6,6 @@ import amerifrance.guideapi.item.ItemGuideBook; import amerifrance.guideapi.util.APISetter; import amerifrance.guideapi.util.AnnotationHandler; -import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.model.IBakedModel; import net.minecraft.client.renderer.model.ModelResourceLocation; import net.minecraft.item.Item; @@ -20,11 +19,10 @@ import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; - import net.minecraftforge.registries.ForgeRegistries; import org.apache.commons.lang3.tuple.Pair; -@Mod.EventBusSubscriber(modid = "guideapi",bus = Mod.EventBusSubscriber.Bus.MOD) +@Mod.EventBusSubscriber(modid = "guideapi", bus = Mod.EventBusSubscriber.Bus.MOD) public class RegistrarGuideAPI { @@ -44,10 +42,10 @@ public static void registerItems(RegistryEvent.Register event) { @SubscribeEvent @OnlyIn(Dist.CLIENT) public static void registerModels(ModelRegistryEvent event) { - for (Pair guide : AnnotationHandler.BOOK_CLASSES){ - ResourceLocation loc=guide.getRight().getModel(); - if (loc!=null){ - ModelLoader.addSpecialModel(new ModelResourceLocation(loc,"inventory")); + for (Pair guide : AnnotationHandler.BOOK_CLASSES) { + ResourceLocation loc = guide.getRight().getModel(); + if (loc != null) { + ModelLoader.addSpecialModel(new ModelResourceLocation(loc, "inventory")); } } } @@ -56,12 +54,12 @@ public static void registerModels(ModelRegistryEvent event) { @OnlyIn(Dist.CLIENT) public static void bakeModel(ModelBakeEvent event) { for (Pair guide : AnnotationHandler.BOOK_CLASSES) { - ResourceLocation loc=guide.getRight().getModel(); - if (loc!=null){ - ModelResourceLocation newMrl = new ModelResourceLocation(loc,"inventory"); + ResourceLocation loc = guide.getRight().getModel(); + if (loc != null) { + ModelResourceLocation newMrl = new ModelResourceLocation(loc, "inventory"); Item bookItem = GuideAPI.getStackFromBook(guide.getLeft()).getItem(); - ModelResourceLocation oldMrl = new ModelResourceLocation(bookItem.getRegistryName(),"inventory"); - IBakedModel model= event.getModelRegistry().get(newMrl); + ModelResourceLocation oldMrl = new ModelResourceLocation(bookItem.getRegistryName(), "inventory"); + IBakedModel model = event.getModelRegistry().get(newMrl); event.getModelRegistry().put(oldMrl, model); diff --git a/src/main/java/amerifrance/guideapi/api/BookEvent.java b/src/main/java/amerifrance/guideapi/api/BookEvent.java index 6cdc7ec4..f2bb5c32 100644 --- a/src/main/java/amerifrance/guideapi/api/BookEvent.java +++ b/src/main/java/amerifrance/guideapi/api/BookEvent.java @@ -5,8 +5,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.Style; -import net.minecraft.util.text.TranslationTextComponent; import net.minecraft.util.text.TextFormatting; +import net.minecraft.util.text.TranslationTextComponent; import net.minecraftforge.eventbus.api.Cancelable; import net.minecraftforge.eventbus.api.Event; @@ -14,7 +14,7 @@ /** * Base class for all {@link Book} related events. - * + *

* {@link #book} is the book being opened. * {@link #stack} is the ItemStack of the Book. * {@link #player} is the player opening the book. @@ -45,7 +45,7 @@ public PlayerEntity getPlayer() { /** * Called client side whenever a book is opened. - * + *

* {@link #canceledText} is a status message sent to the player when the book fails to open. */ @Cancelable diff --git a/src/main/java/amerifrance/guideapi/api/GuideAPI.java b/src/main/java/amerifrance/guideapi/api/GuideAPI.java index 613fb3c2..84a80f5a 100644 --- a/src/main/java/amerifrance/guideapi/api/GuideAPI.java +++ b/src/main/java/amerifrance/guideapi/api/GuideAPI.java @@ -3,15 +3,8 @@ import amerifrance.guideapi.api.impl.Book; import com.google.common.collect.*; import net.minecraft.block.Block; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.ItemModelMesher; -import net.minecraft.client.renderer.model.ModelResourceLocation; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; - import java.util.List; import java.util.Map; @@ -41,7 +34,7 @@ public static ItemStack getStackFromBook(Book book) { */ public static void registerInfoRenderer(Book book, IInfoRenderer infoRenderer, Class... blockClasses) { if (!INFO_RENDERERS.containsKey(book)) - INFO_RENDERERS.put(book, ArrayListMultimap., IInfoRenderer>create()); + INFO_RENDERERS.put(book, ArrayListMultimap.create()); for (Class blockClass : blockClasses) INFO_RENDERERS.get(book).put(blockClass, infoRenderer); diff --git a/src/main/java/amerifrance/guideapi/api/IGuideBook.java b/src/main/java/amerifrance/guideapi/api/IGuideBook.java index af81a475..e414994c 100644 --- a/src/main/java/amerifrance/guideapi/api/IGuideBook.java +++ b/src/main/java/amerifrance/guideapi/api/IGuideBook.java @@ -2,10 +2,10 @@ import amerifrance.guideapi.api.impl.Book; import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.IRecipe; import net.minecraft.util.ResourceLocation; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; + import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -25,8 +25,8 @@ public interface IGuideBook { */ @Nullable @OnlyIn(Dist.CLIENT) - default ResourceLocation getModel(){ - return new ResourceLocation("guideapi","guidebook"); + default ResourceLocation getModel() { + return new ResourceLocation("guideapi", "guidebook"); } /** diff --git a/src/main/java/amerifrance/guideapi/api/IPage.java b/src/main/java/amerifrance/guideapi/api/IPage.java index a28d5426..dfe0633e 100644 --- a/src/main/java/amerifrance/guideapi/api/IPage.java +++ b/src/main/java/amerifrance/guideapi/api/IPage.java @@ -1,10 +1,10 @@ package amerifrance.guideapi.api; -import amerifrance.guideapi.gui.BaseScreen; -import amerifrance.guideapi.gui.EntryScreen; import amerifrance.guideapi.api.impl.Book; import amerifrance.guideapi.api.impl.abstraction.CategoryAbstract; import amerifrance.guideapi.api.impl.abstraction.EntryAbstract; +import amerifrance.guideapi.gui.BaseScreen; +import amerifrance.guideapi.gui.EntryScreen; import net.minecraft.client.gui.FontRenderer; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; diff --git a/src/main/java/amerifrance/guideapi/api/IRecipeRenderer.java b/src/main/java/amerifrance/guideapi/api/IRecipeRenderer.java index 05f16de5..bb7954df 100644 --- a/src/main/java/amerifrance/guideapi/api/IRecipeRenderer.java +++ b/src/main/java/amerifrance/guideapi/api/IRecipeRenderer.java @@ -1,23 +1,18 @@ package amerifrance.guideapi.api; -import amerifrance.guideapi.api.util.IngredientCycler; -import amerifrance.guideapi.gui.BaseScreen; import amerifrance.guideapi.api.impl.Book; import amerifrance.guideapi.api.impl.abstraction.CategoryAbstract; import amerifrance.guideapi.api.impl.abstraction.EntryAbstract; +import amerifrance.guideapi.api.util.IngredientCycler; +import amerifrance.guideapi.gui.BaseScreen; import com.google.common.collect.Lists; -import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; -import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; -import net.minecraft.item.crafting.Ingredient; import net.minecraft.util.text.ITextComponent; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import java.util.List; -import java.util.Optional; -import java.util.Random; public interface IRecipeRenderer { diff --git a/src/main/java/amerifrance/guideapi/api/SubTexture.java b/src/main/java/amerifrance/guideapi/api/SubTexture.java index 0cccb97b..744c9a6e 100644 --- a/src/main/java/amerifrance/guideapi/api/SubTexture.java +++ b/src/main/java/amerifrance/guideapi/api/SubTexture.java @@ -64,10 +64,10 @@ public void draw(int drawX, int drawY, double zLevel) { Tessellator tessellator = Tessellator.getInstance(); BufferBuilder vertexbuffer = tessellator.getBuffer(); vertexbuffer.begin(7, DefaultVertexFormats.POSITION_TEX); - vertexbuffer.pos((double) drawX, (double) (drawY + height), zLevel).tex((double) ((float) xPos * someMagicValueFromMojang), (double) ((float) (yPos + height) * someMagicValueFromMojang)).endVertex(); - vertexbuffer.pos((double) (drawX + width), (double) (drawY + height), zLevel).tex((double) ((float) (xPos + width) * someMagicValueFromMojang), (double) ((float) (yPos + height) * someMagicValueFromMojang)).endVertex(); - vertexbuffer.pos((double) (drawX + width), (double) drawY, zLevel).tex((double) ((float) (xPos + width) * someMagicValueFromMojang), (double) ((float) yPos * someMagicValueFromMojang)).endVertex(); - vertexbuffer.pos((double) drawX, (double) drawY, zLevel).tex((double) ((float) xPos * someMagicValueFromMojang), (double) ((float) yPos * someMagicValueFromMojang)).endVertex(); + vertexbuffer.pos(drawX, drawY + height, zLevel).tex((float) xPos * someMagicValueFromMojang, (float) (yPos + height) * someMagicValueFromMojang).endVertex(); + vertexbuffer.pos(drawX + width, drawY + height, zLevel).tex((float) (xPos + width) * someMagicValueFromMojang, (float) (yPos + height) * someMagicValueFromMojang).endVertex(); + vertexbuffer.pos(drawX + width, drawY, zLevel).tex((float) (xPos + width) * someMagicValueFromMojang, (float) yPos * someMagicValueFromMojang).endVertex(); + vertexbuffer.pos(drawX, drawY, zLevel).tex((float) xPos * someMagicValueFromMojang, (float) yPos * someMagicValueFromMojang).endVertex(); tessellator.draw(); } diff --git a/src/main/java/amerifrance/guideapi/api/impl/Book.java b/src/main/java/amerifrance/guideapi/api/impl/Book.java index 56765004..f6a6af21 100644 --- a/src/main/java/amerifrance/guideapi/api/impl/Book.java +++ b/src/main/java/amerifrance/guideapi/api/impl/Book.java @@ -7,7 +7,7 @@ import net.minecraft.util.ResourceLocation; import org.apache.commons.lang3.builder.ToStringBuilder; -import java.awt.Color; +import java.awt.*; import java.util.ArrayList; import java.util.List; import java.util.function.Consumer; @@ -45,11 +45,11 @@ protected Book(Consumer> contentProvider, String title, S this.creativeTab = creativeTab; } - public void initializeContent(){ - if(!isInitialized){ - LogHelper.debug("Opening book "+registryName.toString()+" for the first time -> Initializing content"); + public void initializeContent() { + if (!isInitialized) { + LogHelper.debug("Opening book " + registryName.toString() + " for the first time -> Initializing content"); contentProvider.accept(categories); - isInitialized=true; + isInitialized = true; } } @@ -57,10 +57,10 @@ public void initializeContent(){ * Can be used to force content initialisation independent of first use regardless of if it was initialized previously. * Use at own risk. Might cause crashes if the book is currently open. */ - public void forceInitializeContent(){ - LogHelper.info("Force initializing book content "+registryName.toString()); + public void forceInitializeContent() { + LogHelper.info("Force initializing book content " + registryName.toString()); categories.clear(); - isInitialized=false; + isInitialized = false; initializeContent(); } diff --git a/src/main/java/amerifrance/guideapi/api/impl/BookBinder.java b/src/main/java/amerifrance/guideapi/api/impl/BookBinder.java index cad5fde6..090903bb 100644 --- a/src/main/java/amerifrance/guideapi/api/impl/BookBinder.java +++ b/src/main/java/amerifrance/guideapi/api/impl/BookBinder.java @@ -6,10 +6,9 @@ import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.ModContainer; import net.minecraftforge.fml.ModList; -import net.minecraftforge.fml.event.lifecycle.InterModProcessEvent; import net.minecraftforge.forgespi.language.IModInfo; -import java.awt.Color; +import java.awt.*; import java.util.List; import java.util.function.Consumer; @@ -45,7 +44,7 @@ public BookBinder(ResourceLocation registryName) { * @param contentProvider The consumer. Categories are displayed in which they are added to the provided list * @return the builder instance for chaining. */ - public BookBinder setContentProvider(Consumer> contentProvider){ + public BookBinder setContentProvider(Consumer> contentProvider) { this.contentProvider = contentProvider; return this; } @@ -63,7 +62,7 @@ public BookBinder setGuideTitle(String guideTitle) { /** * Sets the header text of this book. The header is displayed at the top of the home page above the category listing. - * + *

* By default, this is the same as {@link #guideTitle}. * * @param header The header text to display. @@ -76,7 +75,7 @@ public BookBinder setHeader(String header) { /** * Sets the unlocalized name for the item containing this book. - * + *

* By default, this is the same as {@link #guideTitle}. * * @param itemName The unlocalized name for this item. @@ -90,7 +89,7 @@ public BookBinder setItemName(String itemName) { /** * The author of this book. If your books are lore-heavy, using an actual author name is acceptable. If not, you can * just use your mod name. - * + *

* By default, this uses the name of the mod container obtained from looking up the domain of {@link #registryName}. * * @param author The author of this book. @@ -104,7 +103,7 @@ public BookBinder setAuthor(String author) { /** * The texture to use for the pages themselves. These are un-colored and drawn just how they appear in the texture file. * The dimensions should remain the same as the default texture. - * + *

* By default, this uses the same page texture as vanilla books. * * @param pageTexture The page texture to use for this guide. @@ -118,7 +117,7 @@ public BookBinder setPageTexture(ResourceLocation pageTexture) { /** * The texture to use for the border of the book. These are colored with {@link #color}. The dimensions should remain * the same as the default texture. - * + *

* By default, this uses a greyscale version of the outline of vanilla books. * * @param outlineTexture The outline texture to use for this guide. @@ -131,7 +130,7 @@ public BookBinder setOutlineTexture(ResourceLocation outlineTexture) { /** * Indicates that the item containing this book has a custom model that you will manually register. - * + *

* By default, a generic book model will be registered and colored with {@link #color}. * * @return the builder instance for chaining. @@ -143,7 +142,7 @@ public BookBinder setHasCustomModel() { /** * Sets the color to overlay on the book model and GUI border. - * + *

* By default, this is a reddish-brown color. * * @param color The color to overlay with. @@ -157,10 +156,9 @@ public BookBinder setColor(Color color) { /** * An overload that takes an RGB color instead of a {@link Color} instance. * - * @see #setColor(int) - * * @param color The color to overlay with. * @return the builder instance for chaining. + * @see #setColor(int) */ public BookBinder setColor(int color) { return setColor(new Color(color)); @@ -169,7 +167,7 @@ public BookBinder setColor(int color) { /** * Sets the default config option for whether new players should spawn with this book in their inventory. Players may * override this in the config if they wish. - * + *

* By default, books will not spawn in the player's inventory. * * @return the builder instance for chaining. @@ -181,7 +179,7 @@ public BookBinder setSpawnWithBook() { /** * Sets the Creative Tab this book should appear in. - * + *

* By default, all books will appear in {@link ItemGroup#MISC}. * * @param creativeTab The creative tab this book should display in. @@ -194,6 +192,7 @@ public BookBinder setCreativeTab(ItemGroup creativeTab) { /** * Constructs a book from the given data. Will modify specific values if not set so they have defaults. + * * @return a constructed book. */ public Book build() { @@ -206,8 +205,8 @@ public Book build() { if (this.itemName == null) this.itemName = guideTitle.substring(5); - if(contentProvider ==null){ - throw new IllegalStateException("Content supplier of book "+registryName.toString()+" must be provided"); + if (contentProvider == null) { + throw new IllegalStateException("Content supplier of book " + registryName.toString() + " must be provided"); } return new Book(contentProvider, guideTitle, header, itemName, author, pageTexture, outlineTexture, hasCustomModel, color, spawnWithBook, registryName, creativeTab); diff --git a/src/main/java/amerifrance/guideapi/api/impl/Entry.java b/src/main/java/amerifrance/guideapi/api/impl/Entry.java index e225450b..126c5c83 100644 --- a/src/main/java/amerifrance/guideapi/api/impl/Entry.java +++ b/src/main/java/amerifrance/guideapi/api/impl/Entry.java @@ -13,10 +13,8 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import net.minecraftforge.fml.client.config.GuiUtils; -import java.awt.Color; -import java.util.Collections; +import java.awt.*; import java.util.List; public class Entry extends EntryAbstract { @@ -66,7 +64,7 @@ public void drawExtras(Book book, CategoryAbstract category, int entryX, int ent cutString = true; if (GuiHelper.isMouseBetween(mouseX, mouseY, entryX, entryY, entryWidth, entryHeight) && cutString) { - guiBase.renderTooltip(getLocalizedName(),entryX,entryY+12); + guiBase.renderTooltip(getLocalizedName(), entryX, entryY + 12); } diff --git a/src/main/java/amerifrance/guideapi/api/impl/Page.java b/src/main/java/amerifrance/guideapi/api/impl/Page.java index 9632dcd9..604ae24d 100644 --- a/src/main/java/amerifrance/guideapi/api/impl/Page.java +++ b/src/main/java/amerifrance/guideapi/api/impl/Page.java @@ -47,7 +47,6 @@ public void onInit(Book book, CategoryAbstract category, EntryAbstract entry, Pl public boolean equals(Object o) { if (this == o) return true; if (o == null) return false; - if (getClass() != o.getClass()) return false; - return true; + return getClass() == o.getClass(); } } diff --git a/src/main/java/amerifrance/guideapi/api/impl/abstraction/CategoryAbstract.java b/src/main/java/amerifrance/guideapi/api/impl/abstraction/CategoryAbstract.java index 2560b668..f99f1805 100644 --- a/src/main/java/amerifrance/guideapi/api/impl/abstraction/CategoryAbstract.java +++ b/src/main/java/amerifrance/guideapi/api/impl/abstraction/CategoryAbstract.java @@ -29,7 +29,7 @@ public CategoryAbstract(Map entries, String nam } public CategoryAbstract(String name) { - this(Maps.newLinkedHashMap(), name); + this(Maps.newLinkedHashMap(), name); } /** @@ -67,8 +67,7 @@ public void addEntries(Map entries) { public void removeEntries(List keys) { for (ResourceLocation key : keys) - if (entries.containsKey(key)) - entries.remove(key); + entries.remove(key); } /** @@ -157,10 +156,7 @@ public boolean equals(Object o) { CategoryAbstract that = (CategoryAbstract) o; if (entries != null ? !entries.equals(that.entries) : that.entries != null) return false; - if (name != null ? !name.equals(that.name) : that.name != null) - return false; - - return true; + return name != null ? name.equals(that.name) : that.name == null; } @Override diff --git a/src/main/java/amerifrance/guideapi/api/impl/abstraction/EntryAbstract.java b/src/main/java/amerifrance/guideapi/api/impl/abstraction/EntryAbstract.java index 1ccc490a..373735ce 100644 --- a/src/main/java/amerifrance/guideapi/api/impl/abstraction/EntryAbstract.java +++ b/src/main/java/amerifrance/guideapi/api/impl/abstraction/EntryAbstract.java @@ -73,10 +73,7 @@ public boolean equals(Object o) { EntryAbstract that = (EntryAbstract) o; if (pageList != null ? !pageList.equals(that.pageList) : that.pageList != null) return false; - if (name != null ? !name.equals(that.name) : that.name != null) - return false; - - return true; + return name != null ? name.equals(that.name) : that.name == null; } @Override diff --git a/src/main/java/amerifrance/guideapi/api/util/IngredientCycler.java b/src/main/java/amerifrance/guideapi/api/util/IngredientCycler.java index f1a78e43..cb3722da 100644 --- a/src/main/java/amerifrance/guideapi/api/util/IngredientCycler.java +++ b/src/main/java/amerifrance/guideapi/api/util/IngredientCycler.java @@ -1,13 +1,7 @@ package amerifrance.guideapi.api.util; -import amerifrance.guideapi.api.IRecipeRenderer; -import amerifrance.guideapi.api.impl.Book; -import amerifrance.guideapi.api.impl.abstraction.CategoryAbstract; -import amerifrance.guideapi.api.impl.abstraction.EntryAbstract; -import amerifrance.guideapi.gui.BaseScreen; import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.FontRenderer; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.Ingredient; @@ -25,8 +19,8 @@ public class IngredientCycler { private int cycleIdx = 0; private Random rand = new Random(); - public void tick(@Nonnull Minecraft mc){ - long time = mc.world!=null?mc.world.getGameTime():0; + public void tick(@Nonnull Minecraft mc) { + long time = mc.world != null ? mc.world.getGameTime() : 0; if (lastCycle < 0 || lastCycle < time - 20) { if (lastCycle > 0) { cycleIdx++; @@ -40,15 +34,16 @@ public void tick(@Nonnull Minecraft mc){ * Retrieves a itemstack that matches the ingredient. * Cycles though all matching stacks. * Must call {@link IngredientCycler#tick(Minecraft)} before (e.g. once per onDraw) + * * @param ingredient The ingredient - * @param index An "unique" id for this ingredient, so multiple ingredients can be cycled independently + * @param index An "unique" id for this ingredient, so multiple ingredients can be cycled independently * @return Optional. Can be empty if ingredient is invalid and has no matching stacks */ - public Optional getCycledIngredientStack(@Nonnull Ingredient ingredient, int index){ + public Optional getCycledIngredientStack(@Nonnull Ingredient ingredient, int index) { ItemStack[] itemStacks = ingredient.getMatchingStacks(); - if(itemStacks.length>0){ + if (itemStacks.length > 0) { rand.setSeed(index); - int id = (index + rand.nextInt(itemStacks.length) + cycleIdx) %itemStacks.length; + int id = (index + rand.nextInt(itemStacks.length) + cycleIdx) % itemStacks.length; return Optional.of(itemStacks[id]); } return Optional.empty(); diff --git a/src/main/java/amerifrance/guideapi/api/util/PageHelper.java b/src/main/java/amerifrance/guideapi/api/util/PageHelper.java index 7a596136..95a43740 100644 --- a/src/main/java/amerifrance/guideapi/api/util/PageHelper.java +++ b/src/main/java/amerifrance/guideapi/api/util/PageHelper.java @@ -1,7 +1,6 @@ package amerifrance.guideapi.api.util; import amerifrance.guideapi.api.IPage; -import amerifrance.guideapi.api.impl.Page; import amerifrance.guideapi.gui.BaseScreen; import amerifrance.guideapi.page.PageItemStack; import amerifrance.guideapi.page.PageText; @@ -14,38 +13,37 @@ import net.minecraft.item.crafting.Ingredient; import org.apache.commons.lang3.StringEscapeUtils; import org.apache.commons.lang3.StringUtils; -import org.apache.commons.lang3.text.WordUtils; import java.util.ArrayList; import java.util.List; public class PageHelper { - /** * Split the given text into multiple section if it does not fit one page. * The first page can have a different number of lines than the subsequent ones if desired * Insert new line characters to wrap the text to the available line width. - * @param locText Text to process - * @param lineWidth Available width (pixel) - * @param firstHeight Available height on the first page (pixel) + * + * @param locText Text to process + * @param lineWidth Available width (pixel) + * @param firstHeight Available height on the first page (pixel) * @param subsequentHeight Available height on subsequent pages (pixel) * @return Each list element should be drawn on a individual page. Lines are wrapped using '\n' */ - public static List prepareForLongText(String locText, int lineWidth, int firstHeight, int subsequentHeight){ + public static List prepareForLongText(String locText, int lineWidth, int firstHeight, int subsequentHeight) { FontRenderer fontRenderer = Minecraft.getInstance().fontRenderer; - int firstCount = firstHeight/fontRenderer.FONT_HEIGHT; - int count = subsequentHeight/fontRenderer.FONT_HEIGHT; - List lines = new ArrayList<>(fontRenderer.listFormattedStringToWidth(locText,lineWidth)); //Create a new list from returned list so we can later remove items + int firstCount = firstHeight / fontRenderer.FONT_HEIGHT; + int count = subsequentHeight / fontRenderer.FONT_HEIGHT; + List lines = new ArrayList<>(fontRenderer.listFormattedStringToWidth(locText, lineWidth)); //Create a new list from returned list so we can later remove items List pages = new ArrayList<>(); - List pageLines = lines.size()>firstCount ? lines.subList(0,firstCount):lines; - pages.add(StringUtils.join( pageLines, "\n")); + List pageLines = lines.size() > firstCount ? lines.subList(0, firstCount) : lines; + pages.add(StringUtils.join(pageLines, "\n")); pageLines.clear(); - while(lines.size()>0){ - pageLines = lines.size()>count ? lines.subList(0,count):lines; - pages.add(StringUtils.join(pageLines,"\n")); + while (lines.size() > 0) { + pageLines = lines.size() > count ? lines.subList(0, count) : lines; + pages.add(StringUtils.join(pageLines, "\n")); pageLines.clear(); } return pages; @@ -54,14 +52,13 @@ public static List prepareForLongText(String locText, int lineWidth, int /** * Spread the text over multiple pages if necessary. Display ingredient at first page */ - public static List pagesForLongText(String locText, Ingredient ingredient){ - List pageText = prepareForLongText(locText,164,79,120); + public static List pagesForLongText(String locText, Ingredient ingredient) { + List pageText = prepareForLongText(locText, 164, 79, 120); List pageList = new ArrayList<>(); - for(int i=0;i pagesForLongText(String locText, Ingredient ingredient } - public static List pagesForLongText(String locText){ + public static List pagesForLongText(String locText) { List pageList = new ArrayList<>(); - prepareForLongText(locText,164,120,120).forEach(t->pageList.add(new PageText(t))); + prepareForLongText(locText, 164, 120, 120).forEach(t -> pageList.add(new PageText(t))); return pageList; } @@ -109,7 +106,7 @@ public static List pagesForLongText(String locText, Block block) { /** * @param locText - Text - * @param item - The stack to put on the first page + * @param item - The stack to put on the first page * @return a list of IPages with the text cut to fit on page */ public static List pagesForLongText(String locText, ItemStack item) { @@ -125,8 +122,7 @@ public static boolean areIRecipesEqual(IRecipe recipe1, IRecipe recipe2) { if (recipe1 == recipe2) return true; if (recipe1 == null || recipe2 == null || recipe1.getClass() != recipe2.getClass()) return false; if (recipe1.equals(recipe2)) return true; - if (!recipe1.getRecipeOutput().isItemEqual(recipe2.getRecipeOutput())) return false; + return recipe1.getRecipeOutput().isItemEqual(recipe2.getRecipeOutput()); // if (recipe1.getRecipeSize() != recipe2.getRecipeSize()) return false;//FN was removed, there is no size now - return true; } } diff --git a/src/main/java/amerifrance/guideapi/api/util/TextHelper.java b/src/main/java/amerifrance/guideapi/api/util/TextHelper.java index f135691b..bf6a6c34 100644 --- a/src/main/java/amerifrance/guideapi/api/util/TextHelper.java +++ b/src/main/java/amerifrance/guideapi/api/util/TextHelper.java @@ -1,6 +1,5 @@ package amerifrance.guideapi.api.util; -import net.minecraft.client.resources.I18n; import net.minecraftforge.fml.ForgeI18n; import org.apache.commons.lang3.text.WordUtils; diff --git a/src/main/java/amerifrance/guideapi/button/ButtonBack.java b/src/main/java/amerifrance/guideapi/button/ButtonBack.java index 8f71deb7..6c258196 100644 --- a/src/main/java/amerifrance/guideapi/button/ButtonBack.java +++ b/src/main/java/amerifrance/guideapi/button/ButtonBack.java @@ -18,7 +18,7 @@ public class ButtonBack extends ButtonGuideAPI { public ButtonBack(int widthIn, int heightIn, Button.IPressable onPress, BaseScreen guiBase) { - super(widthIn, heightIn, 18, 10, onPress,guiBase); + super(widthIn, heightIn, 18, 10, onPress, guiBase); } @Override @@ -30,10 +30,10 @@ public void renderButton(int mouseX, int mouseY, float partialTicks) { GlStateManager.color4f(1.0F, 1.0F, 1.0F, 1.0F); Minecraft.getInstance().getTextureManager().bindTexture(new ResourceLocation(GuideMod.ID, "textures/gui/book_colored.png")); if (GuiHelper.isMouseBetween(mouseX, mouseY, x, y, width, height)) { - this.blit(x,y+1,70,201,18,10); - GuiUtils.drawHoveringText(getHoveringText(),mouseX,mouseY,guiBase.width,guiBase.height,-1,Minecraft.getInstance().fontRenderer); + this.blit(x, y + 1, 70, 201, 18, 10); + GuiUtils.drawHoveringText(getHoveringText(), mouseX, mouseY, guiBase.width, guiBase.height, -1, Minecraft.getInstance().fontRenderer); } else { - this.blit(x,y,94,201,18,10); + this.blit(x, y, 94, 201, 18, 10); } GlStateManager.disableBlend(); RenderHelper.disableStandardItemLighting(); diff --git a/src/main/java/amerifrance/guideapi/button/ButtonNext.java b/src/main/java/amerifrance/guideapi/button/ButtonNext.java index df9917da..343e1b04 100644 --- a/src/main/java/amerifrance/guideapi/button/ButtonNext.java +++ b/src/main/java/amerifrance/guideapi/button/ButtonNext.java @@ -18,24 +18,24 @@ public class ButtonNext extends ButtonGuideAPI { public ButtonNext(int widthIn, int heightIn, Button.IPressable onPress, BaseScreen guiBase) { - super(widthIn, heightIn, 18, 10, onPress,guiBase); + super(widthIn, heightIn, 18, 10, onPress, guiBase); } @Override - public void renderButton( int mouseX, int mouseY, float partialTicks) { - RenderHelper.enableGUIStandardItemLighting(); - GlStateManager.enableBlend(); - GlStateManager.color4f(1.0F, 1.0F, 1.0F, 1.0F); - GlStateManager.disableLighting(); - Minecraft.getInstance().getTextureManager().bindTexture(new ResourceLocation(GuideMod.ID, "textures/gui/book_colored.png")); - if (GuiHelper.isMouseBetween(mouseX, mouseY, x, y, width, height)) { - this.blit(x,y+1,47,201,18,10); - GuiUtils.drawHoveringText(getHoveringText(),mouseX,mouseY,guiBase.width,guiBase.height,-1,Minecraft.getInstance().fontRenderer); - } else { - this.blit(x,y,24,201,18,10); - } - GlStateManager.disableBlend(); - RenderHelper.disableStandardItemLighting(); + public void renderButton(int mouseX, int mouseY, float partialTicks) { + RenderHelper.enableGUIStandardItemLighting(); + GlStateManager.enableBlend(); + GlStateManager.color4f(1.0F, 1.0F, 1.0F, 1.0F); + GlStateManager.disableLighting(); + Minecraft.getInstance().getTextureManager().bindTexture(new ResourceLocation(GuideMod.ID, "textures/gui/book_colored.png")); + if (GuiHelper.isMouseBetween(mouseX, mouseY, x, y, width, height)) { + this.blit(x, y + 1, 47, 201, 18, 10); + GuiUtils.drawHoveringText(getHoveringText(), mouseX, mouseY, guiBase.width, guiBase.height, -1, Minecraft.getInstance().fontRenderer); + } else { + this.blit(x, y, 24, 201, 18, 10); + } + GlStateManager.disableBlend(); + RenderHelper.disableStandardItemLighting(); } diff --git a/src/main/java/amerifrance/guideapi/button/ButtonPrev.java b/src/main/java/amerifrance/guideapi/button/ButtonPrev.java index 2efd593e..97b804d4 100644 --- a/src/main/java/amerifrance/guideapi/button/ButtonPrev.java +++ b/src/main/java/amerifrance/guideapi/button/ButtonPrev.java @@ -18,7 +18,7 @@ public class ButtonPrev extends ButtonGuideAPI { public ButtonPrev(int widthIn, int heightIn, Button.IPressable onPress, BaseScreen guiBase) { - super(widthIn, heightIn, 18, 10, onPress,guiBase); + super(widthIn, heightIn, 18, 10, onPress, guiBase); } @Override @@ -30,10 +30,10 @@ public void renderButton(int mouseX, int mouseY, float partialTicks) { GlStateManager.disableLighting(); Minecraft.getInstance().getTextureManager().bindTexture(new ResourceLocation(GuideMod.ID, "textures/gui/book_colored.png")); if (GuiHelper.isMouseBetween(mouseX, mouseY, x, y, width, height)) { - this.blit(x,y+1,47,214,18,10); - GuiUtils.drawHoveringText(getHoveringText(),mouseX,mouseY,guiBase.width,guiBase.height,-1,Minecraft.getInstance().fontRenderer); + this.blit(x, y + 1, 47, 214, 18, 10); + GuiUtils.drawHoveringText(getHoveringText(), mouseX, mouseY, guiBase.width, guiBase.height, -1, Minecraft.getInstance().fontRenderer); } else { - this.blit(x,y,24,214,18,10); + this.blit(x, y, 24, 214, 18, 10); } GlStateManager.disableBlend(); RenderHelper.disableStandardItemLighting(); diff --git a/src/main/java/amerifrance/guideapi/button/ButtonSearch.java b/src/main/java/amerifrance/guideapi/button/ButtonSearch.java index f75b06b2..c7055aff 100644 --- a/src/main/java/amerifrance/guideapi/button/ButtonSearch.java +++ b/src/main/java/amerifrance/guideapi/button/ButtonSearch.java @@ -17,7 +17,7 @@ public class ButtonSearch extends ButtonGuideAPI { public ButtonSearch(int widthIn, int heightIn, Button.IPressable onPress, BaseScreen guiBase) { - super(widthIn, heightIn, 15, 15, onPress,guiBase); + super(widthIn, heightIn, 15, 15, onPress, guiBase); } @Override @@ -29,7 +29,7 @@ public void renderButton(int mouseX, int mouseY, float partialTicks) { GlStateManager.disableLighting(); if (GuiHelper.isMouseBetween(mouseX, mouseY, x, y, width, height)) { SubTexture.MAGNIFYING_GLASS.draw(x, y + 1); - GuiUtils.drawHoveringText(getHoveringText(),mouseX,mouseY,guiBase.width,guiBase.height,-1,Minecraft.getInstance().fontRenderer); + GuiUtils.drawHoveringText(getHoveringText(), mouseX, mouseY, guiBase.width, guiBase.height, -1, Minecraft.getInstance().fontRenderer); } else { SubTexture.MAGNIFYING_GLASS.draw(x, y); } diff --git a/src/main/java/amerifrance/guideapi/category/CategoryItemStack.java b/src/main/java/amerifrance/guideapi/category/CategoryItemStack.java index 64973a89..951b53e3 100644 --- a/src/main/java/amerifrance/guideapi/category/CategoryItemStack.java +++ b/src/main/java/amerifrance/guideapi/category/CategoryItemStack.java @@ -5,13 +5,11 @@ import amerifrance.guideapi.api.impl.abstraction.EntryAbstract; import amerifrance.guideapi.api.util.GuiHelper; import amerifrance.guideapi.gui.BaseScreen; -import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import net.minecraftforge.fml.client.config.GuiUtils; import java.util.Map; @@ -39,7 +37,7 @@ public void draw(Book book, int categoryX, int categoryY, int categoryWidth, int @OnlyIn(Dist.CLIENT) public void drawExtras(Book book, int categoryX, int categoryY, int categoryWidth, int categoryHeight, int mouseX, int mouseY, BaseScreen guiBase, boolean drawOnLeft, ItemRenderer renderItem) { if (canSee(guiBase.player, guiBase.bookStack) && GuiHelper.isMouseBetween(mouseX, mouseY, categoryX, categoryY, categoryWidth, categoryHeight)) - guiBase.renderTooltip(this.getTooltip(),mouseX,mouseY); + guiBase.renderTooltip(this.getTooltip(), mouseX, mouseY); } @Override diff --git a/src/main/java/amerifrance/guideapi/category/CategoryResourceLocation.java b/src/main/java/amerifrance/guideapi/category/CategoryResourceLocation.java index 0e5dda90..908a5a1a 100644 --- a/src/main/java/amerifrance/guideapi/category/CategoryResourceLocation.java +++ b/src/main/java/amerifrance/guideapi/category/CategoryResourceLocation.java @@ -10,7 +10,6 @@ import net.minecraft.util.ResourceLocation; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import net.minecraftforge.fml.client.config.GuiUtils; import java.util.Map; @@ -39,7 +38,7 @@ public void draw(Book book, int categoryX, int categoryY, int categoryWidth, int @OnlyIn(Dist.CLIENT) public void drawExtras(Book book, int categoryX, int categoryY, int categoryWidth, int categoryHeight, int mouseX, int mouseY, BaseScreen guiBase, boolean drawOnLeft, ItemRenderer renderItem) { if (canSee(guiBase.player, guiBase.bookStack) && GuiHelper.isMouseBetween(mouseX, mouseY, categoryX, categoryY, categoryWidth, categoryHeight)) - guiBase.renderTooltip(this.getTooltip(),mouseX,mouseY); + guiBase.renderTooltip(this.getTooltip(), mouseX, mouseY); } @Override diff --git a/src/main/java/amerifrance/guideapi/gui/BaseScreen.java b/src/main/java/amerifrance/guideapi/gui/BaseScreen.java index e8c13701..94c4fa41 100644 --- a/src/main/java/amerifrance/guideapi/gui/BaseScreen.java +++ b/src/main/java/amerifrance/guideapi/gui/BaseScreen.java @@ -42,12 +42,11 @@ public boolean isPauseScreen() { @Override public boolean keyPressed(int p_keyPressed_1_, int p_keyPressed_2_, int p_keyPressed_3_) { - if (minecraft!=null&&(p_keyPressed_1_ == GLFW.GLFW_KEY_ESCAPE || p_keyPressed_1_==this.minecraft.gameSettings.keyBindInventory.getKey().getKeyCode())) { + if (minecraft != null && (p_keyPressed_1_ == GLFW.GLFW_KEY_ESCAPE || p_keyPressed_1_ == this.minecraft.gameSettings.keyBindInventory.getKey().getKeyCode())) { this.onClose(); this.minecraft.setGameFocused(true); return true; - } - else{ + } else { return super.keyPressed(p_keyPressed_1_, p_keyPressed_2_, p_keyPressed_3_); } } @@ -62,10 +61,10 @@ public void drawTexturedModalRectWithColor(int x, int y, int textureX, int textu color3f((float) color.getRed() / 255F, (float) color.getGreen() / 255F, (float) color.getBlue() / 255F); Tessellator tessellator = Tessellator.getInstance(); tessellator.getBuffer().begin(7, DefaultVertexFormats.POSITION_TEX); - tessellator.getBuffer().pos((double) (x), (double) (y + height), (double) this.blitOffset).tex((double) ((float) (textureX) * f), (double) ((float) (textureY + height) * f1)).endVertex(); - tessellator.getBuffer().pos((double) (x + width), (double) (y + height), (double) this.blitOffset).tex((double) ((float) (textureX + width) * f), (double) ((float) (textureY + height) * f1)).endVertex(); - tessellator.getBuffer().pos((double) (x + width), (double) (y), (double) this.blitOffset).tex((double) ((float) (textureX + width) * f), (double) ((float) (textureY) * f1)).endVertex(); - tessellator.getBuffer().pos((double) (x), (double) (y), (double) this.blitOffset).tex((double) ((float) (textureX) * f), (double) ((float) (textureY) * f1)).endVertex(); + tessellator.getBuffer().pos(x, y + height, this.blitOffset).tex((float) (textureX) * f, (float) (textureY + height) * f1).endVertex(); + tessellator.getBuffer().pos(x + width, y + height, this.blitOffset).tex((float) (textureX + width) * f, (float) (textureY + height) * f1).endVertex(); + tessellator.getBuffer().pos(x + width, y, this.blitOffset).tex((float) (textureX + width) * f, (float) (textureY) * f1).endVertex(); + tessellator.getBuffer().pos(x, y, this.blitOffset).tex((float) (textureX) * f, (float) (textureY) * f1).endVertex(); tessellator.draw(); disableBlend(); popMatrix(); @@ -82,12 +81,12 @@ public void drawCenteredStringWithShadow(FontRenderer fontRendererObj, String st super.drawCenteredString(fontRendererObj, string, x, y, color); } - public void drawHoveringTextComponents(List tooltip , int mouseX, int mouseY){ - this.drawHoveringText(tooltip.stream().map(ITextComponent::getFormattedText).collect(Collectors.toList()), mouseX,mouseY); + public void drawHoveringTextComponents(List tooltip, int mouseX, int mouseY) { + this.drawHoveringText(tooltip.stream().map(ITextComponent::getFormattedText).collect(Collectors.toList()), mouseX, mouseY); } - public void drawHoveringText(List tooltip , int mouseX, int mouseY){ - GuiUtils.drawHoveringText(tooltip,mouseX,mouseY,width,height,-1,font); + public void drawHoveringText(List tooltip, int mouseX, int mouseY) { + GuiUtils.drawHoveringText(tooltip, mouseX, mouseY, width, height, -1, font); } diff --git a/src/main/java/amerifrance/guideapi/gui/CategoryScreen.java b/src/main/java/amerifrance/guideapi/gui/CategoryScreen.java index 6ba814fe..99e8bf7b 100644 --- a/src/main/java/amerifrance/guideapi/gui/CategoryScreen.java +++ b/src/main/java/amerifrance/guideapi/gui/CategoryScreen.java @@ -19,10 +19,9 @@ import net.minecraft.util.text.TranslationTextComponent; import org.lwjgl.glfw.GLFW; -import java.awt.Color; -import java.util.List; - import javax.annotation.Nullable; +import java.awt.*; +import java.util.List; public class CategoryScreen extends BaseScreen { @@ -36,10 +35,11 @@ public class CategoryScreen extends BaseScreen { public ButtonPrev buttonPrev; public ButtonSearch buttonSearch; public int entryPage; - @Nullable public EntryAbstract startEntry; + @Nullable + public EntryAbstract startEntry; public CategoryScreen(Book book, CategoryAbstract category, PlayerEntity player, ItemStack bookStack, @Nullable EntryAbstract startEntry) { - super(new TranslationTextComponent(category.name),player, bookStack); + super(new TranslationTextComponent(category.name), player, bookStack); this.book = book; this.category = category; this.pageTexture = book.getPageTexture(); @@ -55,22 +55,22 @@ public void init() { guiLeft = (this.width - this.xSize) / 2; guiTop = (this.height - this.ySize) / 2; - addButton(buttonBack = new ButtonBack( guiLeft + xSize / 6, guiTop, (btn) ->{ + addButton(buttonBack = new ButtonBack(guiLeft + xSize / 6, guiTop, (btn) -> { this.minecraft.displayGuiScreen(new HomeScreen(book, player, bookStack)); - },this)); - addButton(buttonNext = new ButtonNext( guiLeft + 4 * xSize / 6, guiTop + 5 * ySize / 6, (btn) -> { - if(entryPage+1 { + if (entryPage + 1 < entryWrapperMap.asMap().size()) { nextPage(); } - },this)); - addButton(buttonPrev = new ButtonPrev( guiLeft + xSize / 5, guiTop + 5 * ySize / 6, (btn)->{ - if(entryPage>0){ + }, this)); + addButton(buttonPrev = new ButtonPrev(guiLeft + xSize / 5, guiTop + 5 * ySize / 6, (btn) -> { + if (entryPage > 0) { prevPage(); } - },this)); - addButton(buttonSearch = new ButtonSearch( (guiLeft + xSize / 6) - 25, guiTop + 5, (btn) -> { + }, this)); + addButton(buttonSearch = new ButtonSearch((guiLeft + xSize / 6) - 25, guiTop + 5, (btn) -> { this.minecraft.displayGuiScreen(new SearchScreen(book, player, bookStack, this)); - },this)); + }, this)); int eX = guiLeft + 37; int eY = guiTop + 15; @@ -147,7 +147,7 @@ public boolean mouseScrolled(double p_mouseScrolled_1_, double p_mouseScrolled_3 else if (movement > 0) prevPage(); - return movement!=0||super.mouseScrolled(p_mouseScrolled_1_, p_mouseScrolled_3_, movement); + return movement != 0 || super.mouseScrolled(p_mouseScrolled_1_, p_mouseScrolled_3_, movement); } @Override @@ -155,14 +155,12 @@ public boolean keyPressed(int keyCode, int p_keyPressed_2_, int p_keyPressed_3_) if (keyCode == GLFW.GLFW_KEY_BACKSPACE || keyCode == this.minecraft.gameSettings.keyBindUseItem.getKey().getKeyCode()) { this.minecraft.displayGuiScreen(new HomeScreen(book, player, bookStack)); return true; - } - else if ((keyCode == GLFW.GLFW_KEY_UP || keyCode == GLFW.GLFW_KEY_RIGHT) && entryPage + 1 < entryWrapperMap.asMap().size()) { + } else if ((keyCode == GLFW.GLFW_KEY_UP || keyCode == GLFW.GLFW_KEY_RIGHT) && entryPage + 1 < entryWrapperMap.asMap().size()) { nextPage(); return true; - } - else if ((keyCode == GLFW.GLFW_KEY_DOWN|| keyCode == GLFW.GLFW_KEY_LEFT) && entryPage > 0){ + } else if ((keyCode == GLFW.GLFW_KEY_DOWN || keyCode == GLFW.GLFW_KEY_LEFT) && entryPage > 0) { prevPage(); return true; } @@ -170,7 +168,6 @@ else if ((keyCode == GLFW.GLFW_KEY_DOWN|| keyCode == GLFW.GLFW_KEY_LEFT) && entr } - @Override public void onClose() { super.onClose(); diff --git a/src/main/java/amerifrance/guideapi/gui/EntryScreen.java b/src/main/java/amerifrance/guideapi/gui/EntryScreen.java index d4909fe2..0f2d653e 100644 --- a/src/main/java/amerifrance/guideapi/gui/EntryScreen.java +++ b/src/main/java/amerifrance/guideapi/gui/EntryScreen.java @@ -19,7 +19,7 @@ import net.minecraft.util.text.TranslationTextComponent; import org.lwjgl.glfw.GLFW; -import java.awt.Color; +import java.awt.*; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -39,7 +39,7 @@ public class EntryScreen extends BaseScreen { public int pageNumber; public EntryScreen(Book book, CategoryAbstract category, EntryAbstract entry, PlayerEntity player, ItemStack bookStack) { - super(new TranslationTextComponent(entry.name),player, bookStack); + super(new TranslationTextComponent(entry.name), player, bookStack); this.book = book; this.category = category; this.entry = entry; @@ -47,7 +47,7 @@ public EntryScreen(Book book, CategoryAbstract category, EntryAbstract entry, Pl this.outlineTexture = book.getOutlineTexture(); this.pageNumber = 0; } - + @Override public void init() { @@ -58,23 +58,23 @@ public void init() { guiLeft = (this.width - this.xSize) / 2; guiTop = (this.height - this.ySize) / 2; - addButton(buttonBack = new ButtonBack( guiLeft + xSize / 6, guiTop, (btn)-> { + addButton(buttonBack = new ButtonBack(guiLeft + xSize / 6, guiTop, (btn) -> { this.minecraft.displayGuiScreen(new CategoryScreen(book, category, player, bookStack, entry)); - },this)); - addButton(buttonNext = new ButtonNext( guiLeft + 4 * xSize / 6, guiTop + 5 * ySize / 6, (btn)->{ - if(pageNumber+1 { + if (pageNumber + 1 < pageWrapperList.size()) { nextPage(); } - },this)); - addButton(buttonPrev = new ButtonPrev( guiLeft + xSize / 5, guiTop + 5 * ySize / 6, (btn)->{ - if(pageNumber>0){ + }, this)); + addButton(buttonPrev = new ButtonPrev(guiLeft + xSize / 5, guiTop + 5 * ySize / 6, (btn) -> { + if (pageNumber > 0) { prevPage(); } - },this)); - addButton(buttonSearch = new ButtonSearch( (guiLeft + xSize / 6) - 25, guiTop + 5, (btn)->{ + }, this)); + addButton(buttonSearch = new ButtonSearch((guiLeft + xSize / 6) - 25, guiTop + 5, (btn) -> { this.minecraft.displayGuiScreen(new SearchScreen(book, player, bookStack, this)); - },this)); + }, this)); for (IPage page : this.entry.pageList) { page.onInit(book, category, entry, player, bookStack, this); @@ -109,7 +109,7 @@ public void render(int mouseX, int mouseY, float renderPartialTicks) { @Override public boolean mouseClicked(double mouseX, double mouseY, int typeofClick) { - if(!super.mouseClicked(mouseX, mouseY, typeofClick)){ + if (!super.mouseClicked(mouseX, mouseY, typeofClick)) { for (PageWrapper wrapper : this.pageWrapperList) { if (wrapper.isMouseOnWrapper(mouseX, mouseY) && wrapper.canPlayerSee()) { if (typeofClick == 0) { @@ -142,7 +142,7 @@ else if (movement > 0) prevPage(); - return movement!=0||super.mouseScrolled(p_mouseScrolled_1_, p_mouseScrolled_3_, movement); + return movement != 0 || super.mouseScrolled(p_mouseScrolled_1_, p_mouseScrolled_3_, movement); } @@ -151,12 +151,10 @@ public boolean keyPressed(int keyCode, int p_keyPressed_2_, int p_keyPressed_3_) if (keyCode == GLFW.GLFW_KEY_BACKSPACE || keyCode == this.minecraft.gameSettings.keyBindUseItem.getKey().getKeyCode()) { this.minecraft.displayGuiScreen(new CategoryScreen(book, category, player, bookStack, entry)); return true; - } - else if ((keyCode == GLFW.GLFW_KEY_UP || keyCode == GLFW.GLFW_KEY_RIGHT) && pageNumber + 1 < pageWrapperList.size()){ + } else if ((keyCode == GLFW.GLFW_KEY_UP || keyCode == GLFW.GLFW_KEY_RIGHT) && pageNumber + 1 < pageWrapperList.size()) { nextPage(); return true; - } - else if ((keyCode == GLFW.GLFW_KEY_DOWN || keyCode == GLFW.GLFW_KEY_LEFT) && pageNumber > 0){ + } else if ((keyCode == GLFW.GLFW_KEY_DOWN || keyCode == GLFW.GLFW_KEY_LEFT) && pageNumber > 0) { prevPage(); return true; } diff --git a/src/main/java/amerifrance/guideapi/gui/HomeScreen.java b/src/main/java/amerifrance/guideapi/gui/HomeScreen.java index 7b309e3b..7de0ea5a 100644 --- a/src/main/java/amerifrance/guideapi/gui/HomeScreen.java +++ b/src/main/java/amerifrance/guideapi/gui/HomeScreen.java @@ -10,7 +10,6 @@ import amerifrance.guideapi.network.PacketSyncHome; import amerifrance.guideapi.wrapper.CategoryWrapper; import com.google.common.collect.HashMultimap; -import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; @@ -18,7 +17,7 @@ import net.minecraft.util.text.StringTextComponent; import org.lwjgl.glfw.GLFW; -import java.awt.Color; +import java.awt.*; public class HomeScreen extends BaseScreen { @@ -32,7 +31,7 @@ public class HomeScreen extends BaseScreen { public int categoryPage; public HomeScreen(Book book, PlayerEntity player, ItemStack bookStack) { - super(new StringTextComponent(book.getTitle()),player, bookStack); + super(new StringTextComponent(book.getTitle()), player, bookStack); this.book = book; this.pageTexture = book.getPageTexture(); this.outlineTexture = book.getOutlineTexture(); @@ -46,19 +45,19 @@ public void init() { guiLeft = (this.width - this.xSize) / 2; guiTop = (this.height - this.ySize) / 2; - addButton(buttonNext = new ButtonNext( guiLeft + 4 * xSize / 6, guiTop + 5 * ySize / 6, (btn)->{ - if(categoryPage+1 < categoryWrapperMap.asMap().size()){ + addButton(buttonNext = new ButtonNext(guiLeft + 4 * xSize / 6, guiTop + 5 * ySize / 6, (btn) -> { + if (categoryPage + 1 < categoryWrapperMap.asMap().size()) { nextPage(); } - },this)); - addButton(buttonPrev = new ButtonPrev( guiLeft + xSize / 5, guiTop + 5 * ySize / 6, (btn)->{ - if(categoryPage>0){ + }, this)); + addButton(buttonPrev = new ButtonPrev(guiLeft + xSize / 5, guiTop + 5 * ySize / 6, (btn) -> { + if (categoryPage > 0) { prevPage(); } - },this)); - addButton(buttonSearch = new ButtonSearch( (guiLeft + xSize / 6) - 25, guiTop + 5, (btn)->{ + }, this)); + addButton(buttonSearch = new ButtonSearch((guiLeft + xSize / 6) - 25, guiTop + 5, (btn) -> { minecraft.displayGuiScreen(new SearchScreen(book, player, bookStack, this)); - },this)); + }, this)); int cX = guiLeft + 45; int cY = guiTop + 40; @@ -138,7 +137,7 @@ public void render(int mouseX, int mouseY, float renderPartialTicks) { @Override public boolean mouseClicked(double mouseX, double mouseY, int typeofClick) { - if(!super.mouseClicked(mouseX, mouseY, typeofClick)){ + if (!super.mouseClicked(mouseX, mouseY, typeofClick)) { for (CategoryWrapper wrapper : this.categoryWrapperMap.get(categoryPage)) { if (wrapper.isMouseOnWrapper(mouseX, mouseY) && wrapper.canPlayerSee()) { if (typeofClick == 0) @@ -165,17 +164,14 @@ public boolean mouseScrolled(double p_mouseScrolled_1_, double p_mouseScrolled_3 else if (movement > 0) prevPage(); - return movement!=0 || super.mouseScrolled(p_mouseScrolled_1_, p_mouseScrolled_3_, movement); + return movement != 0 || super.mouseScrolled(p_mouseScrolled_1_, p_mouseScrolled_3_, movement); } @Override public boolean keyPressed(int keyCode, int p_keyPressed_2_, int p_keyPressed_3_) { - if ((keyCode == GLFW.GLFW_KEY_UP || keyCode == GLFW.GLFW_KEY_RIGHT) && categoryPage + 1 < categoryWrapperMap.asMap().size()) - { + if ((keyCode == GLFW.GLFW_KEY_UP || keyCode == GLFW.GLFW_KEY_RIGHT) && categoryPage + 1 < categoryWrapperMap.asMap().size()) { nextPage(); - } - - else if ((keyCode == GLFW.GLFW_KEY_DOWN || keyCode == GLFW.GLFW_KEY_LEFT) && categoryPage > 0){ + } else if ((keyCode == GLFW.GLFW_KEY_DOWN || keyCode == GLFW.GLFW_KEY_LEFT) && categoryPage > 0) { prevPage(); } @@ -183,7 +179,6 @@ else if ((keyCode == GLFW.GLFW_KEY_DOWN || keyCode == GLFW.GLFW_KEY_LEFT) && cat } - @Override public void onClose() { super.onClose(); diff --git a/src/main/java/amerifrance/guideapi/gui/SearchScreen.java b/src/main/java/amerifrance/guideapi/gui/SearchScreen.java index 32e6b82a..30c624dc 100644 --- a/src/main/java/amerifrance/guideapi/gui/SearchScreen.java +++ b/src/main/java/amerifrance/guideapi/gui/SearchScreen.java @@ -22,7 +22,7 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; -import java.awt.Color; +import java.awt.*; import java.util.List; import java.util.Locale; @@ -40,7 +40,7 @@ public class SearchScreen extends BaseScreen { private String lastQuery = ""; public SearchScreen(Book book, PlayerEntity player, ItemStack bookStack, Screen parent) { - super(new TranslationTextComponent(book.getTitle()),player, bookStack); + super(new TranslationTextComponent(book.getTitle()), player, bookStack); this.book = book; this.pageTexture = book.getPageTexture(); @@ -56,20 +56,20 @@ public void init() { guiLeft = (this.width - this.xSize) / 2; guiTop = (this.height - this.ySize) / 2; - addButton(new ButtonBack( guiLeft + xSize / 6, guiTop, (btn)->{ + addButton(new ButtonBack(guiLeft + xSize / 6, guiTop, (btn) -> { minecraft.displayGuiScreen(parent); - },this)); - addButton(buttonNext = new ButtonNext( guiLeft + 4 * xSize / 6, guiTop + 5 * ySize / 6, (btn)->{ + }, this)); + addButton(buttonNext = new ButtonNext(guiLeft + 4 * xSize / 6, guiTop + 5 * ySize / 6, (btn) -> { if (currentPage <= searchResults.size() - 1) currentPage++; - },this)); - addButton(buttonPrev = new ButtonPrev( guiLeft + xSize / 5, guiTop + 5 * ySize / 6, (btn)->{ + }, this)); + addButton(buttonPrev = new ButtonPrev(guiLeft + xSize / 5, guiTop + 5 * ySize / 6, (btn) -> { if (currentPage > 0) currentPage--; - },this)); + }, this)); - searchField = new TextFieldWidget( font, guiLeft + 43, guiTop + 12, 100, 10,""); + searchField = new TextFieldWidget(font, guiLeft + 43, guiTop + 12, 100, 10, ""); searchField.setEnableBackgroundDrawing(false); searchField.changeFocus(true); searchResults = getMatches(book, null, player, bookStack); @@ -117,14 +117,14 @@ public void render(int mouseX, int mouseY, float partialTicks) { @Override public boolean mouseClicked(double mouseX, double mouseY, int typeofClick) { - if(!super.mouseClicked(mouseX, mouseY, typeofClick)){ + if (!super.mouseClicked(mouseX, mouseY, typeofClick)) { if (typeofClick == 1) { if (GuiHelper.isMouseBetween(mouseX, mouseY, searchField.x, searchField.y, searchField.getAdjustedWidth(), searchField.getHeight())) { searchField.setText(""); lastQuery = ""; searchResults = getMatches(book, "", player, bookStack); return true; - } else{ + } else { minecraft.displayGuiScreen(parent); return true; } @@ -145,27 +145,27 @@ public boolean mouseScrolled(double p_mouseScrolled_1_, double p_mouseScrolled_3 else if (movement > 0 && buttonPrev.visible && currentPage > 0) currentPage--; - return movement!=0 || super.mouseScrolled(p_mouseScrolled_1_, p_mouseScrolled_3_, movement); + return movement != 0 || super.mouseScrolled(p_mouseScrolled_1_, p_mouseScrolled_3_, movement); } @Override public boolean keyPressed(int keyCode, int p_keyPressed_2_, int p_keyPressed_3_) { - if (!searchField.isFocused()){ + if (!searchField.isFocused()) { return super.keyPressed(keyCode, p_keyPressed_2_, p_keyPressed_3_); } if (keyCode == GLFW.GLFW_KEY_ESCAPE) searchField.changeFocus(false); - if(searchField.keyPressed(keyCode, p_keyPressed_2_, p_keyPressed_3_)) { + if (searchField.keyPressed(keyCode, p_keyPressed_2_, p_keyPressed_3_)) { this.updateSearch(); } return true; } - private void updateSearch(){ + private void updateSearch() { if (!searchField.getText().equalsIgnoreCase(lastQuery)) { lastQuery = searchField.getText(); searchResults = getMatches(book, searchField.getText(), player, bookStack); diff --git a/src/main/java/amerifrance/guideapi/info/InfoRendererDescription.java b/src/main/java/amerifrance/guideapi/info/InfoRendererDescription.java index c4052f3d..e53c1633 100644 --- a/src/main/java/amerifrance/guideapi/info/InfoRendererDescription.java +++ b/src/main/java/amerifrance/guideapi/info/InfoRendererDescription.java @@ -15,7 +15,7 @@ import net.minecraft.world.World; import org.apache.commons.lang3.StringEscapeUtils; -import java.awt.Color; +import java.awt.*; import java.util.List; public class InfoRendererDescription implements IInfoRenderer { @@ -47,7 +47,7 @@ public void drawInformation(Book book, World world, BlockPos pos, BlockState sta for (String line : lines) { List cutLines = fontRenderer.listFormattedStringToWidth(line, 100 * scaleMulti); for (String cut : cutLines) { - fontRenderer.drawStringWithShadow(cut, (Minecraft.getInstance().mainWindow.getScaledWidth()/ 2 + 20) * scaleMulti, (((Minecraft.getInstance().mainWindow.getScaledHeight() / 2 - 10) - y) * scaleMulti) + yOffset, Color.WHITE.getRGB()); + fontRenderer.drawStringWithShadow(cut, (Minecraft.getInstance().mainWindow.getScaledWidth() / 2 + 20) * scaleMulti, (((Minecraft.getInstance().mainWindow.getScaledHeight() / 2 - 10) - y) * scaleMulti) + yOffset, Color.WHITE.getRGB()); y -= 10 / scaleMulti; } } diff --git a/src/main/java/amerifrance/guideapi/item/ItemGuideBook.java b/src/main/java/amerifrance/guideapi/item/ItemGuideBook.java index 60a5e80e..d6937422 100644 --- a/src/main/java/amerifrance/guideapi/item/ItemGuideBook.java +++ b/src/main/java/amerifrance/guideapi/item/ItemGuideBook.java @@ -68,7 +68,7 @@ public ActionResult onItemRightClick(World world, PlayerEntity player ItemStack heldStack = player.getHeldItem(hand); //Only handle book client side - if(!world.isRemote())return ActionResult.newResult(ActionResultType.SUCCESS,heldStack); + if (!world.isRemote()) return ActionResult.newResult(ActionResultType.SUCCESS, heldStack); BookEvent.Open event = new BookEvent.Open(book, heldStack, player); @@ -76,7 +76,7 @@ public ActionResult onItemRightClick(World world, PlayerEntity player player.sendStatusMessage(event.getCanceledText(), true); return ActionResult.newResult(ActionResultType.FAIL, heldStack); } - GuideMod.PROXY.openGuidebook(player,world,book,heldStack); + GuideMod.PROXY.openGuidebook(player, world, book, heldStack); return ActionResult.newResult(ActionResultType.SUCCESS, heldStack); } @@ -90,7 +90,7 @@ public ActionResultType onItemUse(ItemUseContext context) { if (state.getBlock() instanceof IGuideLinked) { IGuideLinked guideLinked = (IGuideLinked) state.getBlock(); - ResourceLocation entryKey = guideLinked.getLinkedEntry(context.getWorld(), context.getPos(),context.getPlayer(), stack); + ResourceLocation entryKey = guideLinked.getLinkedEntry(context.getWorld(), context.getPos(), context.getPlayer(), stack); if (entryKey == null) return ActionResultType.FAIL; diff --git a/src/main/java/amerifrance/guideapi/network/PacketHandler.java b/src/main/java/amerifrance/guideapi/network/PacketHandler.java index 7ca012f6..e436da6b 100644 --- a/src/main/java/amerifrance/guideapi/network/PacketHandler.java +++ b/src/main/java/amerifrance/guideapi/network/PacketHandler.java @@ -11,14 +11,13 @@ public class PacketHandler { private static byte packetId = 0; - public static SimpleChannel INSTANCE = NetworkRegistry.ChannelBuilder.named(new ResourceLocation(GuideMod.ID,"main")).clientAcceptedVersions(PROTOCOL_VERSION::equals).serverAcceptedVersions(PROTOCOL_VERSION::equals).networkProtocolVersion(()->PROTOCOL_VERSION).simpleChannel(); - + public static SimpleChannel INSTANCE = NetworkRegistry.ChannelBuilder.named(new ResourceLocation(GuideMod.ID, "main")).clientAcceptedVersions(PROTOCOL_VERSION::equals).serverAcceptedVersions(PROTOCOL_VERSION::equals).networkProtocolVersion(() -> PROTOCOL_VERSION).simpleChannel(); public static void registerPackets() { - INSTANCE.registerMessage(nextID(),PacketSyncEntry.class,PacketSyncEntry::encode,PacketSyncEntry::decode,PacketSyncEntry::handle); - INSTANCE.registerMessage(nextID(),PacketSyncCategory.class,PacketSyncCategory::encode,PacketSyncCategory::decode,PacketSyncCategory::handle); - INSTANCE.registerMessage(nextID(),PacketSyncHome.class,PacketSyncHome::encode,PacketSyncHome::decode,PacketSyncHome::handle); + INSTANCE.registerMessage(nextID(), PacketSyncEntry.class, PacketSyncEntry::encode, PacketSyncEntry::decode, PacketSyncEntry::handle); + INSTANCE.registerMessage(nextID(), PacketSyncCategory.class, PacketSyncCategory::encode, PacketSyncCategory::decode, PacketSyncCategory::handle); + INSTANCE.registerMessage(nextID(), PacketSyncHome.class, PacketSyncHome::encode, PacketSyncHome::decode, PacketSyncHome::handle); } protected static int nextID() { diff --git a/src/main/java/amerifrance/guideapi/network/PacketSyncCategory.java b/src/main/java/amerifrance/guideapi/network/PacketSyncCategory.java index 822d0636..236b4351 100644 --- a/src/main/java/amerifrance/guideapi/network/PacketSyncCategory.java +++ b/src/main/java/amerifrance/guideapi/network/PacketSyncCategory.java @@ -6,7 +6,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; import net.minecraft.network.PacketBuffer; - import net.minecraftforge.fml.network.NetworkEvent; import org.apache.commons.lang3.Validate; @@ -27,23 +26,23 @@ public PacketSyncCategory(int category, int page) { this.page = page; } - static void encode(PacketSyncCategory msg, PacketBuffer buf){ + static void encode(PacketSyncCategory msg, PacketBuffer buf) { buf.writeInt(msg.category); buf.writeInt(msg.page); } - static PacketSyncCategory decode(PacketBuffer buf){ - PacketSyncCategory msg=new PacketSyncCategory(); - msg.category=buf.readInt(); + static PacketSyncCategory decode(PacketBuffer buf) { + PacketSyncCategory msg = new PacketSyncCategory(); + msg.category = buf.readInt(); msg.page = buf.readInt(); return msg; } - public static void handle(final PacketSyncCategory msg, Supplier contextSupplier){ - final NetworkEvent.Context ctx=contextSupplier.get(); + public static void handle(final PacketSyncCategory msg, Supplier contextSupplier) { + final NetworkEvent.Context ctx = contextSupplier.get(); ServerPlayerEntity player = ctx.getSender(); Validate.notNull(player); - ctx.enqueueWork(()->{ + ctx.enqueueWork(() -> { ItemStack book = player.getHeldItemOffhand(); if (book.isEmpty() || !(book.getItem() instanceof IGuideItem)) book = player.getHeldItemMainhand(); diff --git a/src/main/java/amerifrance/guideapi/network/PacketSyncEntry.java b/src/main/java/amerifrance/guideapi/network/PacketSyncEntry.java index 48ebfb7d..bf0af20a 100644 --- a/src/main/java/amerifrance/guideapi/network/PacketSyncEntry.java +++ b/src/main/java/amerifrance/guideapi/network/PacketSyncEntry.java @@ -12,7 +12,7 @@ import java.util.function.Supplier; -public class PacketSyncEntry{ +public class PacketSyncEntry { public int category; public ResourceLocation entry; @@ -30,25 +30,25 @@ public PacketSyncEntry(int category, ResourceLocation entry, int page) { this.page = page; } - static void encode(PacketSyncEntry msg, PacketBuffer buf){ + static void encode(PacketSyncEntry msg, PacketBuffer buf) { buf.writeInt(msg.category); buf.writeResourceLocation(msg.entry); buf.writeInt(msg.page); } - static PacketSyncEntry decode(PacketBuffer buf){ - PacketSyncEntry msg=new PacketSyncEntry(); - msg.category=buf.readInt(); - msg.entry=buf.readResourceLocation(); + static PacketSyncEntry decode(PacketBuffer buf) { + PacketSyncEntry msg = new PacketSyncEntry(); + msg.category = buf.readInt(); + msg.entry = buf.readResourceLocation(); msg.page = buf.readInt(); return msg; } - public static void handle(final PacketSyncEntry msg, Supplier contextSupplier){ - final NetworkEvent.Context ctx=contextSupplier.get(); + public static void handle(final PacketSyncEntry msg, Supplier contextSupplier) { + final NetworkEvent.Context ctx = contextSupplier.get(); ServerPlayerEntity player = ctx.getSender(); Validate.notNull(player); - ctx.enqueueWork(()->{ + ctx.enqueueWork(() -> { ItemStack book = player.getHeldItemOffhand(); if (book.isEmpty() || !(book.getItem() instanceof IGuideItem)) book = player.getHeldItemMainhand(); @@ -68,6 +68,4 @@ public static void handle(final PacketSyncEntry msg, Supplier contextSupplier){ - final NetworkEvent.Context ctx=contextSupplier.get(); + public static void handle(final PacketSyncHome msg, Supplier contextSupplier) { + final NetworkEvent.Context ctx = contextSupplier.get(); ServerPlayerEntity player = ctx.getSender(); Validate.notNull(player); - ctx.enqueueWork(()->{ + ctx.enqueueWork(() -> { ItemStack book = player.getHeldItemOffhand(); if (book.isEmpty() || !(book.getItem() instanceof IGuideItem)) book = player.getHeldItemMainhand(); diff --git a/src/main/java/amerifrance/guideapi/page/PageBrewingRecipe.java b/src/main/java/amerifrance/guideapi/page/PageBrewingRecipe.java index d9e4d4b4..4faa05b9 100644 --- a/src/main/java/amerifrance/guideapi/page/PageBrewingRecipe.java +++ b/src/main/java/amerifrance/guideapi/page/PageBrewingRecipe.java @@ -1,6 +1,5 @@ package amerifrance.guideapi.page; -import amerifrance.guideapi.api.IRecipeRenderer; import amerifrance.guideapi.api.SubTexture; import amerifrance.guideapi.api.impl.Book; import amerifrance.guideapi.api.impl.Page; @@ -11,7 +10,6 @@ import amerifrance.guideapi.api.util.TextHelper; import amerifrance.guideapi.gui.BaseScreen; import net.minecraft.block.Blocks; -import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -24,8 +22,6 @@ import java.util.ArrayList; import java.util.List; -import java.util.Optional; -import java.util.Random; public class PageBrewingRecipe extends Page { @@ -80,7 +76,7 @@ public void draw(Book book, CategoryAbstract category, EntryAbstract entry, int //start input int finalX = x; int finalY = y; - cycler.getCycledIngredientStack(ingredient,0).ifPresent(stack -> { + cycler.getCycledIngredientStack(ingredient, 0).ifPresent(stack -> { GuiHelper.drawItemStack(stack, finalX, finalY); }); diff --git a/src/main/java/amerifrance/guideapi/page/PageIRecipe.java b/src/main/java/amerifrance/guideapi/page/PageIRecipe.java index 321b009c..924f3e52 100644 --- a/src/main/java/amerifrance/guideapi/page/PageIRecipe.java +++ b/src/main/java/amerifrance/guideapi/page/PageIRecipe.java @@ -1,14 +1,14 @@ package amerifrance.guideapi.page; -import amerifrance.guideapi.api.util.IngredientCycler; -import amerifrance.guideapi.page.reciperenderer.FurnaceRecipeRenderer; import amerifrance.guideapi.api.IRecipeRenderer; import amerifrance.guideapi.api.impl.Book; import amerifrance.guideapi.api.impl.Page; import amerifrance.guideapi.api.impl.abstraction.CategoryAbstract; import amerifrance.guideapi.api.impl.abstraction.EntryAbstract; +import amerifrance.guideapi.api.util.IngredientCycler; import amerifrance.guideapi.gui.BaseScreen; import amerifrance.guideapi.gui.EntryScreen; +import amerifrance.guideapi.page.reciperenderer.FurnaceRecipeRenderer; import amerifrance.guideapi.page.reciperenderer.ShapedRecipesRenderer; import amerifrance.guideapi.page.reciperenderer.ShapelessRecipesRenderer; import amerifrance.guideapi.util.LogHelper; @@ -31,6 +31,7 @@ public class PageIRecipe extends Page { public IRecipeRenderer iRecipeRenderer; protected boolean isValid; private IngredientCycler ingredientCycler = new IngredientCycler(); + /** * Use this if you are creating a page for a standard recipe, one of: *

@@ -59,17 +60,17 @@ public PageIRecipe(IRecipe recipe, IRecipeRenderer iRecipeRenderer) { @Override @OnlyIn(Dist.CLIENT) public void draw(Book book, CategoryAbstract category, EntryAbstract entry, int guiLeft, int guiTop, int mouseX, int mouseY, BaseScreen guiBase, FontRenderer fontRendererObj) { - if(isValid) { + if (isValid) { super.draw(book, category, entry, guiLeft, guiTop, mouseX, mouseY, guiBase, fontRendererObj); ingredientCycler.tick(guiBase.getMinecraft()); - iRecipeRenderer.draw(book, category, entry, guiLeft, guiTop, mouseX, mouseY, guiBase, fontRendererObj,ingredientCycler); + iRecipeRenderer.draw(book, category, entry, guiLeft, guiTop, mouseX, mouseY, guiBase, fontRendererObj, ingredientCycler); } } @Override @OnlyIn(Dist.CLIENT) public void drawExtras(Book book, CategoryAbstract category, EntryAbstract entry, int guiLeft, int guiTop, int mouseX, int mouseY, BaseScreen guiBase, FontRenderer fontRendererObj) { - if(isValid) { + if (isValid) { super.drawExtras(book, category, entry, guiLeft, guiTop, mouseX, mouseY, guiBase, fontRendererObj); iRecipeRenderer.drawExtras(book, category, entry, guiLeft, guiTop, mouseX, mouseY, guiBase, fontRendererObj); } @@ -90,10 +91,9 @@ public static IRecipeRenderer getRenderer(IRecipe recipe) { return new ShapedRecipesRenderer((ShapedRecipe) recipe); } else if (recipe instanceof ShapelessRecipe) { return new ShapelessRecipesRenderer((ShapelessRecipe) recipe); - } else if(recipe instanceof FurnaceRecipe){ - return new FurnaceRecipeRenderer((FurnaceRecipe)recipe); - } - else { + } else if (recipe instanceof FurnaceRecipe) { + return new FurnaceRecipeRenderer((FurnaceRecipe) recipe); + } else { return null; } } diff --git a/src/main/java/amerifrance/guideapi/page/PageItemStack.java b/src/main/java/amerifrance/guideapi/page/PageItemStack.java index f7af0eaa..68837971 100644 --- a/src/main/java/amerifrance/guideapi/page/PageItemStack.java +++ b/src/main/java/amerifrance/guideapi/page/PageItemStack.java @@ -20,16 +20,17 @@ public class PageItemStack extends PageText { private IngredientCycler ingredientCycler = new IngredientCycler(); - public PageItemStack(String draw, Ingredient ingredient){ - super(draw,60); - this.ingredient=ingredient; + public PageItemStack(String draw, Ingredient ingredient) { + super(draw, 60); + this.ingredient = ingredient; } + /** - * @param draw - Unlocalized text to draw + * @param draw - Unlocalized text to draw * @param ingredient - ItemStack to render */ public PageItemStack(String draw, ItemStack ingredient) { - this(draw,Ingredient.fromStacks(ingredient)); + this(draw, Ingredient.fromStacks(ingredient)); } /** @@ -53,7 +54,7 @@ public PageItemStack(String draw, Block block) { @OnlyIn(Dist.CLIENT) public void drawExtras(Book book, CategoryAbstract category, EntryAbstract entry, int guiLeft, int guiTop, int mouseX, int mouseY, BaseScreen guiBase, FontRenderer fontRendererObj) { ingredientCycler.tick(guiBase.getMinecraft()); - ingredientCycler.getCycledIngredientStack(ingredient,0).ifPresent(stack -> { + ingredientCycler.getCycledIngredientStack(ingredient, 0).ifPresent(stack -> { GuiHelper.drawScaledItemStack(stack, guiLeft + 101, guiTop + 20, 3); }); } diff --git a/src/main/java/amerifrance/guideapi/page/PageJsonRecipe.java b/src/main/java/amerifrance/guideapi/page/PageJsonRecipe.java index cc126ba2..7a5530ec 100644 --- a/src/main/java/amerifrance/guideapi/page/PageJsonRecipe.java +++ b/src/main/java/amerifrance/guideapi/page/PageJsonRecipe.java @@ -1,11 +1,11 @@ package amerifrance.guideapi.page; -import amerifrance.guideapi.gui.EntryScreen; -import amerifrance.guideapi.util.LogHelper; import amerifrance.guideapi.api.IRecipeRenderer; import amerifrance.guideapi.api.impl.Book; import amerifrance.guideapi.api.impl.abstraction.CategoryAbstract; import amerifrance.guideapi.api.impl.abstraction.EntryAbstract; +import amerifrance.guideapi.gui.EntryScreen; +import amerifrance.guideapi.util.LogHelper; import net.minecraft.client.Minecraft; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; @@ -16,39 +16,37 @@ import javax.annotation.Nonnull; import java.util.function.Function; -import java.util.function.Supplier; public class PageJsonRecipe extends PageIRecipe { @Nonnull private final ResourceLocation recipeId; @Nonnull - private final Function,IRecipeRenderer> recipeRendererSupplier; + private final Function, IRecipeRenderer> recipeRendererSupplier; public PageJsonRecipe(ResourceLocation recipeId) { - this(recipeId,PageIRecipe::getRenderer); + this(recipeId, PageIRecipe::getRenderer); } - public PageJsonRecipe(ResourceLocation recipeId, Function,IRecipeRenderer> rendererSupplier){ - super(null,null); + public PageJsonRecipe(ResourceLocation recipeId, Function, IRecipeRenderer> rendererSupplier) { + super(null, null); this.recipeId = recipeId; - this.recipeRendererSupplier=rendererSupplier; + this.recipeRendererSupplier = rendererSupplier; } @OnlyIn(Dist.CLIENT) @Override public void onInit(Book book, CategoryAbstract category, EntryAbstract entry, PlayerEntity player, ItemStack bookStack, EntryScreen guiEntry) { super.onInit(book, category, entry, player, bookStack, guiEntry); - if(recipe==null){ - this.recipe = Minecraft.getInstance().getConnection() ==null ? null : Minecraft.getInstance().getConnection().getRecipeManager().getRecipe(recipeId).orElse(null); - if(recipe==null){ - LogHelper.error("Cannot find recipe "+recipeId.toString()); - } - else{ - if(iRecipeRenderer==null){ + if (recipe == null) { + this.recipe = Minecraft.getInstance().getConnection() == null ? null : Minecraft.getInstance().getConnection().getRecipeManager().getRecipe(recipeId).orElse(null); + if (recipe == null) { + LogHelper.error("Cannot find recipe " + recipeId.toString()); + } else { + if (iRecipeRenderer == null) { iRecipeRenderer = recipeRendererSupplier.apply(recipe); - if(iRecipeRenderer==null){ - LogHelper.error("Did not get renderer for recipe type "+recipe.getClass().toString()+" for recipe "+recipeId.toString()); + if (iRecipeRenderer == null) { + LogHelper.error("Did not get renderer for recipe type " + recipe.getClass().toString() + " for recipe " + recipeId.toString()); } } } diff --git a/src/main/java/amerifrance/guideapi/page/PageText.java b/src/main/java/amerifrance/guideapi/page/PageText.java index 18d1ce5c..a6a90f25 100644 --- a/src/main/java/amerifrance/guideapi/page/PageText.java +++ b/src/main/java/amerifrance/guideapi/page/PageText.java @@ -7,7 +7,6 @@ import amerifrance.guideapi.api.util.PageHelper; import amerifrance.guideapi.gui.BaseScreen; import net.minecraft.client.gui.FontRenderer; -import net.minecraft.client.resources.I18n; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.fml.ForgeI18n; diff --git a/src/main/java/amerifrance/guideapi/page/reciperenderer/CraftingRecipeRenderer.java b/src/main/java/amerifrance/guideapi/page/reciperenderer/CraftingRecipeRenderer.java index 915e8598..1d13ace4 100644 --- a/src/main/java/amerifrance/guideapi/page/reciperenderer/CraftingRecipeRenderer.java +++ b/src/main/java/amerifrance/guideapi/page/reciperenderer/CraftingRecipeRenderer.java @@ -10,14 +10,9 @@ import amerifrance.guideapi.api.util.TextHelper; import amerifrance.guideapi.gui.BaseScreen; import com.google.common.base.Strings; -import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; -import net.minecraft.item.crafting.Ingredient; - -import java.util.Optional; -import java.util.Random; public abstract class CraftingRecipeRenderer> extends RecipeRendererBase { diff --git a/src/main/java/amerifrance/guideapi/page/reciperenderer/FurnaceRecipeRenderer.java b/src/main/java/amerifrance/guideapi/page/reciperenderer/FurnaceRecipeRenderer.java index 6f939a6a..82244ab9 100644 --- a/src/main/java/amerifrance/guideapi/page/reciperenderer/FurnaceRecipeRenderer.java +++ b/src/main/java/amerifrance/guideapi/page/reciperenderer/FurnaceRecipeRenderer.java @@ -15,7 +15,6 @@ import net.minecraft.item.crafting.Ingredient; import net.minecraft.util.text.ITextComponent; -import java.util.ArrayList; import java.util.List; @@ -34,7 +33,7 @@ public void draw(Book book, CategoryAbstract category, EntryAbstract entry, int int y = guiTop + 77; Ingredient input = recipe.getIngredients().get(0); - cycler.getCycledIngredientStack(input,0).ifPresent(stack -> { + cycler.getCycledIngredientStack(input, 0).ifPresent(stack -> { GuiHelper.drawItemStack(stack, x, y); List tooltip = null; @@ -43,7 +42,6 @@ public void draw(Book book, CategoryAbstract category, EntryAbstract entry, int }); - ItemStack output = recipe.getRecipeOutput(); int x2 = guiLeft + 135; diff --git a/src/main/java/amerifrance/guideapi/page/reciperenderer/ShapedRecipesRenderer.java b/src/main/java/amerifrance/guideapi/page/reciperenderer/ShapedRecipesRenderer.java index b9e9d614..dbfebefc 100644 --- a/src/main/java/amerifrance/guideapi/page/reciperenderer/ShapedRecipesRenderer.java +++ b/src/main/java/amerifrance/guideapi/page/reciperenderer/ShapedRecipesRenderer.java @@ -7,13 +7,9 @@ import amerifrance.guideapi.api.util.IngredientCycler; import amerifrance.guideapi.gui.BaseScreen; import net.minecraft.client.gui.FontRenderer; -import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.Ingredient; import net.minecraft.item.crafting.ShapedRecipe; -import java.util.Arrays; -import java.util.List; - public class ShapedRecipesRenderer extends CraftingRecipeRenderer { public ShapedRecipesRenderer(ShapedRecipe recipe) { @@ -25,12 +21,12 @@ public void draw(Book book, CategoryAbstract category, EntryAbstract entry, int super.draw(book, category, entry, guiLeft, guiTop, mouseX, mouseY, guiBase, fontRendererObj, cycler); for (int y = 0; y < recipe.getRecipeHeight(); y++) { for (int x = 0; x < recipe.getRecipeWidth(); x++) { - int i = y*recipe.getRecipeWidth()+x; + int i = y * recipe.getRecipeWidth() + x; int stackX = (x + 1) * 17 + (guiLeft + 53) + x; int stackY = (y + 1) * 17 + (guiTop + 38) + y; Ingredient ingredient = recipe.getIngredients().get(i); - cycler.getCycledIngredientStack(ingredient,i).ifPresent(stack -> { + cycler.getCycledIngredientStack(ingredient, i).ifPresent(stack -> { GuiHelper.drawItemStack(stack, stackX, stackY); if (GuiHelper.isMouseBetween(mouseX, mouseY, stackX, stackY, 15, 15)) tooltips = GuiHelper.getTooltip(stack); diff --git a/src/main/java/amerifrance/guideapi/page/reciperenderer/ShapelessRecipesRenderer.java b/src/main/java/amerifrance/guideapi/page/reciperenderer/ShapelessRecipesRenderer.java index 6903519a..a6e456b9 100644 --- a/src/main/java/amerifrance/guideapi/page/reciperenderer/ShapelessRecipesRenderer.java +++ b/src/main/java/amerifrance/guideapi/page/reciperenderer/ShapelessRecipesRenderer.java @@ -8,13 +8,9 @@ import amerifrance.guideapi.api.util.TextHelper; import amerifrance.guideapi.gui.BaseScreen; import net.minecraft.client.gui.FontRenderer; -import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.Ingredient; import net.minecraft.item.crafting.ShapelessRecipe; -import java.util.Arrays; -import java.util.List; - public class ShapelessRecipesRenderer extends CraftingRecipeRenderer { public ShapelessRecipesRenderer(ShapelessRecipe recipe) { @@ -31,7 +27,7 @@ public void draw(Book book, CategoryAbstract category, EntryAbstract entry, int int stackY = (y + 1) * 17 + (guiTop + 38) + y; if (i < recipe.getIngredients().size()) { Ingredient ingredient = recipe.getIngredients().get(i); - cycler.getCycledIngredientStack(ingredient,i).ifPresent(stack -> { + cycler.getCycledIngredientStack(ingredient, i).ifPresent(stack -> { GuiHelper.drawItemStack(stack, stackX, stackY); if (GuiHelper.isMouseBetween(mouseX, mouseY, stackX, stackY, 15, 15)) tooltips = GuiHelper.getTooltip(stack); diff --git a/src/main/java/amerifrance/guideapi/proxy/ClientProxy.java b/src/main/java/amerifrance/guideapi/proxy/ClientProxy.java index 0c5f7a22..38655c6f 100644 --- a/src/main/java/amerifrance/guideapi/proxy/ClientProxy.java +++ b/src/main/java/amerifrance/guideapi/proxy/ClientProxy.java @@ -1,15 +1,15 @@ package amerifrance.guideapi.proxy; -import amerifrance.guideapi.gui.CategoryScreen; -import amerifrance.guideapi.gui.HomeScreen; import amerifrance.guideapi.api.BookEvent; import amerifrance.guideapi.api.GuideAPI; import amerifrance.guideapi.api.IGuideItem; import amerifrance.guideapi.api.impl.Book; import amerifrance.guideapi.api.impl.abstraction.CategoryAbstract; import amerifrance.guideapi.api.impl.abstraction.EntryAbstract; -import amerifrance.guideapi.gui.EntryScreen; import amerifrance.guideapi.api.util.NBTBookTags; +import amerifrance.guideapi.gui.CategoryScreen; +import amerifrance.guideapi.gui.EntryScreen; +import amerifrance.guideapi.gui.HomeScreen; import net.minecraft.client.Minecraft; import net.minecraft.client.audio.SimpleSound; import net.minecraft.entity.player.PlayerEntity; @@ -24,7 +24,7 @@ public class ClientProxy extends CommonProxy { @Override public void playSound(SoundEvent sound) { - Minecraft.getInstance().getSoundHandler().play(SimpleSound.master(sound,1)); + Minecraft.getInstance().getSoundHandler().play(SimpleSound.master(sound, 1)); } @Override @@ -64,20 +64,20 @@ public void openGuidebook(PlayerEntity player, World world, Book book, ItemStack int pageNumber = tagCompound.getInt(NBTBookTags.PAGE_TAG); EntryScreen guiEntry = new EntryScreen(book, category, entry, player, bookStack); guiEntry.pageNumber = pageNumber; - Minecraft.getInstance().displayGuiScreen( guiEntry); + Minecraft.getInstance().displayGuiScreen(guiEntry); return; } else if (tagCompound.contains(NBTBookTags.CATEGORY_TAG)) { CategoryAbstract category = book.getCategoryList().get(tagCompound.getInt(NBTBookTags.CATEGORY_TAG)); int entryPage = tagCompound.getInt(NBTBookTags.ENTRY_PAGE_TAG); CategoryScreen guiCategory = new CategoryScreen(book, category, player, bookStack, null); guiCategory.entryPage = entryPage; - Minecraft.getInstance().displayGuiScreen( guiCategory); + Minecraft.getInstance().displayGuiScreen(guiCategory); return; } else { int categoryNumber = tagCompound.getInt(NBTBookTags.CATEGORY_PAGE_TAG); HomeScreen guiHome = new HomeScreen(book, player, bookStack); guiHome.categoryPage = categoryNumber; - Minecraft.getInstance().displayGuiScreen( guiHome); + Minecraft.getInstance().displayGuiScreen(guiHome); return; } } diff --git a/src/main/java/amerifrance/guideapi/proxy/CommonProxy.java b/src/main/java/amerifrance/guideapi/proxy/CommonProxy.java index 575b329d..e3f34384 100644 --- a/src/main/java/amerifrance/guideapi/proxy/CommonProxy.java +++ b/src/main/java/amerifrance/guideapi/proxy/CommonProxy.java @@ -11,7 +11,7 @@ public class CommonProxy { - public void openGuidebook(PlayerEntity player, World world, Book book, ItemStack bookStack){ + public void openGuidebook(PlayerEntity player, World world, Book book, ItemStack bookStack) { } public void playSound(SoundEvent sound) { diff --git a/src/main/java/amerifrance/guideapi/test/TestBook.java b/src/main/java/amerifrance/guideapi/test/TestBook.java index bf6b0473..ccc6a591 100644 --- a/src/main/java/amerifrance/guideapi/test/TestBook.java +++ b/src/main/java/amerifrance/guideapi/test/TestBook.java @@ -16,20 +16,16 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import net.minecraft.block.Blocks; -import net.minecraft.item.Items; import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.IRecipe; +import net.minecraft.item.Items; import net.minecraft.item.crafting.Ingredient; import net.minecraft.item.crafting.ShapedRecipe; -import net.minecraft.tags.BlockTags; import net.minecraft.tags.ItemTags; import net.minecraft.util.NonNullList; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.common.Tags; -import javax.annotation.Nonnull; import javax.annotation.Nullable; -import java.awt.Color; +import java.awt.*; import java.util.List; import java.util.Map; @@ -41,12 +37,12 @@ public class TestBook implements IGuideBook { @Nullable @Override public Book buildBook() { - BookBinder binder = new BookBinder(new ResourceLocation("guideapi","test_book")); + BookBinder binder = new BookBinder(new ResourceLocation("guideapi", "test_book")); binder.setAuthor("TehNut").setColor(Color.PINK).setItemName("Display Name").setHeader("Hello there").setGuideTitle("Title message").setSpawnWithBook().setContentProvider(this::buildContent); return (book = binder.build()); } - private void buildContent(List categories){ + private void buildContent(List categories) { Map entries = Maps.newHashMap(); @@ -54,20 +50,19 @@ private void buildContent(List categories){ pages.add(new PageText("Hello, this is\nsome text with a new line.")); pages.add(new PageText("Hello, this is some text without a new line. It is long so it should probably be automaticall wrapped")); pages.addAll(PageHelper.pagesForLongText("Hello, this is some text. It is very long so it should be split across multiple pages. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua.")); - pages.addAll(PageHelper.pagesForLongText("Hello, this is some text. It is very long so it should be split across multiple pages. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua.",Items.COAL_BLOCK)); + pages.addAll(PageHelper.pagesForLongText("Hello, this is some text. It is very long so it should be split across multiple pages. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua.", Items.COAL_BLOCK)); - pages.add(new PageJsonRecipe(new ResourceLocation("minecraft","stone"))); - pages.add(new PageJsonRecipe(new ResourceLocation("minecraft","charcoal"))); + pages.add(new PageJsonRecipe(new ResourceLocation("minecraft", "stone"))); + pages.add(new PageJsonRecipe(new ResourceLocation("minecraft", "charcoal"))); - pages.add(new PageJsonRecipe(new ResourceLocation("minecraft","stick"),recipe -> recipe instanceof ShapedRecipe ? new ShapedRecipesRenderer((ShapedRecipe) recipe) : null)); //Probably want to use your own method as render supplier and print proper logs + pages.add(new PageJsonRecipe(new ResourceLocation("minecraft", "stick"), recipe -> recipe instanceof ShapedRecipe ? new ShapedRecipesRenderer((ShapedRecipe) recipe) : null)); //Probably want to use your own method as render supplier and print proper logs - pages.add(new PageIRecipe(new ShapedRecipe(new ResourceLocation("guideapi","test11"), "test",1,1,NonNullList.from(Ingredient.EMPTY,Ingredient.fromStacks(new ItemStack(Items.PUMPKIN))),new ItemStack(Blocks.OAK_LOG)))); + pages.add(new PageIRecipe(new ShapedRecipe(new ResourceLocation("guideapi", "test11"), "test", 1, 1, NonNullList.from(Ingredient.EMPTY, Ingredient.fromStacks(new ItemStack(Items.PUMPKIN))), new ItemStack(Blocks.OAK_LOG)))); pages.add(new PageJsonRecipe(new ResourceLocation("minecraft", "acacia_fence"))); - pages.add(new PageItemStack("These are all logs",Ingredient.fromTag(ItemTags.LOGS))); - pages.add(new PageTextImage("guideapi.test.string",new ResourceLocation("guideapi","textures/gui/testimage.png"),true)); - pages.add(new PageTextImage("guideapi.test.string",new ResourceLocation("guideapi","textures/gui/testimage.png"),false)); - pages.add(new PageImage(new ResourceLocation("guideapi","textures/gui/testimage.png"))); - + pages.add(new PageItemStack("These are all logs", Ingredient.fromTag(ItemTags.LOGS))); + pages.add(new PageTextImage("guideapi.test.string", new ResourceLocation("guideapi", "textures/gui/testimage.png"), true)); + pages.add(new PageTextImage("guideapi.test.string", new ResourceLocation("guideapi", "textures/gui/testimage.png"), false)); + pages.add(new PageImage(new ResourceLocation("guideapi", "textures/gui/testimage.png"))); Entry entry = new EntryItemStack(pages, "guideapi.test.entry", new ItemStack(Items.POTATO)); diff --git a/src/main/java/amerifrance/guideapi/test/TestBook2.java b/src/main/java/amerifrance/guideapi/test/TestBook2.java index 4d6c61ab..217f96b2 100644 --- a/src/main/java/amerifrance/guideapi/test/TestBook2.java +++ b/src/main/java/amerifrance/guideapi/test/TestBook2.java @@ -8,22 +8,19 @@ import amerifrance.guideapi.api.util.PageHelper; import amerifrance.guideapi.category.CategoryItemStack; import amerifrance.guideapi.entry.EntryItemStack; -import amerifrance.guideapi.page.*; +import amerifrance.guideapi.page.PageBrewingRecipe; +import amerifrance.guideapi.page.PageJsonRecipe; +import amerifrance.guideapi.page.PageText; +import net.minecraft.item.ItemStack; import net.minecraft.item.Items; import net.minecraft.item.crafting.Ingredient; -import net.minecraft.item.crafting.ShapedRecipe; -import net.minecraft.potion.Potions; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.IRecipe; import net.minecraft.potion.PotionUtils; -import net.minecraft.util.NonNullList; +import net.minecraft.potion.Potions; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.common.Tags; import net.minecraftforge.common.brewing.BrewingRecipe; -import javax.annotation.Nonnull; import javax.annotation.Nullable; -import java.awt.Color; +import java.awt.*; import java.util.List; @GuideBook @@ -34,9 +31,8 @@ public class TestBook2 implements IGuideBook { @Nullable @Override public Book buildBook() { - BookBinder binder = new BookBinder(new ResourceLocation("guideapi","test_book2")); - binder.setAuthor("TehNut").setColor(new Color(80,50,5)).setItemName("Display Name").setHeader("Hello there").setSpawnWithBook().setGuideTitle("Title message").setContentProvider(this::buildContent); - + BookBinder binder = new BookBinder(new ResourceLocation("guideapi", "test_book2")); + binder.setAuthor("TehNut").setColor(new Color(80, 50, 5)).setItemName("Display Name").setHeader("Hello there").setSpawnWithBook().setGuideTitle("Title message").setContentProvider(this::buildContent); return (book = binder.build()); @@ -48,12 +44,12 @@ private void buildContent(List categories) { testCategory.getEntry("entry").addPage(new PageText("Hello, this is\nsome text")); //testCategory.getEntry("entry").addPage(new PageFurnaceRecipe(Blocks.COBBLESTONE)); //testCategory.getEntry("entry").addPage(PageIRecipe.newShaped(new ItemStack(Items.ACACIA_BOAT), "X X", "XXX", 'X', new ItemStack(Blocks.ACACIA_PLANKS, 1, 4))); - testCategory.getEntry("entry").addPage(new PageBrewingRecipe(new BrewingRecipe(Ingredient.fromStacks(PotionUtils.addPotionToItemStack(new ItemStack(Items.POTION), Potions.AWKWARD)),Ingredient.fromStacks( new ItemStack(Items.GLISTERING_MELON_SLICE)), PotionUtils.addPotionToItemStack(new ItemStack(Items.POTION), Potions.HEALING))) + testCategory.getEntry("entry").addPage(new PageBrewingRecipe(new BrewingRecipe(Ingredient.fromStacks(PotionUtils.addPotionToItemStack(new ItemStack(Items.POTION), Potions.AWKWARD)), Ingredient.fromStacks(new ItemStack(Items.GLISTERING_MELON_SLICE)), PotionUtils.addPotionToItemStack(new ItemStack(Items.POTION), Potions.HEALING))) ); testCategory.getEntry("entry").addPage(new PageJsonRecipe(new ResourceLocation("bread"))); testCategory.getEntry("entry").addPage(new PageJsonRecipe(new ResourceLocation("redstone"))); testCategory.getEntry("entry").addPageList(PageHelper.pagesForLongText("guideapi.test.format")); - testCategory.addEntry("unicode",new EntryItemStack("Творческая книга",new ItemStack(Items.BEEF))); + testCategory.addEntry("unicode", new EntryItemStack("Творческая книга", new ItemStack(Items.BEEF))); testCategory.getEntry("unicode").addPage(new PageText("Творческая книга \u0F06")); categories.add(testCategory); } diff --git a/src/main/java/amerifrance/guideapi/util/AnnotationHandler.java b/src/main/java/amerifrance/guideapi/util/AnnotationHandler.java index f8abba35..e118c81c 100644 --- a/src/main/java/amerifrance/guideapi/util/AnnotationHandler.java +++ b/src/main/java/amerifrance/guideapi/util/AnnotationHandler.java @@ -7,7 +7,6 @@ import com.google.common.collect.Lists; import net.minecraftforge.eventbus.api.EventPriority; import net.minecraftforge.fml.ModList; - import net.minecraftforge.forgespi.language.ModFileScanData; import org.apache.commons.lang3.tuple.Pair; import org.objectweb.asm.Type; @@ -31,13 +30,12 @@ public static void gatherBooks() { .collect(Collectors.toList()); - for (EventPriority priority : EventPriority.values()) - for(ModFileScanData.AnnotationData data: annotations){ - try{ + for (ModFileScanData.AnnotationData data : annotations) { + try { - EventPriority priority1 = (EventPriority) data.getAnnotationData().getOrDefault("priority",EventPriority.NORMAL); - if(priority!=priority1)continue; + EventPriority priority1 = (EventPriority) data.getAnnotationData().getOrDefault("priority", EventPriority.NORMAL); + if (priority != priority1) continue; Class genericClass = Class.forName(data.getClassType().getClassName()); if (!IGuideBook.class.isAssignableFrom(genericClass)) continue; @@ -48,7 +46,7 @@ public static void gatherBooks() { APISetter.registerBook(book); BOOK_CLASSES.add(Pair.of(book, guideBook)); - }catch (Exception e) { + } catch (Exception e) { LogHelper.error("Error registering book for class " + data.getClassType().getClassName()); e.printStackTrace(); } diff --git a/src/main/java/amerifrance/guideapi/util/EventHandler.java b/src/main/java/amerifrance/guideapi/util/EventHandler.java index 03a21479..9ba3e27a 100644 --- a/src/main/java/amerifrance/guideapi/util/EventHandler.java +++ b/src/main/java/amerifrance/guideapi/util/EventHandler.java @@ -47,7 +47,7 @@ public static void onPlayerJoinWorld(EntityJoinWorldEvent event) { if (GuideConfig.COMMON.canSpawnWithBook.get()) { for (Book book : GuideAPI.getBooks().values()) { ForgeConfigSpec.BooleanValue bookSpawnConfig = GuideConfig.COMMON.SPAWN_BOOKS.get(book); - if((bookSpawnConfig==null||bookSpawnConfig.get()) && !tag.getBoolean("hasInitial" + book.getRegistryName().toString())){ + if ((bookSpawnConfig == null || bookSpawnConfig.get()) && !tag.getBoolean("hasInitial" + book.getRegistryName().toString())) { ItemHandlerHelper.giveItemToPlayer(player, GuideAPI.getStackFromBook(book)); tag.putBoolean("hasInitial" + book.getRegistryName().toString(), true); } @@ -81,7 +81,7 @@ public static void renderOverlay(RenderGameOverlayEvent.Pre event) { if (book == null) return; - BlockPos rayTracePos=((BlockRayTraceResult)rayTrace).getPos(); + BlockPos rayTracePos = ((BlockRayTraceResult) rayTrace).getPos(); BlockState state = world.getBlockState(rayTracePos); String linkedEntry = null; if (state.getBlock() instanceof IGuideLinked) { diff --git a/src/main/java/amerifrance/guideapi/util/ReloadCommand.java b/src/main/java/amerifrance/guideapi/util/ReloadCommand.java index a37d28b8..65091291 100644 --- a/src/main/java/amerifrance/guideapi/util/ReloadCommand.java +++ b/src/main/java/amerifrance/guideapi/util/ReloadCommand.java @@ -3,21 +3,15 @@ import amerifrance.guideapi.api.GuideAPI; import amerifrance.guideapi.api.impl.Book; import com.mojang.brigadier.LiteralMessage; -import com.mojang.brigadier.arguments.StringArgumentType; import com.mojang.brigadier.builder.ArgumentBuilder; -import com.mojang.brigadier.exceptions.CommandSyntaxException; import com.mojang.brigadier.exceptions.DynamicCommandExceptionType; import com.mojang.brigadier.exceptions.SimpleCommandExceptionType; import net.minecraft.command.CommandSource; import net.minecraft.command.Commands; -import net.minecraft.command.ISuggestionProvider; import net.minecraft.command.arguments.ResourceLocationArgument; import net.minecraft.util.ResourceLocation; import net.minecraft.util.text.StringTextComponent; -import net.minecraft.util.text.TranslationTextComponent; import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.fml.DistExecutor; -import net.minecraftforge.fml.common.thread.EffectiveSide; import net.minecraftforge.fml.loading.FMLEnvironment; /** @@ -26,23 +20,23 @@ */ public class ReloadCommand { - private static final DynamicCommandExceptionType BOOK_NOT_FOUND = new DynamicCommandExceptionType((id) -> new StringTextComponent("Book with registry id "+ id+ " not found")); + private static final DynamicCommandExceptionType BOOK_NOT_FOUND = new DynamicCommandExceptionType((id) -> new StringTextComponent("Book with registry id " + id + " not found")); private static final SimpleCommandExceptionType NOT_CLIENT = new SimpleCommandExceptionType(new LiteralMessage("This command can only be used in singleplayer")); public static ArgumentBuilder register() { return Commands.literal("reload") .then(Commands.argument("bookid", ResourceLocationArgument.resourceLocation()).executes((context) -> { - if(FMLEnvironment.dist != Dist.CLIENT){ + if (FMLEnvironment.dist != Dist.CLIENT) { throw NOT_CLIENT.create(); } - ResourceLocation id = ResourceLocationArgument.getResourceLocation(context,"bookid"); + ResourceLocation id = ResourceLocationArgument.getResourceLocation(context, "bookid"); Book b = GuideAPI.getBooks().get(id); - if(b == null){ + if (b == null) { throw BOOK_NOT_FOUND.create(id.toString()); } b.forceInitializeContent(); return 0; - })); + })); } } diff --git a/src/main/resources/assets/guideapi/lang/de_de.json b/src/main/resources/assets/guideapi/lang/de_de.json index dd010fa2..cc29684b 100644 --- a/src/main/resources/assets/guideapi/lang/de_de.json +++ b/src/main/resources/assets/guideapi/lang/de_de.json @@ -1,13 +1,11 @@ { "_comment": "Item", "item.guideapi.book": "Handbuch", - "_comment": "Button hovering text", "guideapi.button.back": "Zurück", "guideapi.button.next": "Nächste", "guideapi.button.prev": "Vorherige", "guideapi.button.search": "Suche", - "_comment": "Text to draw", "guideapi.text.crafting.shaped": "Crafting", "guideapi.text.crafting.shapeless": "Formloses Crafting", diff --git a/src/main/resources/assets/guideapi/lang/en_us.json b/src/main/resources/assets/guideapi/lang/en_us.json index 894e48a5..344ace5d 100644 --- a/src/main/resources/assets/guideapi/lang/en_us.json +++ b/src/main/resources/assets/guideapi/lang/en_us.json @@ -1,13 +1,11 @@ { "_comment": "Item", "item.guideapi.book": "Guide Book", - "_comment": "Button hovering text", "guideapi.button.back": "Back", "guideapi.button.next": "Next", "guideapi.button.prev": "Previous", "guideapi.button.search": "Search", - "_comment": "Text to draw", "guideapi.text.crafting.shaped": "Shaped Crafting", "guideapi.text.crafting.shapeless": "Shapeless Crafting", @@ -15,13 +13,11 @@ "guideapi.text.linked.open": "Sneak + Use to open", "guideapi.text.brewing.brew": "Brewing", "guidepai.text.brewing.error": "&cError in the recipe", - "_comment": "Test", "guideapi.test.format": "This i\\ns a formatting\\n\\ttest", "guideapi.test.category": "Test Category", "guideapi.test.entry": "Test Entry which is very very very long", "guideapi.test.string": "Some translated content string", - "_comment": "Unused", "text.furnace.error": "&cError in the recipe", "text.book.warning": "&c[WARNING] Delete this item, it has no associated book!", diff --git a/src/main/resources/assets/guideapi/lang/ru_ru.json b/src/main/resources/assets/guideapi/lang/ru_ru.json index 7ec19e7b..8b891b1e 100644 --- a/src/main/resources/assets/guideapi/lang/ru_ru.json +++ b/src/main/resources/assets/guideapi/lang/ru_ru.json @@ -1,12 +1,10 @@ { "_comment": "Item", "item.guideapi.book": "Стандартная книга Guide-API", - "_comment": "Button hovering text", "guideapi.button.back": "Назад", "guideapi.button.next": "След.", "guideapi.button.prev": "Пред.", - "_comment": "Text to draw", "guideapi.text.crafting.shaped": "Форменное создание", "guideapi.text.crafting.shapeless": "Бесформенное создание", diff --git a/src/main/resources/assets/guideapi/lang/zh_cn.json b/src/main/resources/assets/guideapi/lang/zh_cn.json index b53e2544..4aeaa0bc 100644 --- a/src/main/resources/assets/guideapi/lang/zh_cn.json +++ b/src/main/resources/assets/guideapi/lang/zh_cn.json @@ -1,12 +1,10 @@ { "_comment": "Item", "item.guideapi.book": "Guide-API 默认书", - "_comment": "Button hovering text", "guideapi.button.back": "返回", "guideapi.button.next": "下一页", "guideapi.button.prev": "上一页", - "_comment": "Text to draw", "guideapi.text.crafting.shaped": "普通配方", "guideapi.text.crafting.shapeless": "无形配方", diff --git a/src/main/resources/assets/guideapi/models/item/guidebook.json b/src/main/resources/assets/guideapi/models/item/guidebook.json index 0cd9effb..c1ece281 100644 --- a/src/main/resources/assets/guideapi/models/item/guidebook.json +++ b/src/main/resources/assets/guideapi/models/item/guidebook.json @@ -1,14 +1,26 @@ { - "parent":"item/generated", + "parent": "item/generated", "textures": { "layer0": "guideapi:items/book_base", "layer1": "guideapi:items/book_page" }, "display": { "firstperson_lefthand": { - "rotation": [ 0, 90, -25 ], - "translation": [ 1.13, 3.2, 1.13 ], - "scale": [ 0.68, 0.68, 0.68 ] + "rotation": [ + 0, + 90, + -25 + ], + "translation": [ + 1.13, + 3.2, + 1.13 + ], + "scale": [ + 0.68, + 0.68, + 0.68 + ] } } } \ No newline at end of file From 192f2edcdfff551458553d8091adada34360b97f Mon Sep 17 00:00:00 2001 From: maxanier Date: Thu, 9 Apr 2020 00:02:50 +0200 Subject: [PATCH 24/28] Include #35 and #104 --- src/main/resources/assets/guideapi/lang/ru_ru.json | 4 ++++ src/main/resources/assets/guideapi/lang/zh_cn.json | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/resources/assets/guideapi/lang/ru_ru.json b/src/main/resources/assets/guideapi/lang/ru_ru.json index 8b891b1e..d4507047 100644 --- a/src/main/resources/assets/guideapi/lang/ru_ru.json +++ b/src/main/resources/assets/guideapi/lang/ru_ru.json @@ -5,10 +5,14 @@ "guideapi.button.back": "Назад", "guideapi.button.next": "След.", "guideapi.button.prev": "Пред.", + "guideapi.button.search":"Поиск", "_comment": "Text to draw", "guideapi.text.crafting.shaped": "Форменное создание", "guideapi.text.crafting.shapeless": "Бесформенное создание", "guideapi.text.furnace.smelting": "Плавка", + "guideapi.text.linked.open": "Шифт + ПКМ, чтобы открыть", + "guideapi.text.brewing.brew": "зельеварение", + "guidepai.text.brewing.error": "&cОшибка в рецепте", "text.furnace.error": "&cОшибка в рецепте", "text.book.warning": "&c[ВНИМАНИЕ] Выкиньте этот предмет, у него нет связанной книги!", "text.book.creative": "Творческая книга", diff --git a/src/main/resources/assets/guideapi/lang/zh_cn.json b/src/main/resources/assets/guideapi/lang/zh_cn.json index 4aeaa0bc..d066dd99 100644 --- a/src/main/resources/assets/guideapi/lang/zh_cn.json +++ b/src/main/resources/assets/guideapi/lang/zh_cn.json @@ -6,9 +6,9 @@ "guideapi.button.next": "下一页", "guideapi.button.prev": "上一页", "_comment": "Text to draw", - "guideapi.text.crafting.shaped": "普通配方", + "guideapi.text.crafting.shaped": "有序合成", "guideapi.text.crafting.shapeless": "无形配方", - "guideapi.text.furnace.smelting": "冶炼", + "guideapi.text.furnace.smelting": "烧炼", "text.furnace.error": "&c合成配方出错", "text.book.warning": "&c[警告] 删除这个物品, 它没有关联的书!", "text.book.creative": "创造模式书本", From 51e329de6c29e2761ff406d65408f3066ea273b9 Mon Sep 17 00:00:00 2001 From: maxanier Date: Thu, 9 Apr 2020 00:20:18 +0200 Subject: [PATCH 25/28] Removed unused customModel book property --- .../java/amerifrance/guideapi/api/impl/Book.java | 9 +-------- .../amerifrance/guideapi/api/impl/BookBinder.java | 15 +-------------- 2 files changed, 2 insertions(+), 22 deletions(-) diff --git a/src/main/java/amerifrance/guideapi/api/impl/Book.java b/src/main/java/amerifrance/guideapi/api/impl/Book.java index f6a6af21..6f0e88e8 100644 --- a/src/main/java/amerifrance/guideapi/api/impl/Book.java +++ b/src/main/java/amerifrance/guideapi/api/impl/Book.java @@ -22,7 +22,6 @@ public class Book { private final String author; private final ResourceLocation pageTexture; private final ResourceLocation outlineTexture; - private final boolean customModel; private final Color color; private final boolean spawnWithBook; private final ResourceLocation registryName; @@ -30,7 +29,7 @@ public class Book { private boolean isInitialized; - protected Book(Consumer> contentProvider, String title, String header, String displayName, String author, ResourceLocation pageTexture, ResourceLocation outlineTexture, boolean customModel, Color color, boolean spawnWithBook, ResourceLocation registryName, ItemGroup creativeTab) { + protected Book(Consumer> contentProvider, String title, String header, String displayName, String author, ResourceLocation pageTexture, ResourceLocation outlineTexture, Color color, boolean spawnWithBook, ResourceLocation registryName, ItemGroup creativeTab) { this.contentProvider = contentProvider; this.title = title; this.header = header; @@ -38,7 +37,6 @@ protected Book(Consumer> contentProvider, String title, S this.author = author; this.pageTexture = pageTexture; this.outlineTexture = outlineTexture; - this.customModel = customModel; this.color = color; this.spawnWithBook = spawnWithBook; this.registryName = registryName; @@ -92,10 +90,6 @@ public ResourceLocation getOutlineTexture() { return this.outlineTexture; } - public boolean hasCustomModel() { - return this.customModel; - } - public Color getColor() { return this.color; } @@ -123,7 +117,6 @@ public String toString() { .append("author", author) .append("pageTexture", pageTexture) .append("outlineTexture", outlineTexture) - .append("customModel", customModel) .append("color", color) .append("spawnWithBook", spawnWithBook) .append("registryName", registryName) diff --git a/src/main/java/amerifrance/guideapi/api/impl/BookBinder.java b/src/main/java/amerifrance/guideapi/api/impl/BookBinder.java index 090903bb..2649bec4 100644 --- a/src/main/java/amerifrance/guideapi/api/impl/BookBinder.java +++ b/src/main/java/amerifrance/guideapi/api/impl/BookBinder.java @@ -22,7 +22,6 @@ public class BookBinder { private String author; private ResourceLocation pageTexture = new ResourceLocation("guideapi", "textures/gui/book_colored.png"); private ResourceLocation outlineTexture = new ResourceLocation("guideapi", "textures/gui/book_greyscale.png"); - private boolean hasCustomModel; private Color color = new Color(171, 70, 30); private boolean spawnWithBook; private ItemGroup creativeTab = ItemGroup.MISC; @@ -128,18 +127,6 @@ public BookBinder setOutlineTexture(ResourceLocation outlineTexture) { return this; } - /** - * Indicates that the item containing this book has a custom model that you will manually register. - *

- * By default, a generic book model will be registered and colored with {@link #color}. - * - * @return the builder instance for chaining. - */ - public BookBinder setHasCustomModel() { - this.hasCustomModel = true; - return this; - } - /** * Sets the color to overlay on the book model and GUI border. *

@@ -209,6 +196,6 @@ public Book build() { throw new IllegalStateException("Content supplier of book " + registryName.toString() + " must be provided"); } - return new Book(contentProvider, guideTitle, header, itemName, author, pageTexture, outlineTexture, hasCustomModel, color, spawnWithBook, registryName, creativeTab); + return new Book(contentProvider, guideTitle, header, itemName, author, pageTexture, outlineTexture, color, spawnWithBook, registryName, creativeTab); } } From fa32265c855823b066367372164be337d4c73972 Mon Sep 17 00:00:00 2001 From: maxanier Date: Thu, 9 Apr 2020 01:09:26 +0200 Subject: [PATCH 26/28] Properly handle newlines in pagesForLongText --- .../java/amerifrance/guideapi/api/util/PageHelper.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/java/amerifrance/guideapi/api/util/PageHelper.java b/src/main/java/amerifrance/guideapi/api/util/PageHelper.java index 95a43740..c48b3df7 100644 --- a/src/main/java/amerifrance/guideapi/api/util/PageHelper.java +++ b/src/main/java/amerifrance/guideapi/api/util/PageHelper.java @@ -15,6 +15,7 @@ import org.apache.commons.lang3.StringUtils; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; public class PageHelper { @@ -35,7 +36,8 @@ public static List prepareForLongText(String locText, int lineWidth, int FontRenderer fontRenderer = Minecraft.getInstance().fontRenderer; int firstCount = firstHeight / fontRenderer.FONT_HEIGHT; int count = subsequentHeight / fontRenderer.FONT_HEIGHT; - List lines = new ArrayList<>(fontRenderer.listFormattedStringToWidth(locText, lineWidth)); //Create a new list from returned list so we can later remove items + List lines = new ArrayList<>(); + Arrays.stream(locText.split("\n")).forEach(l -> lines.addAll(fontRenderer.listFormattedStringToWidth(l, lineWidth))); //Make sure to also split at manually specified newlines List pages = new ArrayList<>(); List pageLines = lines.size() > firstCount ? lines.subList(0, firstCount) : lines; @@ -53,7 +55,7 @@ public static List prepareForLongText(String locText, int lineWidth, int * Spread the text over multiple pages if necessary. Display ingredient at first page */ public static List pagesForLongText(String locText, Ingredient ingredient) { - List pageText = prepareForLongText(locText, 164, 79, 120); + List pageText = prepareForLongText(locText, 164, 81, 120); List pageList = new ArrayList<>(); for (int i = 0; i < pageText.size(); i++) { if (i == 0) { @@ -68,7 +70,7 @@ public static List pagesForLongText(String locText, Ingredient ingredient public static List pagesForLongText(String locText) { List pageList = new ArrayList<>(); - prepareForLongText(locText, 164, 120, 120).forEach(t -> pageList.add(new PageText(t))); + prepareForLongText(locText, 164, 126, 126).forEach(t -> pageList.add(new PageText(t))); return pageList; } @@ -78,7 +80,7 @@ public static void drawFormattedText(int x, int y, BaseScreen guiBase, String to toDraw = StringEscapeUtils.unescapeJava(toDraw).replaceAll("\\t", " "); String[] lines = toDraw.split("\n"); for (String line : lines) { - List cutLines = fontRenderer.listFormattedStringToWidth(line, 2 * guiBase.xSize / 3); + List cutLines = fontRenderer.listFormattedStringToWidth(line, 170); for (String cut : cutLines) { fontRenderer.drawString(cut, x, y, 0); y += 10; From adfb34d996c4d4b6ee6506724990556c764262a1 Mon Sep 17 00:00:00 2001 From: maxanier Date: Sun, 12 Apr 2020 13:29:59 +0200 Subject: [PATCH 27/28] Fix home screen rendering position --- .../amerifrance/guideapi/gui/HomeScreen.java | 37 +++---------------- .../amerifrance/guideapi/test/TestBook.java | 6 +++ 2 files changed, 11 insertions(+), 32 deletions(-) diff --git a/src/main/java/amerifrance/guideapi/gui/HomeScreen.java b/src/main/java/amerifrance/guideapi/gui/HomeScreen.java index 7de0ea5a..8036ac34 100644 --- a/src/main/java/amerifrance/guideapi/gui/HomeScreen.java +++ b/src/main/java/amerifrance/guideapi/gui/HomeScreen.java @@ -59,9 +59,8 @@ public void init() { minecraft.displayGuiScreen(new SearchScreen(book, player, bookStack, this)); }, this)); - int cX = guiLeft + 45; + int cX = guiLeft + 55; int cY = guiTop + 40; - int drawLoc = 0; int i = 0; int pageNumber = 0; @@ -70,39 +69,13 @@ public void init() { continue; category.onInit(book, this, player, bookStack); - switch (drawLoc) { - case 0: { - categoryWrapperMap.put(pageNumber, new CategoryWrapper(book, category, cX, cY, 23, 23, player, this.font, itemRenderer, false, bookStack)); - cX += 27; - drawLoc = 1; - break; - } - case 1: { - categoryWrapperMap.put(pageNumber, new CategoryWrapper(book, category, cX, cY, 23, 23, player, this.font, itemRenderer, false, bookStack)); - cX += 27; - drawLoc = 2; - break; - } - case 2: { - categoryWrapperMap.put(pageNumber, new CategoryWrapper(book, category, cX, cY, 23, 23, player, this.font, itemRenderer, false, bookStack)); - cX += 27; - drawLoc = 3; - break; - } - case 3: { - categoryWrapperMap.put(pageNumber, new CategoryWrapper(book, category, cX, cY, 23, 23, player, this.font, itemRenderer, false, bookStack)); - drawLoc = 0; - cX = guiLeft + 45; - cY += 30; - break; - } - } + int x = i % 5; + int y = i / 5; + categoryWrapperMap.put(pageNumber, new CategoryWrapper(book, category, cX + x * 27, cY + y * 30, 23, 23, player, this.font, itemRenderer, false, bookStack)); i++; - if (i >= 16) { + if (i >= 20) { i = 0; - cX = guiLeft + 45; - cY = guiTop + 40; pageNumber++; } } diff --git a/src/main/java/amerifrance/guideapi/test/TestBook.java b/src/main/java/amerifrance/guideapi/test/TestBook.java index ccc6a591..85525338 100644 --- a/src/main/java/amerifrance/guideapi/test/TestBook.java +++ b/src/main/java/amerifrance/guideapi/test/TestBook.java @@ -68,5 +68,11 @@ private void buildContent(List categories) { Entry entry = new EntryItemStack(pages, "guideapi.test.entry", new ItemStack(Items.POTATO)); entries.put(new ResourceLocation("guideapi", "entry"), entry); categories.add(new CategoryItemStack(entries, "guideapi.test.category", new ItemStack(Items.ACACIA_DOOR))); + categories.add(new CategoryItemStack(entries, "guideapi.test.category", new ItemStack(Items.PUMPKIN))); + categories.add(new CategoryItemStack(entries, "guideapi.test.category", new ItemStack(Items.WOODEN_AXE))); + categories.add(new CategoryItemStack(entries, "guideapi.test.category", new ItemStack(Items.SPRUCE_WOOD))); + categories.add(new CategoryItemStack(entries, "guideapi.test.category", new ItemStack(Items.BONE_MEAL))); + categories.add(new CategoryItemStack(entries, "guideapi.test.category", new ItemStack(Items.WHEAT))); + } } From 6d087cc6099c55d4b3ea9594fb4c7e48230e66f5 Mon Sep 17 00:00:00 2001 From: maxanier Date: Sat, 25 Apr 2020 11:35:43 +0200 Subject: [PATCH 28/28] Remove unnecessary bus registration --- src/main/java/amerifrance/guideapi/GuideMod.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/amerifrance/guideapi/GuideMod.java b/src/main/java/amerifrance/guideapi/GuideMod.java index ccb49986..29f9efef 100644 --- a/src/main/java/amerifrance/guideapi/GuideMod.java +++ b/src/main/java/amerifrance/guideapi/GuideMod.java @@ -39,7 +39,6 @@ public GuideMod() { FMLJavaModLoadingContext.get().getModEventBus().addListener(this::setup); FMLJavaModLoadingContext.get().getModEventBus().addListener(this::loadComplete); MinecraftForge.EVENT_BUS.addListener(this::onServerStarting); - FMLJavaModLoadingContext.get().getModEventBus().addListener(this::onServerStarting); } private void setup(final FMLCommonSetupEvent event) {