From f5e8eb5c78ea5155aeb1186fd7f6ac3e0fdc415c Mon Sep 17 00:00:00 2001 From: alexbegt Date: Sun, 17 Feb 2019 23:58:56 -0500 Subject: [PATCH] Implement GUIs for the chests, change the mod package to com.progwml6, fix issues with the mods.toml and get the gradle set up to run on progs jenkins --- Jenkinsfile | 31 ++++ build.gradle | 161 ++++++------------ gradle.properties | 14 +- .../com/progwml6/ironchest/IronChest.java | 49 ++++++ .../ironchest/client/ClientProxy.java | 8 +- .../ironchest/client/gui/GUIChest.java | 42 ++--- .../TileEntityIronChestItemRenderer.java | 22 +-- .../renderer/TileEntityIronChestRenderer.java | 17 +- .../ironchest/common/ServerProxy.java | 2 +- .../common/ai/IronChestAIOcelotSit.java | 6 +- .../common/ai/OcelotsSitOnChestsHandler.java | 2 +- .../ironchest/common/blocks/BlockChest.java | 50 +++++- .../common/blocks/BlockCopperChest.java | 6 +- .../common/blocks/BlockCrystalChest.java | 6 +- .../common/blocks/BlockDiamondChest.java | 6 +- .../common/blocks/BlockDirtChest.java | 6 +- .../common/blocks/BlockGoldChest.java | 6 +- .../common/blocks/BlockIronChest.java | 6 +- .../common/blocks/BlockObsidianChest.java | 6 +- .../common/blocks/BlockSilverChest.java | 6 +- .../common/blocks/IronChestType.java | 24 +-- .../common/core/IronChestBlocks.java | 50 +++--- .../common/core/IronChestCreativeTabs.java | 2 +- .../ironchest/common/core/IronChestItems.java | 34 ++-- .../common/gui/ContainerIronChest.java | 4 +- .../ironchest/common/gui/GuiHandler.java | 26 +++ .../common/gui/slot/ValidatingChestSlot.java | 4 +- .../common/items/ChestChangerType.java | 22 +-- .../ironchest/common/items/ItemChest.java | 7 +- .../common/items/ItemChestChanger.java | 12 +- .../ironchest/common/items/ItemTooltip.java | 4 +- .../common/network/PacketHandler.java | 6 +- .../packets/PacketTopStackSyncChest.java | 6 +- .../tileentity/IronChestEntityType.java | 32 ++-- .../tileentity/TileEntityCopperChest.java | 13 +- .../tileentity/TileEntityCrystalChest.java | 49 +++--- .../tileentity/TileEntityDiamondChest.java | 13 +- .../tileentity/TileEntityDirtChest.java | 25 ++- .../tileentity/TileEntityGoldChest.java | 13 +- .../tileentity/TileEntityIronChest.java | 13 +- .../tileentity/TileEntityObsidianChest.java | 13 +- .../tileentity/TileEntitySilverChest.java | 13 +- .../ironchest/common/util/BlockNames.java | 4 +- .../ironchest/common/util/ItemNames.java | 4 +- .../common/util/TileEntityNames.java | 4 +- .../java/cpw/mods/ironchest/IronChest.java | 93 ---------- src/main/resources/META-INF/mods.toml | 9 +- .../textures/gui/copper_container.png | Bin 2600 -> 3677 bytes 48 files changed, 491 insertions(+), 460 deletions(-) create mode 100644 Jenkinsfile create mode 100644 src/main/java/com/progwml6/ironchest/IronChest.java rename src/main/java/{cpw/mods => com/progwml6}/ironchest/client/ClientProxy.java (84%) rename src/main/java/{cpw/mods => com/progwml6}/ironchest/client/gui/GUIChest.java (80%) rename src/main/java/{cpw/mods => com/progwml6}/ironchest/client/renderer/TileEntityIronChestItemRenderer.java (77%) rename src/main/java/{cpw/mods => com/progwml6}/ironchest/client/renderer/TileEntityIronChestRenderer.java (90%) rename src/main/java/{cpw/mods => com/progwml6}/ironchest/common/ServerProxy.java (94%) rename src/main/java/{cpw/mods => com/progwml6}/ironchest/common/ai/IronChestAIOcelotSit.java (90%) rename src/main/java/{cpw/mods => com/progwml6}/ironchest/common/ai/OcelotsSitOnChestsHandler.java (97%) rename src/main/java/{cpw/mods => com/progwml6}/ironchest/common/blocks/BlockChest.java (84%) rename src/main/java/{cpw/mods => com/progwml6}/ironchest/common/blocks/BlockCopperChest.java (84%) rename src/main/java/{cpw/mods => com/progwml6}/ironchest/common/blocks/BlockCrystalChest.java (83%) rename src/main/java/{cpw/mods => com/progwml6}/ironchest/common/blocks/BlockDiamondChest.java (83%) rename src/main/java/{cpw/mods => com/progwml6}/ironchest/common/blocks/BlockDirtChest.java (89%) rename src/main/java/{cpw/mods => com/progwml6}/ironchest/common/blocks/BlockGoldChest.java (84%) rename src/main/java/{cpw/mods => com/progwml6}/ironchest/common/blocks/BlockIronChest.java (84%) rename src/main/java/{cpw/mods => com/progwml6}/ironchest/common/blocks/BlockObsidianChest.java (83%) rename src/main/java/{cpw/mods => com/progwml6}/ironchest/common/blocks/BlockSilverChest.java (84%) rename src/main/java/{cpw/mods => com/progwml6}/ironchest/common/blocks/IronChestType.java (88%) rename src/main/java/{cpw/mods => com/progwml6}/ironchest/common/core/IronChestBlocks.java (63%) rename src/main/java/{cpw/mods => com/progwml6}/ironchest/common/core/IronChestCreativeTabs.java (95%) rename src/main/java/{cpw/mods => com/progwml6}/ironchest/common/core/IronChestItems.java (59%) rename src/main/java/{cpw/mods => com/progwml6}/ironchest/common/gui/ContainerIronChest.java (97%) create mode 100644 src/main/java/com/progwml6/ironchest/common/gui/GuiHandler.java rename src/main/java/{cpw/mods => com/progwml6}/ironchest/common/gui/slot/ValidatingChestSlot.java (90%) rename src/main/java/{cpw/mods => com/progwml6}/ironchest/common/items/ChestChangerType.java (68%) rename src/main/java/{cpw/mods => com/progwml6}/ironchest/common/items/ItemChest.java (79%) rename src/main/java/{cpw/mods => com/progwml6}/ironchest/common/items/ItemChestChanger.java (93%) rename src/main/java/{cpw/mods => com/progwml6}/ironchest/common/items/ItemTooltip.java (96%) rename src/main/java/{cpw/mods => com/progwml6}/ironchest/common/network/PacketHandler.java (91%) rename src/main/java/{cpw/mods => com/progwml6}/ironchest/common/network/packets/PacketTopStackSyncChest.java (94%) rename src/main/java/{cpw/mods => com/progwml6}/ironchest/common/tileentity/IronChestEntityType.java (86%) rename src/main/java/{cpw/mods => com/progwml6}/ironchest/common/tileentity/TileEntityCopperChest.java (68%) rename src/main/java/{cpw/mods => com/progwml6}/ironchest/common/tileentity/TileEntityCrystalChest.java (86%) rename src/main/java/{cpw/mods => com/progwml6}/ironchest/common/tileentity/TileEntityDiamondChest.java (68%) rename src/main/java/{cpw/mods => com/progwml6}/ironchest/common/tileentity/TileEntityDirtChest.java (76%) rename src/main/java/{cpw/mods => com/progwml6}/ironchest/common/tileentity/TileEntityGoldChest.java (67%) rename src/main/java/{cpw/mods => com/progwml6}/ironchest/common/tileentity/TileEntityIronChest.java (96%) rename src/main/java/{cpw/mods => com/progwml6}/ironchest/common/tileentity/TileEntityObsidianChest.java (68%) rename src/main/java/{cpw/mods => com/progwml6}/ironchest/common/tileentity/TileEntitySilverChest.java (68%) rename src/main/java/{cpw/mods => com/progwml6}/ironchest/common/util/BlockNames.java (93%) rename src/main/java/{cpw/mods => com/progwml6}/ironchest/common/util/ItemNames.java (94%) rename src/main/java/{cpw/mods => com/progwml6}/ironchest/common/util/TileEntityNames.java (93%) delete mode 100644 src/main/java/cpw/mods/ironchest/IronChest.java diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 0000000..25dace7 --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,31 @@ +pipeline { + agent any + + stages { + stage('Checkout') { + steps { + checkout scm + sh "rm -rf build/libs" + } + } + + stage('Build') { + steps { + sh "./gradlew build -PBUILD_NUMBER=${env.BUILD_NUMBER} --no-daemon" + } + } + + stage('Archive') { + steps { + archive includes: 'build/libs/*.jar' + junit allowEmptyResults: true, testResults: 'build/test-results/**/*.xml' + } + } + + stage('Deploy') { + steps { + sh "./gradlew publishMavenJavaPublicationToMavenRepository -PBUILD_NUMBER=${env.BUILD_NUMBER} -PDEPLOY_DIR=${env.MAVEN_DEPLOY_DIR} --no-daemon" + } + } + } +} \ No newline at end of file diff --git a/build.gradle b/build.gradle index 3558501..839a3a8 100755 --- a/build.gradle +++ b/build.gradle @@ -9,27 +9,22 @@ buildscript { classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '3.+', changing: true } } + apply plugin: 'net.minecraftforge.gradle' -//Only edit below this line, the above code adds and enables the necessary things for Forge to be setup. apply plugin: 'maven' apply plugin: 'eclipse' +apply plugin: 'maven-publish' -// This is a simple flatdir repository for "uploadArchives" when you don't have a remote repo to target repositories { - flatDir { - name "fileRepo" - dirs "repo" - } maven { name 'DVS1 Maven FS' url 'http://dvs1.progwml6.com/files/maven' } } -// This is our group. I'm cpw.mods -group = "cpw.mods" // http://maven.apache.org/guides/mini/guide-naming-conventions.html -// This is our actual project within the group. Note: FML has "fml" here. But this is ironchest. -archivesBaseName = "ironchest" +group = "com.progwml6.ironchest" + +sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8' minecraft { mappings channel: 'snapshot', version: mappings_version @@ -55,123 +50,73 @@ minecraft { } dependencies { - minecraft 'net.minecraftforge.test:forge:' + minecraft_version + '-' + forge_version + minecraft 'net.minecraftforge:forge:' + minecraft_version + '-' + forge_version } -// IronChest uses git tagging to mark major versions. This sets up the project version to that version data -def versionInfo = getGitVersion() -version = minecraft_version + "-${versionInfo['IronChest.version']}" +task buildInfo { + def cmd = "git rev-parse --short HEAD" + def proc = cmd.execute() + proc.waitFor() + if (proc.exitValue() == 0) { + ext.revision = proc.text.trim() + } else { + ext.revision = "GITBORK" + } + + if (System.getenv().BUILD_NUMBER != null) { + ext.buildNum = System.getenv().BUILD_NUMBER + } else { + ext.buildNum = "DEV.${project.buildInfo.revision}" + } +} + +version = "${minecraft_version}-${mod_version}.${project.buildInfo.buildNum}" -// This wrangles the resources for the jar files- stuff like textures and languages processResources { - // we're omitting the .xcf files - they're development only exclude '**/*.xcf' - // we only want to do search/replace stuff in mcmod.info, nothing else from(sourceSets.main.resources.srcDirs) { include 'META-INF/mods.toml' - // replace version and mcversion expand 'version': project.version, 'mcversion': minecraft_version } - // copy everything else, thats not the mcmod.info from(sourceSets.main.resources.srcDirs) { exclude 'META-INF/mods.toml' } +} - // generate version.properties file from the git version data earlier - doLast { - def propsFile = new File(destinationDir, 'version.properties') - def properties = new Properties() - properties.putAll(versionInfo) - properties['IronChest.build.mcversion'] = minecraft_version - properties.store(propsFile.newWriter(), null) +task sourcesJar(type: Jar) { + from sourceSets.main.allJava + classifier = 'sources' +} + +artifacts { + archives sourcesJar +} + +jar { + manifest { + attributes(["Specification-Title": "Iron Chests", + "Specification-Vendor": "Progwml6", + "Specification-Version": "1", // We are version 1 of ourselves + "Implementation-Title": project.name, + "Implementation-Version": "${version}", + "Implementation-Vendor" :"Progwml6", + "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")],) } } -// Configure an upload task. this is setup for uploading to files.minecraftforge.net. There are other examples around -uploadArchives { - repositories.mavenDeployer { - dependsOn 'build' - - if (project.hasProperty('forgeMavenPassword')) { - repository(url: "http://files.minecraftforge.net/maven/manage/upload") { - authentication(userName: project.getProperty('forgeMavenUser'), password: project.getProperty('forgeMavenPassword')) - // the elvis operator. look it up. - } - } else { - // local repo folder. Might wanna juset use gradle install if you wanans end it to maven-local - repository(url: 'file://localhost/' + project.file('repo').getAbsolutePath()) - } - // This is just the pom data for the maven repo - pom { - groupId = project.group - // Force the maven upload to use the - syntax preferred at files - version = "${project.version}" - artifactId = project.archivesBaseName - project { - name project.archivesBaseName - packaging 'jar' - description 'IronChest' - url 'https://github.com/progwml6/IronChest' - - scm { - url 'https://github.com/progwml6/IronChest' - connection 'scm:git:git://github.com/progwml6/IronChest.git' - developerConnection 'scm:git:git@github.com:progwml6/IronChest.git' - } - - issueManagement { - system 'github' - url 'https://github.com/progwml6/IronChest/issues' - } - - licenses { - license { - name 'GNU Public License (GPL), Version 3.0' - url 'http://www.gnu.org/licenses/gpl-3.0.txt' - distribution 'repo' - } - } - - developers { - developer { - id 'cpw' - name 'cpw' - roles { role 'developer' } - } - } - } +publishing { + publications { + mavenJava(MavenPublication) { + artifact jar + artifact sourcesJar } } -} -// This is a special task for pulling the version information from git and the environment (for BUILD_NUMBER) -def getGitVersion() { - def out = [:] - - // call git command. - def outStream = new ByteArrayOutputStream() - def result = exec { - executable = 'git' - args = ['describe', '--long', "--match=[^(jenkins)]*"] - standardOutput = outStream + repositories { + if (project.hasProperty('DEPLOY_DIR')) { + maven { url DEPLOY_DIR } + } } - - def fullVersion = outStream.toString().trim() - def matcher = fullVersion =~ /(\d+).(\d+)-(\d+)-(.*)/ - - def maj = matcher[0][1] - def min = matcher[0][2] - def rev = matcher[0][3] - def bn = System.getenv("PROMOTED_NUMBER") ?: System.getenv("BUILD_NUMBER") ?: "1" - - out['IronChest.build.major.number'] = maj.toString() - out['IronChest.build.minor.number'] = min.toString() - out['IronChest.build.revision.number'] = rev.toString() - out['IronChest.build.githash'] = matcher[0][4].toString() - out['IronChest.build.number'] = bn.toString() - out['IronChest.version'] = "${maj}.${min}.${rev}.${bn}".toString() - - return out -} +} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 02ee8eb..f8b4440 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,15 +1,19 @@ # Sets default memory used for gradle commands. Can be overridden by user or command line properties. # This is required to provide enough memory for the Minecraft decompilation process. org.gradle.jvmargs=-Xmx3G +org.gradle.daemon=false + +# Mod Version Information +mod_version=8.0 # Minecraft Version Information -minecraft_version=1.13 +minecraft_version=1.13.2 minecraft_version_toml=13 # Forge Version Information -forge_version=24.0.156-1.13-pre -forge_version_toml=24 -forge_group=net.minecraftforge.test +forge_version=25.0.23 +forge_version_toml=25 +forge_group=net.minecraftforge # Mappings Information -mappings_version=20181221-1.13.1 +mappings_version=20190215-1.13.1 diff --git a/src/main/java/com/progwml6/ironchest/IronChest.java b/src/main/java/com/progwml6/ironchest/IronChest.java new file mode 100644 index 0000000..1d97c08 --- /dev/null +++ b/src/main/java/com/progwml6/ironchest/IronChest.java @@ -0,0 +1,49 @@ +/******************************************************************************* + * Copyright (c) 2012 cpw. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Public License v3.0 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/gpl.html + *

+ * Contributors: + * cpw - initial API and implementation + ******************************************************************************/ +package com.progwml6.ironchest; + +import com.progwml6.ironchest.client.ClientProxy; +import com.progwml6.ironchest.common.ServerProxy; +import com.progwml6.ironchest.common.ai.OcelotsSitOnChestsHandler; +import com.progwml6.ironchest.common.network.PacketHandler; +import com.progwml6.ironchest.common.gui.GuiHandler; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.fml.DistExecutor; +import net.minecraftforge.fml.ExtensionPoint; +import net.minecraftforge.fml.ModLoadingContext; +import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; +import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; + +@Mod(value = IronChest.MOD_ID) +public class IronChest +{ + public static final String MOD_ID = "ironchest"; + + public static IronChest instance; + + public static ServerProxy proxy = DistExecutor.runForDist(() -> ClientProxy::new, () -> ServerProxy::new); + + public IronChest() + { + instance = this; + FMLJavaModLoadingContext.get().getModEventBus().addListener(this::preInit); + MinecraftForge.EVENT_BUS.register(new OcelotsSitOnChestsHandler()); + ModLoadingContext.get().registerExtensionPoint(ExtensionPoint.GUIFACTORY, () -> GuiHandler::openGui); + } + + private void preInit(final FMLCommonSetupEvent event) + { + proxy.preInit(); + + PacketHandler.register(); + } +} diff --git a/src/main/java/cpw/mods/ironchest/client/ClientProxy.java b/src/main/java/com/progwml6/ironchest/client/ClientProxy.java similarity index 84% rename from src/main/java/cpw/mods/ironchest/client/ClientProxy.java rename to src/main/java/com/progwml6/ironchest/client/ClientProxy.java index 935f41e..10775f4 100644 --- a/src/main/java/cpw/mods/ironchest/client/ClientProxy.java +++ b/src/main/java/com/progwml6/ironchest/client/ClientProxy.java @@ -8,11 +8,11 @@ * Contributors: * cpw - initial API and implementation ******************************************************************************/ -package cpw.mods.ironchest.client; +package com.progwml6.ironchest.client; -import cpw.mods.ironchest.client.renderer.TileEntityIronChestRenderer; -import cpw.mods.ironchest.common.ServerProxy; -import cpw.mods.ironchest.common.blocks.IronChestType; +import com.progwml6.ironchest.client.renderer.TileEntityIronChestRenderer; +import com.progwml6.ironchest.common.ServerProxy; +import com.progwml6.ironchest.common.blocks.IronChestType; import net.minecraft.client.Minecraft; import net.minecraft.world.World; import net.minecraftforge.fml.client.registry.ClientRegistry; diff --git a/src/main/java/cpw/mods/ironchest/client/gui/GUIChest.java b/src/main/java/com/progwml6/ironchest/client/gui/GUIChest.java similarity index 80% rename from src/main/java/cpw/mods/ironchest/client/gui/GUIChest.java rename to src/main/java/com/progwml6/ironchest/client/gui/GUIChest.java index 4456541..3d5392a 100644 --- a/src/main/java/cpw/mods/ironchest/client/gui/GUIChest.java +++ b/src/main/java/com/progwml6/ironchest/client/gui/GUIChest.java @@ -8,11 +8,10 @@ * Contributors: * cpw - initial API and implementation ******************************************************************************/ -package cpw.mods.ironchest.client.gui; +package com.progwml6.ironchest.client.gui; -import cpw.mods.ironchest.common.blocks.IronChestType; -import cpw.mods.ironchest.common.gui.ContainerIronChest; -import cpw.mods.ironchest.common.tileentity.TileEntityIronChest; +import com.progwml6.ironchest.common.blocks.IronChestType; +import com.progwml6.ironchest.common.gui.ContainerIronChest; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.renderer.GlStateManager; @@ -28,14 +27,13 @@ public class GUIChest extends GuiContainer { public enum ResourceList { - //@formatter:off IRON(new ResourceLocation("ironchest", "textures/gui/iron_container.png")), COPPER(new ResourceLocation("ironchest", "textures/gui/copper_container.png")), SILVER(new ResourceLocation("ironchest", "textures/gui/silver_container.png")), GOLD(new ResourceLocation("ironchest", "textures/gui/gold_container.png")), DIAMOND(new ResourceLocation("ironchest", "textures/gui/diamond_container.png")), DIRT(new ResourceLocation("ironchest", "textures/gui/dirt_container.png")); - //@formatter:on + public final ResourceLocation location; ResourceList(ResourceLocation loc) @@ -46,16 +44,14 @@ public class GUIChest extends GuiContainer public enum GUI { - //@formatter:off - IRON(184, 202, ResourceList.IRON, IronChestType.IRON), - GOLD(184, 256, ResourceList.GOLD, IronChestType.GOLD), - DIAMOND(238, 256, ResourceList.DIAMOND, IronChestType.DIAMOND), - COPPER(184, 184, ResourceList.COPPER, IronChestType.COPPER), - SILVER(184, 238, ResourceList.SILVER, IronChestType.SILVER), - CRYSTAL(238, 256, ResourceList.DIAMOND, IronChestType.CRYSTAL), - OBSIDIAN(238, 256, ResourceList.DIAMOND,IronChestType.OBSIDIAN), - DIRTCHEST9000(184, 184, ResourceList.DIRT, IronChestType.DIRTCHEST9000); - //@formatter:on + IRON(184, 202, ResourceList.IRON, IronChestType.IRON, new ResourceLocation("ironchest:iron")), + GOLD(184, 256, ResourceList.GOLD, IronChestType.GOLD, new ResourceLocation("ironchest:gold")), + DIAMOND(238, 256, ResourceList.DIAMOND, IronChestType.DIAMOND, new ResourceLocation("ironchest:diamond")), + COPPER(184, 184, ResourceList.COPPER, IronChestType.COPPER, new ResourceLocation("ironchest:copper")), + SILVER(184, 238, ResourceList.SILVER, IronChestType.SILVER, new ResourceLocation("ironchest:silver")), + CRYSTAL(238, 256, ResourceList.DIAMOND, IronChestType.CRYSTAL, new ResourceLocation("ironchest:diamond")), + OBSIDIAN(238, 256, ResourceList.DIAMOND, IronChestType.OBSIDIAN, new ResourceLocation("ironchest:obsidian")), + DIRTCHEST9000(184, 184, ResourceList.DIRT, IronChestType.DIRTCHEST9000, new ResourceLocation("ironchest:dirt")); private int xSize; @@ -65,12 +61,15 @@ public class GUIChest extends GuiContainer private IronChestType mainType; - GUI(int xSize, int ySize, ResourceList guiResourceList, IronChestType mainType) + private ResourceLocation guiId; + + GUI(int xSize, int ySize, ResourceList guiResourceList, IronChestType mainType, ResourceLocation guiId) { this.xSize = xSize; this.ySize = ySize; this.guiResourceList = guiResourceList; this.mainType = mainType; + this.guiId = guiId; } protected Container makeContainer(IInventory playerInventory, IInventory chestInventory, EntityPlayer player) @@ -78,9 +77,9 @@ public class GUIChest extends GuiContainer return new ContainerIronChest(playerInventory, chestInventory, this.mainType, player, this.xSize, this.ySize); } - public static GUIChest buildGUI(IronChestType type, IInventory playerInventory, TileEntityIronChest chestInventory) + public ResourceLocation getGuiId() { - return new GUIChest(values()[chestInventory.getIronChestType().ordinal()], playerInventory, chestInventory); + return this.guiId; } } @@ -90,7 +89,7 @@ public class GUIChest extends GuiContainer private final IInventory lowerChestInventory; - private GUIChest(GUI type, IInventory playerInventory, IInventory chestInventory) + public GUIChest(GUI type, IInventory playerInventory, IInventory chestInventory) { super(type.makeContainer(playerInventory, chestInventory, Minecraft.getInstance().player)); this.type = type; @@ -112,12 +111,13 @@ public class GUIChest extends GuiContainer this.renderHoveredToolTip(mouseX, mouseY); } + /* @Override protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { this.fontRenderer.drawString(this.lowerChestInventory.getDisplayName().getString(), 8.0F, 6.0F, 4210752); this.fontRenderer.drawString(this.upperChestInventory.getDisplayName().getString(), 8.0F, this.ySize - 96 + 2, 4210752); - } + }*/ /** * Draws the background layer of this container (behind the items). diff --git a/src/main/java/cpw/mods/ironchest/client/renderer/TileEntityIronChestItemRenderer.java b/src/main/java/com/progwml6/ironchest/client/renderer/TileEntityIronChestItemRenderer.java similarity index 77% rename from src/main/java/cpw/mods/ironchest/client/renderer/TileEntityIronChestItemRenderer.java rename to src/main/java/com/progwml6/ironchest/client/renderer/TileEntityIronChestItemRenderer.java index 16e95fe..24ad8a6 100644 --- a/src/main/java/cpw/mods/ironchest/client/renderer/TileEntityIronChestItemRenderer.java +++ b/src/main/java/com/progwml6/ironchest/client/renderer/TileEntityIronChestItemRenderer.java @@ -8,18 +8,18 @@ * Contributors: * cpw - initial API and implementation ******************************************************************************/ -package cpw.mods.ironchest.client.renderer; +package com.progwml6.ironchest.client.renderer; -import cpw.mods.ironchest.common.blocks.BlockChest; -import cpw.mods.ironchest.common.blocks.IronChestType; -import cpw.mods.ironchest.common.tileentity.TileEntityCopperChest; -import cpw.mods.ironchest.common.tileentity.TileEntityCrystalChest; -import cpw.mods.ironchest.common.tileentity.TileEntityDiamondChest; -import cpw.mods.ironchest.common.tileentity.TileEntityDirtChest; -import cpw.mods.ironchest.common.tileentity.TileEntityGoldChest; -import cpw.mods.ironchest.common.tileentity.TileEntityIronChest; -import cpw.mods.ironchest.common.tileentity.TileEntityObsidianChest; -import cpw.mods.ironchest.common.tileentity.TileEntitySilverChest; +import com.progwml6.ironchest.common.blocks.BlockChest; +import com.progwml6.ironchest.common.blocks.IronChestType; +import com.progwml6.ironchest.common.tileentity.TileEntityCopperChest; +import com.progwml6.ironchest.common.tileentity.TileEntityCrystalChest; +import com.progwml6.ironchest.common.tileentity.TileEntityDiamondChest; +import com.progwml6.ironchest.common.tileentity.TileEntityDirtChest; +import com.progwml6.ironchest.common.tileentity.TileEntityGoldChest; +import com.progwml6.ironchest.common.tileentity.TileEntityIronChest; +import com.progwml6.ironchest.common.tileentity.TileEntityObsidianChest; +import com.progwml6.ironchest.common.tileentity.TileEntitySilverChest; import net.minecraft.block.Block; import net.minecraft.client.renderer.tileentity.TileEntityItemStackRenderer; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; diff --git a/src/main/java/cpw/mods/ironchest/client/renderer/TileEntityIronChestRenderer.java b/src/main/java/com/progwml6/ironchest/client/renderer/TileEntityIronChestRenderer.java similarity index 90% rename from src/main/java/cpw/mods/ironchest/client/renderer/TileEntityIronChestRenderer.java rename to src/main/java/com/progwml6/ironchest/client/renderer/TileEntityIronChestRenderer.java index 4d00ae2..868a881 100644 --- a/src/main/java/cpw/mods/ironchest/client/renderer/TileEntityIronChestRenderer.java +++ b/src/main/java/com/progwml6/ironchest/client/renderer/TileEntityIronChestRenderer.java @@ -8,13 +8,13 @@ * Contributors: * cpw - initial API and implementation ******************************************************************************/ -package cpw.mods.ironchest.client.renderer; +package com.progwml6.ironchest.client.renderer; import com.google.common.primitives.SignedBytes; -import cpw.mods.ironchest.common.blocks.BlockChest; -import cpw.mods.ironchest.common.blocks.IronChestType; -import cpw.mods.ironchest.common.tileentity.TileEntityCrystalChest; -import cpw.mods.ironchest.common.tileentity.TileEntityIronChest; +import com.progwml6.ironchest.common.blocks.BlockChest; +import com.progwml6.ironchest.common.blocks.IronChestType; +import com.progwml6.ironchest.common.tileentity.TileEntityCrystalChest; +import com.progwml6.ironchest.common.tileentity.TileEntityIronChest; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; @@ -67,9 +67,7 @@ public class TileEntityIronChestRenderer exten TileEntityIronChest tileEntity = (TileEntityIronChest) tileEntityIn; - IBlockState iBlockState = tileEntity.hasWorld() ? - tileEntity.getBlockState() : - (IBlockState) tileEntity.getBlockToUse().getDefaultState().with(BlockChest.FACING, EnumFacing.NORTH); + IBlockState iBlockState = tileEntity.hasWorld() ? tileEntity.getBlockState() : (IBlockState) tileEntity.getBlockToUse().getDefaultState().with(BlockChest.FACING, EnumFacing.NORTH); IronChestType chestType = IronChestType.IRON; IronChestType typeNew = BlockChest.getTypeFromBlock(iBlockState.getBlock()); @@ -134,8 +132,7 @@ public class TileEntityIronChestRenderer exten GlStateManager.matrixMode(5888); } - if (chestType.isTransparent() - && tileEntity.getDistanceSq(this.rendererDispatcher.entityX, this.rendererDispatcher.entityY, this.rendererDispatcher.entityZ) < 128d) + if (chestType.isTransparent() && tileEntity.getDistanceSq(this.rendererDispatcher.entityX, this.rendererDispatcher.entityY, this.rendererDispatcher.entityZ) < 128d) { this.random.setSeed(254L); diff --git a/src/main/java/cpw/mods/ironchest/common/ServerProxy.java b/src/main/java/com/progwml6/ironchest/common/ServerProxy.java similarity index 94% rename from src/main/java/cpw/mods/ironchest/common/ServerProxy.java rename to src/main/java/com/progwml6/ironchest/common/ServerProxy.java index 13950fc..0869a96 100644 --- a/src/main/java/cpw/mods/ironchest/common/ServerProxy.java +++ b/src/main/java/com/progwml6/ironchest/common/ServerProxy.java @@ -8,7 +8,7 @@ * Contributors: * cpw - initial API and implementation ******************************************************************************/ -package cpw.mods.ironchest.common; +package com.progwml6.ironchest.common; import net.minecraft.world.World; diff --git a/src/main/java/cpw/mods/ironchest/common/ai/IronChestAIOcelotSit.java b/src/main/java/com/progwml6/ironchest/common/ai/IronChestAIOcelotSit.java similarity index 90% rename from src/main/java/cpw/mods/ironchest/common/ai/IronChestAIOcelotSit.java rename to src/main/java/com/progwml6/ironchest/common/ai/IronChestAIOcelotSit.java index 3f8afc5..17abc3e 100644 --- a/src/main/java/cpw/mods/ironchest/common/ai/IronChestAIOcelotSit.java +++ b/src/main/java/com/progwml6/ironchest/common/ai/IronChestAIOcelotSit.java @@ -8,10 +8,10 @@ * Contributors: * cpw - initial API and implementation ******************************************************************************/ -package cpw.mods.ironchest.common.ai; +package com.progwml6.ironchest.common.ai; -import cpw.mods.ironchest.common.blocks.BlockChest; -import cpw.mods.ironchest.common.tileentity.TileEntityIronChest; +import com.progwml6.ironchest.common.blocks.BlockChest; +import com.progwml6.ironchest.common.tileentity.TileEntityIronChest; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.ai.EntityAIOcelotSit; diff --git a/src/main/java/cpw/mods/ironchest/common/ai/OcelotsSitOnChestsHandler.java b/src/main/java/com/progwml6/ironchest/common/ai/OcelotsSitOnChestsHandler.java similarity index 97% rename from src/main/java/cpw/mods/ironchest/common/ai/OcelotsSitOnChestsHandler.java rename to src/main/java/com/progwml6/ironchest/common/ai/OcelotsSitOnChestsHandler.java index d83a60f..cd0e018 100644 --- a/src/main/java/cpw/mods/ironchest/common/ai/OcelotsSitOnChestsHandler.java +++ b/src/main/java/com/progwml6/ironchest/common/ai/OcelotsSitOnChestsHandler.java @@ -8,7 +8,7 @@ * Contributors: * cpw - initial API and implementation ******************************************************************************/ -package cpw.mods.ironchest.common.ai; +package com.progwml6.ironchest.common.ai; import net.minecraft.entity.ai.EntityAIOcelotSit; import net.minecraft.entity.ai.EntityAITasks.EntityAITaskEntry; diff --git a/src/main/java/cpw/mods/ironchest/common/blocks/BlockChest.java b/src/main/java/com/progwml6/ironchest/common/blocks/BlockChest.java similarity index 84% rename from src/main/java/cpw/mods/ironchest/common/blocks/BlockChest.java rename to src/main/java/com/progwml6/ironchest/common/blocks/BlockChest.java index eb6908a..036acfb 100644 --- a/src/main/java/cpw/mods/ironchest/common/blocks/BlockChest.java +++ b/src/main/java/com/progwml6/ironchest/common/blocks/BlockChest.java @@ -8,17 +8,18 @@ * Contributors: * cpw - initial API and implementation ******************************************************************************/ -package cpw.mods.ironchest.common.blocks; +package com.progwml6.ironchest.common.blocks; -import cpw.mods.ironchest.common.tileentity.TileEntityIronChest; +import com.progwml6.ironchest.common.tileentity.TileEntityIronChest; +import io.netty.buffer.Unpooled; import net.minecraft.block.Block; import net.minecraft.block.BlockHorizontal; -import net.minecraft.block.ITileEntityProvider; import net.minecraft.block.state.BlockFaceShape; import net.minecraft.block.state.IBlockState; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.init.Enchantments; import net.minecraft.init.Items; import net.minecraft.inventory.Container; @@ -26,6 +27,7 @@ import net.minecraft.inventory.InventoryHelper; import net.minecraft.item.BlockItemUseContext; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.network.PacketBuffer; import net.minecraft.pathfinding.PathType; import net.minecraft.state.DirectionProperty; import net.minecraft.state.StateContainer; @@ -33,6 +35,7 @@ import net.minecraft.stats.StatList; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumBlockRenderType; import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumHand; import net.minecraft.util.INameable; import net.minecraft.util.Mirror; import net.minecraft.util.ResourceLocation; @@ -44,6 +47,8 @@ import net.minecraft.world.ILockableContainer; import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; +import net.minecraftforge.common.util.FakePlayer; +import net.minecraftforge.fml.network.NetworkHooks; import javax.annotation.Nullable; @@ -55,9 +60,9 @@ public abstract class BlockChest extends Block private final IronChestType type; - public BlockChest(Builder builderIn, IronChestType typeIn) + public BlockChest(Properties propertiesIn, IronChestType typeIn) { - super(builderIn); + super(propertiesIn); this.type = typeIn; @@ -123,6 +128,34 @@ public abstract class BlockChest extends Block } } + public boolean onBlockActivated(IBlockState state, World worldIn, BlockPos pos, EntityPlayer player, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) + { + if (worldIn.isRemote) + { + return true; + } + else + { + ILockableContainer ilockablecontainer = this.getContainer(state, worldIn, pos); + + if (ilockablecontainer != null) + { + if (player instanceof EntityPlayerMP && !(player instanceof FakePlayer)) + { + EntityPlayerMP entityPlayerMP = (EntityPlayerMP) player; + PacketBuffer buffer = new PacketBuffer(Unpooled.buffer()); + buffer.writeBlockPos(pos); + + NetworkHooks.openGui(entityPlayerMP, ilockablecontainer, buffer); + } + + player.addStat(StatList.OPEN_CHEST); + } + + return true; + } + } + @SuppressWarnings("deprecation") @Override public void onReplaced(IBlockState state, World worldIn, BlockPos pos, IBlockState newState, boolean isMoving) @@ -130,12 +163,13 @@ public abstract class BlockChest extends Block if (state.getBlock() != newState.getBlock()) { TileEntityIronChest tileentity = (TileEntityIronChest) worldIn.getTileEntity(pos); + if (tileentity != null) { + tileentity.removeAdornments(); + InventoryHelper.dropInventoryItems(worldIn, pos, tileentity); worldIn.updateComparatorOutputLevel(pos, this); - - tileentity.removeAdornments(); } super.onReplaced(state, worldIn, pos, newState, isMoving); @@ -180,6 +214,7 @@ public abstract class BlockChest extends Block { player.addStat(StatList.BLOCK_MINED.get(this)); player.addExhaustion(0.005F); + if (worldIn.isRemote) { return; @@ -187,6 +222,7 @@ public abstract class BlockChest extends Block int i = EnchantmentHelper.getEnchantmentLevel(Enchantments.FORTUNE, stack); Item item = this.getItemDropped(state, worldIn, pos, i).asItem(); + if (item == Items.AIR) { return; diff --git a/src/main/java/cpw/mods/ironchest/common/blocks/BlockCopperChest.java b/src/main/java/com/progwml6/ironchest/common/blocks/BlockCopperChest.java similarity index 84% rename from src/main/java/cpw/mods/ironchest/common/blocks/BlockCopperChest.java rename to src/main/java/com/progwml6/ironchest/common/blocks/BlockCopperChest.java index eb2c362..7a46523 100644 --- a/src/main/java/cpw/mods/ironchest/common/blocks/BlockCopperChest.java +++ b/src/main/java/com/progwml6/ironchest/common/blocks/BlockCopperChest.java @@ -8,16 +8,16 @@ * Contributors: * cpw - initial API and implementation ******************************************************************************/ -package cpw.mods.ironchest.common.blocks; +package com.progwml6.ironchest.common.blocks; -import cpw.mods.ironchest.common.tileentity.TileEntityCopperChest; +import com.progwml6.ironchest.common.tileentity.TileEntityCopperChest; import net.minecraft.block.state.IBlockState; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.IBlockReader; public class BlockCopperChest extends BlockChest { - public BlockCopperChest(Builder properties) + public BlockCopperChest(Properties properties) { super(properties, IronChestType.COPPER); } diff --git a/src/main/java/cpw/mods/ironchest/common/blocks/BlockCrystalChest.java b/src/main/java/com/progwml6/ironchest/common/blocks/BlockCrystalChest.java similarity index 83% rename from src/main/java/cpw/mods/ironchest/common/blocks/BlockCrystalChest.java rename to src/main/java/com/progwml6/ironchest/common/blocks/BlockCrystalChest.java index b28db9e..3af9589 100644 --- a/src/main/java/cpw/mods/ironchest/common/blocks/BlockCrystalChest.java +++ b/src/main/java/com/progwml6/ironchest/common/blocks/BlockCrystalChest.java @@ -8,16 +8,16 @@ * Contributors: * cpw - initial API and implementation ******************************************************************************/ -package cpw.mods.ironchest.common.blocks; +package com.progwml6.ironchest.common.blocks; -import cpw.mods.ironchest.common.tileentity.TileEntityCrystalChest; +import com.progwml6.ironchest.common.tileentity.TileEntityCrystalChest; import net.minecraft.block.state.IBlockState; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.IBlockReader; public class BlockCrystalChest extends BlockChest { - public BlockCrystalChest(Builder properties) + public BlockCrystalChest(Properties properties) { super(properties, IronChestType.CRYSTAL); } diff --git a/src/main/java/cpw/mods/ironchest/common/blocks/BlockDiamondChest.java b/src/main/java/com/progwml6/ironchest/common/blocks/BlockDiamondChest.java similarity index 83% rename from src/main/java/cpw/mods/ironchest/common/blocks/BlockDiamondChest.java rename to src/main/java/com/progwml6/ironchest/common/blocks/BlockDiamondChest.java index d42499a..241e03c 100644 --- a/src/main/java/cpw/mods/ironchest/common/blocks/BlockDiamondChest.java +++ b/src/main/java/com/progwml6/ironchest/common/blocks/BlockDiamondChest.java @@ -8,16 +8,16 @@ * Contributors: * cpw - initial API and implementation ******************************************************************************/ -package cpw.mods.ironchest.common.blocks; +package com.progwml6.ironchest.common.blocks; -import cpw.mods.ironchest.common.tileentity.TileEntityDiamondChest; +import com.progwml6.ironchest.common.tileentity.TileEntityDiamondChest; import net.minecraft.block.state.IBlockState; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.IBlockReader; public class BlockDiamondChest extends BlockChest { - public BlockDiamondChest(Builder properties) + public BlockDiamondChest(Properties properties) { super(properties, IronChestType.DIAMOND); } diff --git a/src/main/java/cpw/mods/ironchest/common/blocks/BlockDirtChest.java b/src/main/java/com/progwml6/ironchest/common/blocks/BlockDirtChest.java similarity index 89% rename from src/main/java/cpw/mods/ironchest/common/blocks/BlockDirtChest.java rename to src/main/java/com/progwml6/ironchest/common/blocks/BlockDirtChest.java index 233444b..ef8625c 100644 --- a/src/main/java/cpw/mods/ironchest/common/blocks/BlockDirtChest.java +++ b/src/main/java/com/progwml6/ironchest/common/blocks/BlockDirtChest.java @@ -8,9 +8,9 @@ * Contributors: * cpw - initial API and implementation ******************************************************************************/ -package cpw.mods.ironchest.common.blocks; +package com.progwml6.ironchest.common.blocks; -import cpw.mods.ironchest.common.tileentity.TileEntityDirtChest; +import com.progwml6.ironchest.common.tileentity.TileEntityDirtChest; import net.minecraft.block.state.IBlockState; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagByte; @@ -21,7 +21,7 @@ import net.minecraft.world.World; public class BlockDirtChest extends BlockChest { - public BlockDirtChest(Builder properties) + public BlockDirtChest(Properties properties) { super(properties, IronChestType.DIRTCHEST9000); } diff --git a/src/main/java/cpw/mods/ironchest/common/blocks/BlockGoldChest.java b/src/main/java/com/progwml6/ironchest/common/blocks/BlockGoldChest.java similarity index 84% rename from src/main/java/cpw/mods/ironchest/common/blocks/BlockGoldChest.java rename to src/main/java/com/progwml6/ironchest/common/blocks/BlockGoldChest.java index 10cc943..20a6f1d 100644 --- a/src/main/java/cpw/mods/ironchest/common/blocks/BlockGoldChest.java +++ b/src/main/java/com/progwml6/ironchest/common/blocks/BlockGoldChest.java @@ -8,16 +8,16 @@ * Contributors: * cpw - initial API and implementation ******************************************************************************/ -package cpw.mods.ironchest.common.blocks; +package com.progwml6.ironchest.common.blocks; -import cpw.mods.ironchest.common.tileentity.TileEntityGoldChest; +import com.progwml6.ironchest.common.tileentity.TileEntityGoldChest; import net.minecraft.block.state.IBlockState; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.IBlockReader; public class BlockGoldChest extends BlockChest { - public BlockGoldChest(Builder properties) + public BlockGoldChest(Properties properties) { super(properties, IronChestType.GOLD); } diff --git a/src/main/java/cpw/mods/ironchest/common/blocks/BlockIronChest.java b/src/main/java/com/progwml6/ironchest/common/blocks/BlockIronChest.java similarity index 84% rename from src/main/java/cpw/mods/ironchest/common/blocks/BlockIronChest.java rename to src/main/java/com/progwml6/ironchest/common/blocks/BlockIronChest.java index 4e5d1b5..3b965a9 100644 --- a/src/main/java/cpw/mods/ironchest/common/blocks/BlockIronChest.java +++ b/src/main/java/com/progwml6/ironchest/common/blocks/BlockIronChest.java @@ -8,16 +8,16 @@ * Contributors: * cpw - initial API and implementation ******************************************************************************/ -package cpw.mods.ironchest.common.blocks; +package com.progwml6.ironchest.common.blocks; -import cpw.mods.ironchest.common.tileentity.TileEntityIronChest; +import com.progwml6.ironchest.common.tileentity.TileEntityIronChest; import net.minecraft.block.state.IBlockState; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.IBlockReader; public class BlockIronChest extends BlockChest { - public BlockIronChest(Builder properties) + public BlockIronChest(Properties properties) { super(properties, IronChestType.IRON); } diff --git a/src/main/java/cpw/mods/ironchest/common/blocks/BlockObsidianChest.java b/src/main/java/com/progwml6/ironchest/common/blocks/BlockObsidianChest.java similarity index 83% rename from src/main/java/cpw/mods/ironchest/common/blocks/BlockObsidianChest.java rename to src/main/java/com/progwml6/ironchest/common/blocks/BlockObsidianChest.java index c2af242..7548370 100644 --- a/src/main/java/cpw/mods/ironchest/common/blocks/BlockObsidianChest.java +++ b/src/main/java/com/progwml6/ironchest/common/blocks/BlockObsidianChest.java @@ -8,16 +8,16 @@ * Contributors: * cpw - initial API and implementation ******************************************************************************/ -package cpw.mods.ironchest.common.blocks; +package com.progwml6.ironchest.common.blocks; -import cpw.mods.ironchest.common.tileentity.TileEntityObsidianChest; +import com.progwml6.ironchest.common.tileentity.TileEntityObsidianChest; import net.minecraft.block.state.IBlockState; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.IBlockReader; public class BlockObsidianChest extends BlockChest { - public BlockObsidianChest(Builder properties) + public BlockObsidianChest(Properties properties) { super(properties, IronChestType.OBSIDIAN); } diff --git a/src/main/java/cpw/mods/ironchest/common/blocks/BlockSilverChest.java b/src/main/java/com/progwml6/ironchest/common/blocks/BlockSilverChest.java similarity index 84% rename from src/main/java/cpw/mods/ironchest/common/blocks/BlockSilverChest.java rename to src/main/java/com/progwml6/ironchest/common/blocks/BlockSilverChest.java index 1fd8041..ebe9f7c 100644 --- a/src/main/java/cpw/mods/ironchest/common/blocks/BlockSilverChest.java +++ b/src/main/java/com/progwml6/ironchest/common/blocks/BlockSilverChest.java @@ -8,16 +8,16 @@ * Contributors: * cpw - initial API and implementation ******************************************************************************/ -package cpw.mods.ironchest.common.blocks; +package com.progwml6.ironchest.common.blocks; -import cpw.mods.ironchest.common.tileentity.TileEntitySilverChest; +import com.progwml6.ironchest.common.tileentity.TileEntitySilverChest; import net.minecraft.block.state.IBlockState; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.IBlockReader; public class BlockSilverChest extends BlockChest { - public BlockSilverChest(Builder properties) + public BlockSilverChest(Properties properties) { super(properties, IronChestType.SILVER); } diff --git a/src/main/java/cpw/mods/ironchest/common/blocks/IronChestType.java b/src/main/java/com/progwml6/ironchest/common/blocks/IronChestType.java similarity index 88% rename from src/main/java/cpw/mods/ironchest/common/blocks/IronChestType.java rename to src/main/java/com/progwml6/ironchest/common/blocks/IronChestType.java index 473d3dd..9e95001 100644 --- a/src/main/java/cpw/mods/ironchest/common/blocks/IronChestType.java +++ b/src/main/java/com/progwml6/ironchest/common/blocks/IronChestType.java @@ -8,19 +8,19 @@ * Contributors: * cpw - initial API and implementation ******************************************************************************/ -package cpw.mods.ironchest.common.blocks; +package com.progwml6.ironchest.common.blocks; -import cpw.mods.ironchest.common.core.IronChestBlocks; -import cpw.mods.ironchest.common.gui.slot.ValidatingChestSlot; -import cpw.mods.ironchest.common.tileentity.TileEntityCopperChest; -import cpw.mods.ironchest.common.tileentity.TileEntityCrystalChest; -import cpw.mods.ironchest.common.tileentity.TileEntityDiamondChest; -import cpw.mods.ironchest.common.tileentity.TileEntityDirtChest; -import cpw.mods.ironchest.common.tileentity.TileEntityGoldChest; -import cpw.mods.ironchest.common.tileentity.TileEntityIronChest; -import cpw.mods.ironchest.common.tileentity.TileEntityObsidianChest; -import cpw.mods.ironchest.common.tileentity.TileEntitySilverChest; -import cpw.mods.ironchest.common.util.BlockNames; +import com.progwml6.ironchest.common.core.IronChestBlocks; +import com.progwml6.ironchest.common.gui.slot.ValidatingChestSlot; +import com.progwml6.ironchest.common.util.BlockNames; +import com.progwml6.ironchest.common.tileentity.TileEntityCopperChest; +import com.progwml6.ironchest.common.tileentity.TileEntityCrystalChest; +import com.progwml6.ironchest.common.tileentity.TileEntityDiamondChest; +import com.progwml6.ironchest.common.tileentity.TileEntityDirtChest; +import com.progwml6.ironchest.common.tileentity.TileEntityGoldChest; +import com.progwml6.ironchest.common.tileentity.TileEntityIronChest; +import com.progwml6.ironchest.common.tileentity.TileEntityObsidianChest; +import com.progwml6.ironchest.common.tileentity.TileEntitySilverChest; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; import net.minecraft.inventory.IInventory; diff --git a/src/main/java/cpw/mods/ironchest/common/core/IronChestBlocks.java b/src/main/java/com/progwml6/ironchest/common/core/IronChestBlocks.java similarity index 63% rename from src/main/java/cpw/mods/ironchest/common/core/IronChestBlocks.java rename to src/main/java/com/progwml6/ironchest/common/core/IronChestBlocks.java index 4bb70f0..76f9b0d 100644 --- a/src/main/java/cpw/mods/ironchest/common/core/IronChestBlocks.java +++ b/src/main/java/com/progwml6/ironchest/common/core/IronChestBlocks.java @@ -8,25 +8,25 @@ * Contributors: * cpw - initial API and implementation ******************************************************************************/ -package cpw.mods.ironchest.common.core; +package com.progwml6.ironchest.common.core; -import cpw.mods.ironchest.IronChest; -import cpw.mods.ironchest.client.renderer.TileEntityIronChestItemRenderer; -import cpw.mods.ironchest.common.blocks.BlockChest; -import cpw.mods.ironchest.common.blocks.BlockCopperChest; -import cpw.mods.ironchest.common.blocks.BlockCrystalChest; -import cpw.mods.ironchest.common.blocks.BlockDiamondChest; -import cpw.mods.ironchest.common.blocks.BlockDirtChest; -import cpw.mods.ironchest.common.blocks.BlockGoldChest; -import cpw.mods.ironchest.common.blocks.BlockIronChest; -import cpw.mods.ironchest.common.blocks.BlockObsidianChest; -import cpw.mods.ironchest.common.blocks.BlockSilverChest; -import cpw.mods.ironchest.common.items.ItemChest; -import cpw.mods.ironchest.common.util.BlockNames; +import com.progwml6.ironchest.client.renderer.TileEntityIronChestItemRenderer; +import com.progwml6.ironchest.IronChest; +import com.progwml6.ironchest.common.blocks.BlockChest; +import com.progwml6.ironchest.common.blocks.BlockCopperChest; +import com.progwml6.ironchest.common.blocks.BlockCrystalChest; +import com.progwml6.ironchest.common.blocks.BlockDiamondChest; +import com.progwml6.ironchest.common.blocks.BlockDirtChest; +import com.progwml6.ironchest.common.blocks.BlockGoldChest; +import com.progwml6.ironchest.common.blocks.BlockIronChest; +import com.progwml6.ironchest.common.blocks.BlockObsidianChest; +import com.progwml6.ironchest.common.blocks.BlockSilverChest; +import com.progwml6.ironchest.common.items.ItemChest; +import com.progwml6.ironchest.common.util.BlockNames; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.item.Item; -import net.minecraft.item.Item.Builder; +import net.minecraft.item.Item.Properties; import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; @@ -35,7 +35,7 @@ import net.minecraftforge.registries.ObjectHolder; public class IronChestBlocks { - public static Builder itemBuilder; + public static Properties itemBuilder; @ObjectHolder(BlockNames.IRON_CHEST) public static BlockChest ironChestBlock; @@ -98,14 +98,14 @@ public class IronChestBlocks { IForgeRegistry blockRegistry = event.getRegistry(); - blockRegistry.register(new BlockIronChest(Block.Builder.create(Material.IRON).hardnessAndResistance(3.0F, 3.0F))); - blockRegistry.register(new BlockGoldChest(Block.Builder.create(Material.IRON).hardnessAndResistance(3.0F, 3.0F))); - blockRegistry.register(new BlockDiamondChest(Block.Builder.create(Material.IRON).hardnessAndResistance(3.0F, 3.0F))); - blockRegistry.register(new BlockCopperChest(Block.Builder.create(Material.IRON).hardnessAndResistance(3.0F, 3.0F))); - blockRegistry.register(new BlockSilverChest(Block.Builder.create(Material.IRON).hardnessAndResistance(3.0F, 3.0F))); - blockRegistry.register(new BlockCrystalChest(Block.Builder.create(Material.IRON).hardnessAndResistance(3.0F, 3.0F))); - blockRegistry.register(new BlockObsidianChest(Block.Builder.create(Material.IRON).hardnessAndResistance(3.0F, 10000.0F))); - blockRegistry.register(new BlockDirtChest(Block.Builder.create(Material.IRON).hardnessAndResistance(3.0F, 3.0F))); + blockRegistry.register(new BlockIronChest(Block.Properties.create(Material.IRON).hardnessAndResistance(3.0F, 3.0F))); + blockRegistry.register(new BlockGoldChest(Block.Properties.create(Material.IRON).hardnessAndResistance(3.0F, 3.0F))); + blockRegistry.register(new BlockDiamondChest(Block.Properties.create(Material.IRON).hardnessAndResistance(3.0F, 3.0F))); + blockRegistry.register(new BlockCopperChest(Block.Properties.create(Material.IRON).hardnessAndResistance(3.0F, 3.0F))); + blockRegistry.register(new BlockSilverChest(Block.Properties.create(Material.IRON).hardnessAndResistance(3.0F, 3.0F))); + blockRegistry.register(new BlockCrystalChest(Block.Properties.create(Material.IRON).hardnessAndResistance(3.0F, 3.0F))); + blockRegistry.register(new BlockObsidianChest(Block.Properties.create(Material.IRON).hardnessAndResistance(3.0F, 10000.0F))); + blockRegistry.register(new BlockDirtChest(Block.Properties.create(Material.IRON).hardnessAndResistance(3.0F, 3.0F))); } @SubscribeEvent @@ -113,7 +113,7 @@ public class IronChestBlocks { IForgeRegistry itemRegistry = event.getRegistry(); - itemBuilder = (new Builder()).group(IronChestCreativeTabs.IRON_CHESTS).setTEISR(() -> TileEntityIronChestItemRenderer::new); + itemBuilder = (new Properties()).group(IronChestCreativeTabs.IRON_CHESTS).setTEISR(() -> TileEntityIronChestItemRenderer::new); itemRegistry.register(new ItemChest(ironChestBlock, itemBuilder)); itemRegistry.register(new ItemChest(goldChestBlock, itemBuilder)); diff --git a/src/main/java/cpw/mods/ironchest/common/core/IronChestCreativeTabs.java b/src/main/java/com/progwml6/ironchest/common/core/IronChestCreativeTabs.java similarity index 95% rename from src/main/java/cpw/mods/ironchest/common/core/IronChestCreativeTabs.java rename to src/main/java/com/progwml6/ironchest/common/core/IronChestCreativeTabs.java index cb94629..f515054 100644 --- a/src/main/java/cpw/mods/ironchest/common/core/IronChestCreativeTabs.java +++ b/src/main/java/com/progwml6/ironchest/common/core/IronChestCreativeTabs.java @@ -8,7 +8,7 @@ * Contributors: * cpw - initial API and implementation ******************************************************************************/ -package cpw.mods.ironchest.common.core; +package com.progwml6.ironchest.common.core; import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemStack; diff --git a/src/main/java/cpw/mods/ironchest/common/core/IronChestItems.java b/src/main/java/com/progwml6/ironchest/common/core/IronChestItems.java similarity index 59% rename from src/main/java/cpw/mods/ironchest/common/core/IronChestItems.java rename to src/main/java/com/progwml6/ironchest/common/core/IronChestItems.java index 3ef083c..4bb4d24 100644 --- a/src/main/java/cpw/mods/ironchest/common/core/IronChestItems.java +++ b/src/main/java/com/progwml6/ironchest/common/core/IronChestItems.java @@ -8,14 +8,14 @@ * Contributors: * cpw - initial API and implementation ******************************************************************************/ -package cpw.mods.ironchest.common.core; +package com.progwml6.ironchest.common.core; -import cpw.mods.ironchest.IronChest; -import cpw.mods.ironchest.common.items.ChestChangerType; -import cpw.mods.ironchest.common.items.ItemChestChanger; -import cpw.mods.ironchest.common.util.ItemNames; +import com.progwml6.ironchest.IronChest; +import com.progwml6.ironchest.common.items.ChestChangerType; +import com.progwml6.ironchest.common.items.ItemChestChanger; +import com.progwml6.ironchest.common.util.ItemNames; import net.minecraft.item.Item; -import net.minecraft.item.Item.Builder; +import net.minecraft.item.Item.Properties; import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; @@ -24,7 +24,7 @@ import net.minecraftforge.registries.ObjectHolder; public class IronChestItems { - public static Builder itemBuilder; + public static Properties itemProperties; @ObjectHolder(ItemNames.IRON_GOLD_UPGRADE) public static Item ironToGoldUpgrade; @@ -66,17 +66,17 @@ public class IronChestItems { IForgeRegistry itemRegistry = event.getRegistry(); - itemBuilder = (new Builder()).group(IronChestCreativeTabs.IRON_CHESTS).maxStackSize(1); + itemProperties = (new Properties()).group(IronChestCreativeTabs.IRON_CHESTS).maxStackSize(1); - itemRegistry.register(new ItemChestChanger(itemBuilder, ChestChangerType.IRON_GOLD)); - itemRegistry.register(new ItemChestChanger(itemBuilder, ChestChangerType.GOLD_DIAMOND)); - itemRegistry.register(new ItemChestChanger(itemBuilder, ChestChangerType.COPPER_SILVER)); - itemRegistry.register(new ItemChestChanger(itemBuilder, ChestChangerType.SILVER_GOLD)); - itemRegistry.register(new ItemChestChanger(itemBuilder, ChestChangerType.COPPER_IRON)); - itemRegistry.register(new ItemChestChanger(itemBuilder, ChestChangerType.DIAMOND_CRYSTAL)); - itemRegistry.register(new ItemChestChanger(itemBuilder, ChestChangerType.WOOD_IRON)); - itemRegistry.register(new ItemChestChanger(itemBuilder, ChestChangerType.WOOD_COPPER)); - itemRegistry.register(new ItemChestChanger(itemBuilder, ChestChangerType.DIAMOND_OBSIDIAN)); + itemRegistry.register(new ItemChestChanger(itemProperties, ChestChangerType.IRON_GOLD)); + itemRegistry.register(new ItemChestChanger(itemProperties, ChestChangerType.GOLD_DIAMOND)); + itemRegistry.register(new ItemChestChanger(itemProperties, ChestChangerType.COPPER_SILVER)); + itemRegistry.register(new ItemChestChanger(itemProperties, ChestChangerType.SILVER_GOLD)); + itemRegistry.register(new ItemChestChanger(itemProperties, ChestChangerType.COPPER_IRON)); + itemRegistry.register(new ItemChestChanger(itemProperties, ChestChangerType.DIAMOND_CRYSTAL)); + itemRegistry.register(new ItemChestChanger(itemProperties, ChestChangerType.WOOD_IRON)); + itemRegistry.register(new ItemChestChanger(itemProperties, ChestChangerType.WOOD_COPPER)); + itemRegistry.register(new ItemChestChanger(itemProperties, ChestChangerType.DIAMOND_OBSIDIAN)); } } } diff --git a/src/main/java/cpw/mods/ironchest/common/gui/ContainerIronChest.java b/src/main/java/com/progwml6/ironchest/common/gui/ContainerIronChest.java similarity index 97% rename from src/main/java/cpw/mods/ironchest/common/gui/ContainerIronChest.java rename to src/main/java/com/progwml6/ironchest/common/gui/ContainerIronChest.java index c4c5439..d4fd5f9 100644 --- a/src/main/java/cpw/mods/ironchest/common/gui/ContainerIronChest.java +++ b/src/main/java/com/progwml6/ironchest/common/gui/ContainerIronChest.java @@ -8,9 +8,9 @@ * Contributors: * cpw - initial API and implementation ******************************************************************************/ -package cpw.mods.ironchest.common.gui; +package com.progwml6.ironchest.common.gui; -import cpw.mods.ironchest.common.blocks.IronChestType; +import com.progwml6.ironchest.common.blocks.IronChestType; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.IInventory; diff --git a/src/main/java/com/progwml6/ironchest/common/gui/GuiHandler.java b/src/main/java/com/progwml6/ironchest/common/gui/GuiHandler.java new file mode 100644 index 0000000..db2e947 --- /dev/null +++ b/src/main/java/com/progwml6/ironchest/common/gui/GuiHandler.java @@ -0,0 +1,26 @@ +package com.progwml6.ironchest.common.gui; + +import com.progwml6.ironchest.client.gui.GUIChest; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.GuiScreen; +import net.minecraft.inventory.IInventory; +import net.minecraft.util.math.BlockPos; +import net.minecraftforge.fml.network.FMLPlayMessages; + +public class GuiHandler +{ + public static GuiScreen openGui(FMLPlayMessages.OpenContainer openContainer) + { + BlockPos pos = openContainer.getAdditionalData().readBlockPos(); + + for (GUIChest.GUI type : GUIChest.GUI.values()) + { + if (type.getGuiId().equals(openContainer.getId())) + { + return new GUIChest(type, (IInventory) Minecraft.getInstance().player.inventory, (IInventory) Minecraft.getInstance().world.getTileEntity(pos)); + } + } + + return null; + } +} diff --git a/src/main/java/cpw/mods/ironchest/common/gui/slot/ValidatingChestSlot.java b/src/main/java/com/progwml6/ironchest/common/gui/slot/ValidatingChestSlot.java similarity index 90% rename from src/main/java/cpw/mods/ironchest/common/gui/slot/ValidatingChestSlot.java rename to src/main/java/com/progwml6/ironchest/common/gui/slot/ValidatingChestSlot.java index 14ccb43..8a6f2c0 100644 --- a/src/main/java/cpw/mods/ironchest/common/gui/slot/ValidatingChestSlot.java +++ b/src/main/java/com/progwml6/ironchest/common/gui/slot/ValidatingChestSlot.java @@ -8,9 +8,9 @@ * Contributors: * cpw - initial API and implementation ******************************************************************************/ -package cpw.mods.ironchest.common.gui.slot; +package com.progwml6.ironchest.common.gui.slot; -import cpw.mods.ironchest.common.blocks.IronChestType; +import com.progwml6.ironchest.common.blocks.IronChestType; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; diff --git a/src/main/java/cpw/mods/ironchest/common/items/ChestChangerType.java b/src/main/java/com/progwml6/ironchest/common/items/ChestChangerType.java similarity index 68% rename from src/main/java/cpw/mods/ironchest/common/items/ChestChangerType.java rename to src/main/java/com/progwml6/ironchest/common/items/ChestChangerType.java index bfda0a8..78952aa 100644 --- a/src/main/java/cpw/mods/ironchest/common/items/ChestChangerType.java +++ b/src/main/java/com/progwml6/ironchest/common/items/ChestChangerType.java @@ -8,20 +8,20 @@ * Contributors: * cpw - initial API and implementation ******************************************************************************/ -package cpw.mods.ironchest.common.items; +package com.progwml6.ironchest.common.items; -import cpw.mods.ironchest.common.blocks.IronChestType; -import cpw.mods.ironchest.common.util.ItemNames; +import com.progwml6.ironchest.common.blocks.IronChestType; +import com.progwml6.ironchest.common.util.ItemNames; import net.minecraft.util.ResourceLocation; -import static cpw.mods.ironchest.common.blocks.IronChestType.COPPER; -import static cpw.mods.ironchest.common.blocks.IronChestType.CRYSTAL; -import static cpw.mods.ironchest.common.blocks.IronChestType.DIAMOND; -import static cpw.mods.ironchest.common.blocks.IronChestType.GOLD; -import static cpw.mods.ironchest.common.blocks.IronChestType.IRON; -import static cpw.mods.ironchest.common.blocks.IronChestType.OBSIDIAN; -import static cpw.mods.ironchest.common.blocks.IronChestType.SILVER; -import static cpw.mods.ironchest.common.blocks.IronChestType.WOOD; +import static com.progwml6.ironchest.common.blocks.IronChestType.COPPER; +import static com.progwml6.ironchest.common.blocks.IronChestType.CRYSTAL; +import static com.progwml6.ironchest.common.blocks.IronChestType.DIAMOND; +import static com.progwml6.ironchest.common.blocks.IronChestType.GOLD; +import static com.progwml6.ironchest.common.blocks.IronChestType.IRON; +import static com.progwml6.ironchest.common.blocks.IronChestType.OBSIDIAN; +import static com.progwml6.ironchest.common.blocks.IronChestType.SILVER; +import static com.progwml6.ironchest.common.blocks.IronChestType.WOOD; public enum ChestChangerType { diff --git a/src/main/java/cpw/mods/ironchest/common/items/ItemChest.java b/src/main/java/com/progwml6/ironchest/common/items/ItemChest.java similarity index 79% rename from src/main/java/cpw/mods/ironchest/common/items/ItemChest.java rename to src/main/java/com/progwml6/ironchest/common/items/ItemChest.java index 9cdfa4d..9787fe2 100644 --- a/src/main/java/cpw/mods/ironchest/common/items/ItemChest.java +++ b/src/main/java/com/progwml6/ironchest/common/items/ItemChest.java @@ -8,16 +8,17 @@ * Contributors: * cpw - initial API and implementation ******************************************************************************/ -package cpw.mods.ironchest.common.items; +package com.progwml6.ironchest.common.items; import net.minecraft.block.Block; +import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; public class ItemChest extends ItemBlock { - public ItemChest(Block block, Builder builder) + public ItemChest(Block block, Item.Properties properties) { - super(block, builder); + super(block, properties); this.setRegistryName(block.getRegistryName()); } diff --git a/src/main/java/cpw/mods/ironchest/common/items/ItemChestChanger.java b/src/main/java/com/progwml6/ironchest/common/items/ItemChestChanger.java similarity index 93% rename from src/main/java/cpw/mods/ironchest/common/items/ItemChestChanger.java rename to src/main/java/com/progwml6/ironchest/common/items/ItemChestChanger.java index 5c812bf..fe7cdf7 100644 --- a/src/main/java/cpw/mods/ironchest/common/items/ItemChestChanger.java +++ b/src/main/java/com/progwml6/ironchest/common/items/ItemChestChanger.java @@ -8,12 +8,12 @@ * Contributors: * cpw - initial API and implementation ******************************************************************************/ -package cpw.mods.ironchest.common.items; +package com.progwml6.ironchest.common.items; -import cpw.mods.ironchest.common.blocks.BlockChest; -import cpw.mods.ironchest.common.blocks.BlockIronChest; -import cpw.mods.ironchest.common.blocks.IronChestType; -import cpw.mods.ironchest.common.tileentity.TileEntityIronChest; +import com.progwml6.ironchest.common.blocks.BlockChest; +import com.progwml6.ironchest.common.blocks.BlockIronChest; +import com.progwml6.ironchest.common.blocks.IronChestType; +import com.progwml6.ironchest.common.tileentity.TileEntityIronChest; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -31,7 +31,7 @@ public class ItemChestChanger extends ItemTooltip { public final ChestChangerType type; - public ItemChestChanger(Builder properties, ChestChangerType chestChangerType) + public ItemChestChanger(Properties properties, ChestChangerType chestChangerType) { super(properties); this.type = chestChangerType; diff --git a/src/main/java/cpw/mods/ironchest/common/items/ItemTooltip.java b/src/main/java/com/progwml6/ironchest/common/items/ItemTooltip.java similarity index 96% rename from src/main/java/cpw/mods/ironchest/common/items/ItemTooltip.java rename to src/main/java/com/progwml6/ironchest/common/items/ItemTooltip.java index 8e6a460..ec982c5 100644 --- a/src/main/java/cpw/mods/ironchest/common/items/ItemTooltip.java +++ b/src/main/java/com/progwml6/ironchest/common/items/ItemTooltip.java @@ -8,7 +8,7 @@ * Contributors: * cpw - initial API and implementation ******************************************************************************/ -package cpw.mods.ironchest.common.items; +package com.progwml6.ironchest.common.items; import com.google.common.collect.Lists; import net.minecraft.client.resources.I18n; @@ -27,7 +27,7 @@ import java.util.List; public class ItemTooltip extends Item { - public ItemTooltip(Builder properties) + public ItemTooltip(Properties properties) { super(properties); } diff --git a/src/main/java/cpw/mods/ironchest/common/network/PacketHandler.java b/src/main/java/com/progwml6/ironchest/common/network/PacketHandler.java similarity index 91% rename from src/main/java/cpw/mods/ironchest/common/network/PacketHandler.java rename to src/main/java/com/progwml6/ironchest/common/network/PacketHandler.java index 5e359f9..6b63071 100644 --- a/src/main/java/cpw/mods/ironchest/common/network/PacketHandler.java +++ b/src/main/java/com/progwml6/ironchest/common/network/PacketHandler.java @@ -8,10 +8,10 @@ * Contributors: * cpw - initial API and implementation ******************************************************************************/ -package cpw.mods.ironchest.common.network; +package com.progwml6.ironchest.common.network; -import cpw.mods.ironchest.IronChest; -import cpw.mods.ironchest.common.network.packets.PacketTopStackSyncChest; +import com.progwml6.ironchest.IronChest; +import com.progwml6.ironchest.common.network.packets.PacketTopStackSyncChest; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.util.ResourceLocation; import net.minecraftforge.common.util.FakePlayer; diff --git a/src/main/java/cpw/mods/ironchest/common/network/packets/PacketTopStackSyncChest.java b/src/main/java/com/progwml6/ironchest/common/network/packets/PacketTopStackSyncChest.java similarity index 94% rename from src/main/java/cpw/mods/ironchest/common/network/packets/PacketTopStackSyncChest.java rename to src/main/java/com/progwml6/ironchest/common/network/packets/PacketTopStackSyncChest.java index 0240348..395e1b4 100644 --- a/src/main/java/cpw/mods/ironchest/common/network/packets/PacketTopStackSyncChest.java +++ b/src/main/java/com/progwml6/ironchest/common/network/packets/PacketTopStackSyncChest.java @@ -8,10 +8,10 @@ * Contributors: * cpw - initial API and implementation ******************************************************************************/ -package cpw.mods.ironchest.common.network.packets; +package com.progwml6.ironchest.common.network.packets; -import cpw.mods.ironchest.IronChest; -import cpw.mods.ironchest.common.tileentity.TileEntityCrystalChest; +import com.progwml6.ironchest.common.tileentity.TileEntityCrystalChest; +import com.progwml6.ironchest.IronChest; import net.minecraft.item.ItemStack; import net.minecraft.network.PacketBuffer; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/cpw/mods/ironchest/common/tileentity/IronChestEntityType.java b/src/main/java/com/progwml6/ironchest/common/tileentity/IronChestEntityType.java similarity index 86% rename from src/main/java/cpw/mods/ironchest/common/tileentity/IronChestEntityType.java rename to src/main/java/com/progwml6/ironchest/common/tileentity/IronChestEntityType.java index 89e30da..380d5f4 100644 --- a/src/main/java/cpw/mods/ironchest/common/tileentity/IronChestEntityType.java +++ b/src/main/java/com/progwml6/ironchest/common/tileentity/IronChestEntityType.java @@ -8,20 +8,18 @@ * Contributors: * cpw - initial API and implementation ******************************************************************************/ -package cpw.mods.ironchest.common.tileentity; +package com.progwml6.ironchest.common.tileentity; import com.mojang.datafixers.DataFixUtils; import com.mojang.datafixers.types.Type; -import cpw.mods.ironchest.IronChest; -import cpw.mods.ironchest.common.util.TileEntityNames; -import net.minecraft.entity.Entity; +import com.progwml6.ironchest.common.util.TileEntityNames; +import com.progwml6.ironchest.IronChest; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.ResourceLocation; import net.minecraft.util.SharedConstants; import net.minecraft.util.datafix.DataFixesManager; import net.minecraft.util.datafix.TypeReferences; -import net.minecraftforge.event.AttachCapabilitiesEvent; import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; @@ -66,22 +64,14 @@ public class IronChestEntityType @SubscribeEvent public static void onTileEntityRegistry(final RegistryEvent.Register> e) { - registerTileEntityType(e.getRegistry(), register("iron_chest", TileEntityType.Builder.create(TileEntityIronChest::new)), - TileEntityNames.IRON_CHEST); - registerTileEntityType(e.getRegistry(), register("gold_chest", TileEntityType.Builder.create(TileEntityGoldChest::new)), - TileEntityNames.GOLD_CHEST); - registerTileEntityType(e.getRegistry(), register("diamond_chest", TileEntityType.Builder.create(TileEntityDiamondChest::new)), - TileEntityNames.DIAMOND_CHEST); - registerTileEntityType(e.getRegistry(), register("crystal_chest", TileEntityType.Builder.create(TileEntityCrystalChest::new)), - TileEntityNames.CRYSTAL_CHEST); - registerTileEntityType(e.getRegistry(), register("dirt_chest", TileEntityType.Builder.create(TileEntityDirtChest::new)), - TileEntityNames.DIRT_CHEST); - registerTileEntityType(e.getRegistry(), register("copper_chest", TileEntityType.Builder.create(TileEntityCopperChest::new)), - TileEntityNames.COPPER_CHEST); - registerTileEntityType(e.getRegistry(), register("silver_chest", TileEntityType.Builder.create(TileEntitySilverChest::new)), - TileEntityNames.SILVER_CHEST); - registerTileEntityType(e.getRegistry(), register("obsidian_chest", TileEntityType.Builder.create(TileEntityObsidianChest::new)), - TileEntityNames.OBSIDIAN_CHEST); + registerTileEntityType(e.getRegistry(), register("iron_chest", TileEntityType.Builder.create(TileEntityIronChest::new)), TileEntityNames.IRON_CHEST); + registerTileEntityType(e.getRegistry(), register("gold_chest", TileEntityType.Builder.create(TileEntityGoldChest::new)), TileEntityNames.GOLD_CHEST); + registerTileEntityType(e.getRegistry(), register("diamond_chest", TileEntityType.Builder.create(TileEntityDiamondChest::new)), TileEntityNames.DIAMOND_CHEST); + registerTileEntityType(e.getRegistry(), register("crystal_chest", TileEntityType.Builder.create(TileEntityCrystalChest::new)), TileEntityNames.CRYSTAL_CHEST); + registerTileEntityType(e.getRegistry(), register("dirt_chest", TileEntityType.Builder.create(TileEntityDirtChest::new)), TileEntityNames.DIRT_CHEST); + registerTileEntityType(e.getRegistry(), register("copper_chest", TileEntityType.Builder.create(TileEntityCopperChest::new)), TileEntityNames.COPPER_CHEST); + registerTileEntityType(e.getRegistry(), register("silver_chest", TileEntityType.Builder.create(TileEntitySilverChest::new)), TileEntityNames.SILVER_CHEST); + registerTileEntityType(e.getRegistry(), register("obsidian_chest", TileEntityType.Builder.create(TileEntityObsidianChest::new)), TileEntityNames.OBSIDIAN_CHEST); } } diff --git a/src/main/java/cpw/mods/ironchest/common/tileentity/TileEntityCopperChest.java b/src/main/java/com/progwml6/ironchest/common/tileentity/TileEntityCopperChest.java similarity index 68% rename from src/main/java/cpw/mods/ironchest/common/tileentity/TileEntityCopperChest.java rename to src/main/java/com/progwml6/ironchest/common/tileentity/TileEntityCopperChest.java index 59bc6b0..72c6336 100644 --- a/src/main/java/cpw/mods/ironchest/common/tileentity/TileEntityCopperChest.java +++ b/src/main/java/com/progwml6/ironchest/common/tileentity/TileEntityCopperChest.java @@ -8,10 +8,11 @@ * Contributors: * cpw - initial API and implementation ******************************************************************************/ -package cpw.mods.ironchest.common.tileentity; +package com.progwml6.ironchest.common.tileentity; -import cpw.mods.ironchest.common.blocks.IronChestType; -import cpw.mods.ironchest.common.core.IronChestBlocks; +import com.progwml6.ironchest.client.gui.GUIChest; +import com.progwml6.ironchest.common.blocks.IronChestType; +import com.progwml6.ironchest.common.core.IronChestBlocks; public class TileEntityCopperChest extends TileEntityIronChest { @@ -19,4 +20,10 @@ public class TileEntityCopperChest extends TileEntityIronChest { super(IronChestEntityType.COPPER_CHEST, IronChestType.COPPER, IronChestBlocks.copperChestBlock); } + + @Override + public String getGuiID() + { + return GUIChest.GUI.COPPER.getGuiId().toString(); + } } diff --git a/src/main/java/cpw/mods/ironchest/common/tileentity/TileEntityCrystalChest.java b/src/main/java/com/progwml6/ironchest/common/tileentity/TileEntityCrystalChest.java similarity index 86% rename from src/main/java/cpw/mods/ironchest/common/tileentity/TileEntityCrystalChest.java rename to src/main/java/com/progwml6/ironchest/common/tileentity/TileEntityCrystalChest.java index 441a0a1..454ebb3 100644 --- a/src/main/java/cpw/mods/ironchest/common/tileentity/TileEntityCrystalChest.java +++ b/src/main/java/com/progwml6/ironchest/common/tileentity/TileEntityCrystalChest.java @@ -8,12 +8,13 @@ * Contributors: * cpw - initial API and implementation ******************************************************************************/ -package cpw.mods.ironchest.common.tileentity; +package com.progwml6.ironchest.common.tileentity; -import cpw.mods.ironchest.common.blocks.IronChestType; -import cpw.mods.ironchest.common.core.IronChestBlocks; -import cpw.mods.ironchest.common.network.PacketHandler; -import cpw.mods.ironchest.common.network.packets.PacketTopStackSyncChest; +import com.progwml6.ironchest.client.gui.GUIChest; +import com.progwml6.ironchest.common.blocks.IronChestType; +import com.progwml6.ironchest.common.core.IronChestBlocks; +import com.progwml6.ironchest.common.network.PacketHandler; +import com.progwml6.ironchest.common.network.packets.PacketTopStackSyncChest; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; @@ -22,7 +23,6 @@ import net.minecraft.util.NonNullList; import net.minecraftforge.fml.server.ServerLifecycleHooks; import java.util.Collections; -import java.util.Comparator; public class TileEntityCrystalChest extends TileEntityIronChest { @@ -141,23 +141,18 @@ public class TileEntityCrystalChest extends TileEntityIronChest this.hadStuff = true; - Collections.sort(tempCopy, new Comparator() - { - @Override - public int compare(ItemStack stack1, ItemStack stack2) + Collections.sort(tempCopy, (stack1, stack2) -> { + if (stack1.isEmpty()) { - if (stack1.isEmpty()) - { - return 1; - } - else if (stack2.isEmpty()) - { - return -1; - } - else - { - return stack2.getCount() - stack1.getCount(); - } + return 1; + } + else if (stack2.isEmpty()) + { + return -1; + } + else + { + return stack2.getCount() - stack1.getCount(); } }); @@ -227,7 +222,7 @@ public class TileEntityCrystalChest extends TileEntityIronChest for (EntityPlayerMP player : ServerLifecycleHooks.getCurrentServer().getPlayerList().getPlayers()) { - if (player.dimension == world.getDimension().getId()) + if (player.dimension == world.getDimension().getType()) { double d4 = getPos().getX() - player.posX; double d5 = getPos().getY() - player.posY; @@ -235,7 +230,7 @@ public class TileEntityCrystalChest extends TileEntityIronChest if (d4 * d4 + d5 * d5 + d6 * d6 < 16384) { - PacketHandler.sendTo(new PacketTopStackSyncChest(this.getWorld().getDimension().getId(), this.getPos(), stacks), player); + PacketHandler.sendTo(new PacketTopStackSyncChest(this.getWorld().getDimension().getType().getId(), this.getPos(), stacks), player); } } } @@ -245,4 +240,10 @@ public class TileEntityCrystalChest extends TileEntityIronChest { this.topStacks = topStacks; } + + @Override + public String getGuiID() + { + return GUIChest.GUI.CRYSTAL.getGuiId().toString(); + } } diff --git a/src/main/java/cpw/mods/ironchest/common/tileentity/TileEntityDiamondChest.java b/src/main/java/com/progwml6/ironchest/common/tileentity/TileEntityDiamondChest.java similarity index 68% rename from src/main/java/cpw/mods/ironchest/common/tileentity/TileEntityDiamondChest.java rename to src/main/java/com/progwml6/ironchest/common/tileentity/TileEntityDiamondChest.java index 75fadc0..564f0d6 100644 --- a/src/main/java/cpw/mods/ironchest/common/tileentity/TileEntityDiamondChest.java +++ b/src/main/java/com/progwml6/ironchest/common/tileentity/TileEntityDiamondChest.java @@ -8,10 +8,11 @@ * Contributors: * cpw - initial API and implementation ******************************************************************************/ -package cpw.mods.ironchest.common.tileentity; +package com.progwml6.ironchest.common.tileentity; -import cpw.mods.ironchest.common.blocks.IronChestType; -import cpw.mods.ironchest.common.core.IronChestBlocks; +import com.progwml6.ironchest.client.gui.GUIChest; +import com.progwml6.ironchest.common.blocks.IronChestType; +import com.progwml6.ironchest.common.core.IronChestBlocks; public class TileEntityDiamondChest extends TileEntityIronChest { @@ -19,4 +20,10 @@ public class TileEntityDiamondChest extends TileEntityIronChest { super(IronChestEntityType.DIAMOND_CHEST, IronChestType.DIAMOND, IronChestBlocks.diamondChestBlock); } + + @Override + public String getGuiID() + { + return GUIChest.GUI.DIAMOND.getGuiId().toString(); + } } diff --git a/src/main/java/cpw/mods/ironchest/common/tileentity/TileEntityDirtChest.java b/src/main/java/com/progwml6/ironchest/common/tileentity/TileEntityDirtChest.java similarity index 76% rename from src/main/java/cpw/mods/ironchest/common/tileentity/TileEntityDirtChest.java rename to src/main/java/com/progwml6/ironchest/common/tileentity/TileEntityDirtChest.java index 19efa5f..31ceab4 100644 --- a/src/main/java/cpw/mods/ironchest/common/tileentity/TileEntityDirtChest.java +++ b/src/main/java/com/progwml6/ironchest/common/tileentity/TileEntityDirtChest.java @@ -8,10 +8,11 @@ * Contributors: * cpw - initial API and implementation ******************************************************************************/ -package cpw.mods.ironchest.common.tileentity; +package com.progwml6.ironchest.common.tileentity; -import cpw.mods.ironchest.common.blocks.IronChestType; -import cpw.mods.ironchest.common.core.IronChestBlocks; +import com.progwml6.ironchest.client.gui.GUIChest; +import com.progwml6.ironchest.common.blocks.IronChestType; +import com.progwml6.ironchest.common.core.IronChestBlocks; import net.minecraft.client.resources.I18n; import net.minecraft.entity.EntityLivingBase; import net.minecraft.init.Items; @@ -19,7 +20,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagList; import net.minecraft.nbt.NBTTagString; import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TextComponentString; +import net.minecraft.util.text.TextComponentTranslation; public class TileEntityDirtChest extends TileEntityIronChest { @@ -62,14 +63,20 @@ public class TileEntityDirtChest extends TileEntityIronChest dirtChest9000GuideBook.setTagInfo("title", new NBTTagString(I18n.format("book.ironchest.dirtchest9000.title"))); NBTTagList pages = new NBTTagList(); - pages.add(new NBTTagString(ITextComponent.Serializer.toJson(new TextComponentString(I18n.format("book.ironchest.dirtchest9000.page1"))))); - pages.add(new NBTTagString(ITextComponent.Serializer.toJson(new TextComponentString(I18n.format("book.ironchest.dirtchest9000.page2"))))); - pages.add(new NBTTagString(ITextComponent.Serializer.toJson(new TextComponentString(I18n.format("book.ironchest.dirtchest9000.page3"))))); - pages.add(new NBTTagString(ITextComponent.Serializer.toJson(new TextComponentString(I18n.format("book.ironchest.dirtchest9000.page4"))))); - pages.add(new NBTTagString(ITextComponent.Serializer.toJson(new TextComponentString(I18n.format("book.ironchest.dirtchest9000.page5"))))); + pages.add(new NBTTagString(ITextComponent.Serializer.toJson(new TextComponentTranslation("book.ironchest.dirtchest9000.page1")))); + pages.add(new NBTTagString(ITextComponent.Serializer.toJson(new TextComponentTranslation("book.ironchest.dirtchest9000.page2")))); + pages.add(new NBTTagString(ITextComponent.Serializer.toJson(new TextComponentTranslation("book.ironchest.dirtchest9000.page3")))); + pages.add(new NBTTagString(ITextComponent.Serializer.toJson(new TextComponentTranslation("book.ironchest.dirtchest9000.page4")))); + pages.add(new NBTTagString(ITextComponent.Serializer.toJson(new TextComponentTranslation("book.ironchest.dirtchest9000.page5")))); dirtChest9000GuideBook.setTagInfo("pages", pages); bookDataCreated = true; } + + @Override + public String getGuiID() + { + return GUIChest.GUI.DIRTCHEST9000.getGuiId().toString(); + } } diff --git a/src/main/java/cpw/mods/ironchest/common/tileentity/TileEntityGoldChest.java b/src/main/java/com/progwml6/ironchest/common/tileentity/TileEntityGoldChest.java similarity index 67% rename from src/main/java/cpw/mods/ironchest/common/tileentity/TileEntityGoldChest.java rename to src/main/java/com/progwml6/ironchest/common/tileentity/TileEntityGoldChest.java index 805abc1..dfe597f 100644 --- a/src/main/java/cpw/mods/ironchest/common/tileentity/TileEntityGoldChest.java +++ b/src/main/java/com/progwml6/ironchest/common/tileentity/TileEntityGoldChest.java @@ -8,10 +8,11 @@ * Contributors: * cpw - initial API and implementation ******************************************************************************/ -package cpw.mods.ironchest.common.tileentity; +package com.progwml6.ironchest.common.tileentity; -import cpw.mods.ironchest.common.blocks.IronChestType; -import cpw.mods.ironchest.common.core.IronChestBlocks; +import com.progwml6.ironchest.client.gui.GUIChest; +import com.progwml6.ironchest.common.blocks.IronChestType; +import com.progwml6.ironchest.common.core.IronChestBlocks; public class TileEntityGoldChest extends TileEntityIronChest { @@ -19,4 +20,10 @@ public class TileEntityGoldChest extends TileEntityIronChest { super(IronChestEntityType.GOLD_CHEST, IronChestType.GOLD, IronChestBlocks.goldChestBlock); } + + @Override + public String getGuiID() + { + return GUIChest.GUI.GOLD.getGuiId().toString(); + } } diff --git a/src/main/java/cpw/mods/ironchest/common/tileentity/TileEntityIronChest.java b/src/main/java/com/progwml6/ironchest/common/tileentity/TileEntityIronChest.java similarity index 96% rename from src/main/java/cpw/mods/ironchest/common/tileentity/TileEntityIronChest.java rename to src/main/java/com/progwml6/ironchest/common/tileentity/TileEntityIronChest.java index 14017fb..73d6c3c 100644 --- a/src/main/java/cpw/mods/ironchest/common/tileentity/TileEntityIronChest.java +++ b/src/main/java/com/progwml6/ironchest/common/tileentity/TileEntityIronChest.java @@ -8,12 +8,13 @@ * Contributors: * cpw - initial API and implementation ******************************************************************************/ -package cpw.mods.ironchest.common.tileentity; +package com.progwml6.ironchest.common.tileentity; -import cpw.mods.ironchest.common.blocks.BlockChest; -import cpw.mods.ironchest.common.blocks.IronChestType; -import cpw.mods.ironchest.common.core.IronChestBlocks; -import cpw.mods.ironchest.common.gui.ContainerIronChest; +import com.progwml6.ironchest.client.gui.GUIChest; +import com.progwml6.ironchest.common.blocks.BlockChest; +import com.progwml6.ironchest.common.blocks.IronChestType; +import com.progwml6.ironchest.common.core.IronChestBlocks; +import com.progwml6.ironchest.common.gui.ContainerIronChest; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; @@ -322,7 +323,7 @@ public class TileEntityIronChest extends TileEntityLockableLoot implements IChes @Override public String getGuiID() { - return "IronChest:" + this.getIronChestType().name() + "_chest"; + return GUIChest.GUI.IRON.getGuiId().toString(); } @Override diff --git a/src/main/java/cpw/mods/ironchest/common/tileentity/TileEntityObsidianChest.java b/src/main/java/com/progwml6/ironchest/common/tileentity/TileEntityObsidianChest.java similarity index 68% rename from src/main/java/cpw/mods/ironchest/common/tileentity/TileEntityObsidianChest.java rename to src/main/java/com/progwml6/ironchest/common/tileentity/TileEntityObsidianChest.java index e50b8a3..7c41e98 100644 --- a/src/main/java/cpw/mods/ironchest/common/tileentity/TileEntityObsidianChest.java +++ b/src/main/java/com/progwml6/ironchest/common/tileentity/TileEntityObsidianChest.java @@ -8,10 +8,11 @@ * Contributors: * cpw - initial API and implementation ******************************************************************************/ -package cpw.mods.ironchest.common.tileentity; +package com.progwml6.ironchest.common.tileentity; -import cpw.mods.ironchest.common.blocks.IronChestType; -import cpw.mods.ironchest.common.core.IronChestBlocks; +import com.progwml6.ironchest.client.gui.GUIChest; +import com.progwml6.ironchest.common.blocks.IronChestType; +import com.progwml6.ironchest.common.core.IronChestBlocks; public class TileEntityObsidianChest extends TileEntityIronChest { @@ -19,4 +20,10 @@ public class TileEntityObsidianChest extends TileEntityIronChest { super(IronChestEntityType.OBSIDIAN_CHEST, IronChestType.OBSIDIAN, IronChestBlocks.obsidianChestBlock); } + + @Override + public String getGuiID() + { + return GUIChest.GUI.OBSIDIAN.getGuiId().toString(); + } } diff --git a/src/main/java/cpw/mods/ironchest/common/tileentity/TileEntitySilverChest.java b/src/main/java/com/progwml6/ironchest/common/tileentity/TileEntitySilverChest.java similarity index 68% rename from src/main/java/cpw/mods/ironchest/common/tileentity/TileEntitySilverChest.java rename to src/main/java/com/progwml6/ironchest/common/tileentity/TileEntitySilverChest.java index 5980103..3704401 100644 --- a/src/main/java/cpw/mods/ironchest/common/tileentity/TileEntitySilverChest.java +++ b/src/main/java/com/progwml6/ironchest/common/tileentity/TileEntitySilverChest.java @@ -8,10 +8,11 @@ * Contributors: * cpw - initial API and implementation ******************************************************************************/ -package cpw.mods.ironchest.common.tileentity; +package com.progwml6.ironchest.common.tileentity; -import cpw.mods.ironchest.common.blocks.IronChestType; -import cpw.mods.ironchest.common.core.IronChestBlocks; +import com.progwml6.ironchest.client.gui.GUIChest; +import com.progwml6.ironchest.common.blocks.IronChestType; +import com.progwml6.ironchest.common.core.IronChestBlocks; public class TileEntitySilverChest extends TileEntityIronChest { @@ -19,4 +20,10 @@ public class TileEntitySilverChest extends TileEntityIronChest { super(IronChestEntityType.SILVER_CHEST, IronChestType.SILVER, IronChestBlocks.silverChestBlock); } + + @Override + public String getGuiID() + { + return GUIChest.GUI.SILVER.getGuiId().toString(); + } } diff --git a/src/main/java/cpw/mods/ironchest/common/util/BlockNames.java b/src/main/java/com/progwml6/ironchest/common/util/BlockNames.java similarity index 93% rename from src/main/java/cpw/mods/ironchest/common/util/BlockNames.java rename to src/main/java/com/progwml6/ironchest/common/util/BlockNames.java index 4b51f55..1c8cca8 100644 --- a/src/main/java/cpw/mods/ironchest/common/util/BlockNames.java +++ b/src/main/java/com/progwml6/ironchest/common/util/BlockNames.java @@ -8,9 +8,9 @@ * Contributors: * cpw - initial API and implementation ******************************************************************************/ -package cpw.mods.ironchest.common.util; +package com.progwml6.ironchest.common.util; -import cpw.mods.ironchest.IronChest; +import com.progwml6.ironchest.IronChest; public class BlockNames { diff --git a/src/main/java/cpw/mods/ironchest/common/util/ItemNames.java b/src/main/java/com/progwml6/ironchest/common/util/ItemNames.java similarity index 94% rename from src/main/java/cpw/mods/ironchest/common/util/ItemNames.java rename to src/main/java/com/progwml6/ironchest/common/util/ItemNames.java index fad0ef7..e79b7ee 100644 --- a/src/main/java/cpw/mods/ironchest/common/util/ItemNames.java +++ b/src/main/java/com/progwml6/ironchest/common/util/ItemNames.java @@ -8,9 +8,9 @@ * Contributors: * cpw - initial API and implementation ******************************************************************************/ -package cpw.mods.ironchest.common.util; +package com.progwml6.ironchest.common.util; -import cpw.mods.ironchest.IronChest; +import com.progwml6.ironchest.IronChest; public class ItemNames { diff --git a/src/main/java/cpw/mods/ironchest/common/util/TileEntityNames.java b/src/main/java/com/progwml6/ironchest/common/util/TileEntityNames.java similarity index 93% rename from src/main/java/cpw/mods/ironchest/common/util/TileEntityNames.java rename to src/main/java/com/progwml6/ironchest/common/util/TileEntityNames.java index f0dc9ef..4717b10 100644 --- a/src/main/java/cpw/mods/ironchest/common/util/TileEntityNames.java +++ b/src/main/java/com/progwml6/ironchest/common/util/TileEntityNames.java @@ -8,9 +8,9 @@ * Contributors: * cpw - initial API and implementation ******************************************************************************/ -package cpw.mods.ironchest.common.util; +package com.progwml6.ironchest.common.util; -import cpw.mods.ironchest.IronChest; +import com.progwml6.ironchest.IronChest; public class TileEntityNames { diff --git a/src/main/java/cpw/mods/ironchest/IronChest.java b/src/main/java/cpw/mods/ironchest/IronChest.java deleted file mode 100644 index 1349b84..0000000 --- a/src/main/java/cpw/mods/ironchest/IronChest.java +++ /dev/null @@ -1,93 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2012 cpw. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/gpl.html - *

- * Contributors: - * cpw - initial API and implementation - ******************************************************************************/ -package cpw.mods.ironchest; - -import cpw.mods.ironchest.client.ClientProxy; -import cpw.mods.ironchest.common.ServerProxy; -import cpw.mods.ironchest.common.ai.OcelotsSitOnChestsHandler; -import cpw.mods.ironchest.common.blocks.BlockChest; -import cpw.mods.ironchest.common.network.PacketHandler; -import cpw.mods.ironchest.common.util.BlockNames; -import net.minecraft.block.Block; -import net.minecraft.block.state.IBlockState; -import net.minecraft.util.EnumFacing; -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.javafmlmod.FMLModLoadingContext; - -@Mod(value = IronChest.MOD_ID) -public class IronChest -{ - public static final String MOD_ID = "ironchest"; - - private static final boolean DEBUG = false; - - public static IronChest instance; - - public static ServerProxy proxy = DistExecutor.runForDist(() -> ClientProxy::new, () -> ServerProxy::new); - - public IronChest() - { - instance = this; - FMLModLoadingContext.get().getModEventBus().addListener(this::preInit); - MinecraftForge.EVENT_BUS.register(new OcelotsSitOnChestsHandler()); - } - - private void preInit(final FMLCommonSetupEvent event) - { - proxy.preInit(); - - if (IronChest.DEBUG) - { - debugPrints(); - } - - PacketHandler.register(); - } - - private void debugPrints() - { - EnumFacing[] e = { EnumFacing.NORTH, EnumFacing.EAST, EnumFacing.SOUTH, EnumFacing.WEST }; - - System.out.println("--------------------------"); - - for (EnumFacing facing : e) - { - IBlockState iBlockState = Block.func_149684_b(BlockNames.IRON_CHEST).getDefaultState().with(BlockChest.FACING, facing); - - System.out.println("iBlockState " + iBlockState); - - int stateID = Block.getStateId(iBlockState); - - System.out.println("stateID " + stateID); - - IBlockState iBlockStateOut = Block.getStateById(stateID); - - System.out.println("iBlockStateOut " + iBlockStateOut); - - Block blockOut = Block.func_149729_e(stateID); - - System.out.println("blockOut " + blockOut); - - System.out.println("--------------------------"); - } - - System.out.println("--------------------------"); - - for (Object i : Block.BLOCK_STATE_IDS) - { - System.out.println("Test: " + i); - } - System.out.println("--------------------------"); - } -} diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index 47e7a23..73eb1ec 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -1,7 +1,6 @@ modLoader="javafml" loaderVersion="[24,)" -issueTrackerURL="https://github.com/progwml6/ironchest/issues" -displayURL="https://minecraft.curseforge.com/projects/iron-chests" + [[mods]] modId="ironchest" @@ -9,10 +8,12 @@ displayURL="https://minecraft.curseforge.com/projects/iron-chests" displayName="Iron Chests" authors="cpw, alexbegt, progwml6" description=''' - New chests with larger sizes, with in-place upgrade items. - The feature chest is the crystal chest, which is transparent - some inventory contents are visible without opening the chest +New chests with larger sizes, with in-place upgrade items. +The feature chest is the crystal chest, which is transparent - some inventory contents are visible without opening the chest ''' namespace="ironchest" + issueTrackerURL="https://github.com/progwml6/ironchest/issues" + displayURL="https://minecraft.curseforge.com/projects/iron-chests" [[dependencies.ironchest]] modId="forge" mandatory=true diff --git a/src/main/resources/assets/ironchest/textures/gui/copper_container.png b/src/main/resources/assets/ironchest/textures/gui/copper_container.png index 9838b5185bd3614ec54cc3a578c0ccc8857618f5..2fdb824efcb80fa10626b46874f548ffd7e92fcf 100644 GIT binary patch literal 3677 zcmc(hXHe8lw#NS>X~-D_93%-ilB48dh8!hHmdt>NM2UifWZ@-91_wcfAxn^fAt*_r zWQju%h9DsDN)VK^xV!h=y1Vzo{cx*pcXjotQ`P4@&#$YiI{uD(QaaU)9J)<7tSynwbQGs6La(y#1SPWp%R&mgs7fT zOp~o}zeM7jiM@rbJBl_?CI)W zS`mRoQ1E#Jbl^H?Zoe~L5O5r>sCbK~jqE)D3L2*b18w?wZDQAAFK9R6IW{0v6sXNV z^|me;#RR}YlHkPvOap{MXY-o?1;l{;fRiHuxFZbM3p`mH2Td_mqH+KxjXiV4@3*Sx)}fcAa%vTEd~)g$)?i^DGIMhgPQf8<)>}+64p$ss z>)25Wq$tnxS2uQu-R@BqJUU8nt)+$40|gti=KJ2i*{Bz$;AUo4S5~HVy5QCh{pMlk z$PT+U^Rov(!xc}D4!^u#=8KT9jnE`M{?hU3K(FZ9@N@Dg$GNp+&C>?Ti&MxrPnWhM z&H~CrFkr^Y8@+Fz&A0|o%Kf(U4}D#tkp9G_Y6CV^RVqK~=TwTKxK__+Gwn2dOIQ>C@U zjh~rvnQ1}xlzgwq#oA~zr7H9S5>HQKS~SJeBWjJ5K2y~ra3!+rQ5vr(N1Xk|bCX#L z@Tlk9pRCeqyruemKmp5`=A!&5<3-pyWpw}PlS z{?KW-CXkpRLcNV#hBy$;<-n<`Wua$bFs)U>b&XGoewJL8oG8kuLx3l(ME4zk6aCMw ztBw-lu@+iFyps&cjG}a*afmKiK8ARNga9t(igwK#(=moIjj@NuycQX0LON z=SvDr>7|pc;FX0~fb~^pTTL6HDW$C zu%Y=i>nqVgAQg2Cb7W5(Qjjh0D%n*eTj15V*?Prn;|Xj%red<`7^MTSlWe+CCs)U>p$xNM<}(rn*sz%;q^o=I4hhMA-Zp_Ke{X1Q4z`p%XKhY7M& zp(M5pS>k1?@+RE!ES}V|Q?Jty@y4j2#*Wa^%|+?NRu?41?Ll20^C&{Pi@#=Y=5YYD zIr|LKoS;-zS}2E*)R8o=Gu}^kRUso}`y9XUHy~dZ#ANM z`*=2z-m)Egf zf`7Xsv*W%KJNNRF)XSUsmXdxWoxO-JMysPLlrJ;HJQgd$4H1SB$oh3&Q76$<^UA5} zhN8f-BZpm9i-;$@7tR+U7oz|MbpwPX zijPo@u)cC~9P*g^Lz0R--sMN_%(iM`0Zx@!HTh}f)7AD$ZnxfVDV5wu>)Au8L+&)u zcf!9;j*vO5IV5z3Qwc=JMw`c|BzebKu#bvoNe7P3A^aBAeyL@uE#x7^4dvbn>qtYD z%S7%g&dN4PHK}xqxLSUius~aAKhV7@s?pk`T(8E!u1A9b7on zaS)ARDHUN5lFx+c#TndA|5KF?TEdceV~;WLMiNDE2c!eZBRVQG8aIuwfpQw`X+iZv zo_|Yikq+kjC|M-5ii;8`O=;1i)|=0h&u7UE;PRAEl5Z7{e4d)(125y&Ps1WNk!!92 z0~IdOwdWrnCNzk0W{~xH)TLCASPD~M;l*D~tpul_WVJ{abJq`p@%?g{<@vV;w?EbO z<5Of`?7qC%X6Rs8dX6oM(KQ!_Sgf^H+?T6W^a;jO5SU4B#oQ&WP;7jLg?dgHmT#M9 zRfV_mhv<7m+-vWD+FlRx*rGI}Sd9+bnw#3THM9`5T&#Ea6@%tbW{!VW#e`?gVtz6$ zI2W|a5$o0eA!jcAU1@n2&Ux5%%ynaJK{(%czY7whw=(<3+Ou z1@X<1SOo6%2gSw~7fj#Kpn{6&8`A^RU#2oUWApV6Q^yZScQ`^@en@?rz+1N*ohkRd z$D4u7^e0>=Tu!u4>W);Z;>$LUGfzBiD-Aq-wtI-ih|b7(X|Pkc&l8X_B~#<%$y-~R zG(FefpQCpJg{ftz&Hi}Nz0B*a7QC`?M80^$Ni9DckQiFAL^ggs0D^>w-iPPzb#1GMYD<=f0J<^W5~`R6I``H|%MC(VSa_ zv+=;~gtXR&x*lzCO8emXxae%NZHw(KzPqEF z^L<~Cr1-sqyC>W2fpdY7-Pen>hAWS`o(NvJ{j51O8Nr;Sv8AP55EEtZpE^kj<1c@h zq>j3pYQV+sSu;1B0)O;tdUdzAWGI& zQ#B2m-JTnD-`8P^9?eN9`zG@_PBpBNuABxZwCWBf2L<~&zZtDKd_1EvEqlF|)4*Uc zlXyKPjQG*@&$UA5=W=})pXCzT5|mHB`^oGphQ6u{x^hg9THoI=DRe(NQ7TFwBYgjp z@6QfKlu9@q00U4DA5Wh4G~k6#X=yrBirs6S))y6~wkGU$I6;DTu&&!l?z#L50q3m* z+l-gMrSK~N7~uN1;IAB{q=`(73c=nZewsX6(X3|@i$nU@dr zv(has|AGFRlmJ@*{g3s)|LWo2c6oSkyBfk8@lC3Mz%ycC2&_`Zd4KOV@b6LQ+Wq~p zCkB2y`R~DBIr%RC0{bxp*IXH;e#kk3_98$Vs4yz>^aAZ&v;?_b*T0^t}dt z3J)&3T?%OgzZ++S{k+0s(^A7Y??d0K@E@)JDdxX)p=cVx&KMj7Yx0O5Y;~#TpBPU| zH*XY_w*@3s*99DB g)R%AT|6)`eU(w)BON6+#p8hVUt!|)J1-F0tH=0mC;s5{u literal 2600 zcmd^BeQeZZ81Ke_gUA>n$s$gg;wRE;d!M_q1IFFKF7dWyoY@eJl=i(_!(HFfcDs)7 zsU}7tOk?EuLli@zCM1BEurXwVAuNDwB9VZBAeq^Ma}II>lY#T?ePtNr>n{>7@1<|w z=lA@c?>Bv~vV6gW@lTJ(Fl>Uq%v*(FIcS@MnZ}^U66LE9dW@6H7O5DP|DEyA`S_Lm zsTel;88KL+)dXH;c^EZw0$c{ndQ?Ve3@e$V%N)NPX!tS^79}?^u)mGKMZrx}+XHk! z_JCTkY^4Ggt}GAoE0^;wftWKJFVR^<5Cs~C>(Pj$vbvi{^0H`e98(0IglNm%M5$pA zuL)G*9;g7^Zg!A7W3%8+mziAxO1B(m0)z)ae-pFHm_!lr<4bxWULR zgLRslK%S;Th{{=7Nlm8-C5+NJnPSYe5mFK;@L8N(r$my*1)c&C5CxK^A}o`|%C%5~ zYAyT^>a6$<11PnDK-R`xeThc1CREK=kHSbNdPZ^fS1#Nn=s@gV<9b;AY*44D{FC*w4J5t z6f^(@G1QQSx=?kIILNqIyN$Iw?tr4M5jc&zFIeE&5LBWZidl?uVL-`Jn834{WIZqf z6=WEBXB~O&_joE57!o5$pjIuIhx>gV2jg-$NQ;?Cx*G_veo56hi3fhKn?U(7i=x0< z9rj`nayiIiC*Vn|)5ei5L9mgWJ;d8Nj^^p&P)6Si`8uNuGWx

Q^WtnnEt}$UMeu z8tucDi7F~=Lwb4^f)(jqM8uOF!*aYa32uTnS^x+{`dEDA45VmdwE&Ucqc2i06^67J zr-0Hh%GQIl9)#M3M^h!IRBJ7>9x|SQr@xE%?11O7oOQVcFgndhjtfjdS};-*D3#Vf37b( z+wMI68Mw74Uw`66Z^fCPruFSA86N8XZSs-rHJd?En{VCl4cn@#iKU&riNeJHv+m#~|$%^>JJUy6;ara(b@r%F4o0^(n z+u;k6v;51Cie{}nkhppCW`EJ_^G~f~X0I95%C}u?JbhW{=zMcvuzE*AA9p{}ktUrN zMxE`iM-*#^w*LI};ng)q3;SAj@*7VKyPG%6t^b4T{n5AW@Fn_aVYgngsqT$9Y&$)+ zhxlOY$^K@Otuc%hyzsy)rA9X*UPn_m@k5C@_uRSjn>Nf%=wlwn=cHPGqS+*b)mi4; zliiPnJLk1Yro9J!+xi-^1#r6av?*sh-M=qs8UOvYC8PI#v#)64j^3+JV(obkyi#gC z`!3Jeohb-jy?$5k{~_oVQ?|U@J>$x?Z}ZmCIcWXz`KmQTU3H&!6rR{Kv+u7}*N?ru zrE37&9FNDR-JZMji|(t%M>{-H>y_RYYj1zpnA@`$^=$$+55f%<1zLm2bf0k>IT?@7 aei-W**nj=dtqRikmh=0{y*uYEed{0RAUX~J