diff --git a/README.md b/README.md index ff690c28e..fb362419c 100644 --- a/README.md +++ b/README.md @@ -9,8 +9,8 @@ For a 1.12 fork, check this link: https://github.com/Drillgon200/Hbm-s-Nuclear-T Tired of waiting until the next version comes out? Here is a tutorial on how to compile the very newest version yourself: 1. Download minecraft forge 1.7.10 src 2. Unpack it somewhere -3. Go to the new folder and run `gradlew setupDecompWorkspace` on windows or `./gradlew setupDecompWorkspace` on linux. This process will most likely display errors which is due to some dependencies being no longer available. Don't worry, the repository should have all the files you need. -4. Download the source and insert it into the same folder. This will overwrite a couple of files, for example build.gradle +3. Download the source and insert it into the same folder. This will overwrite a couple of files, for example build.gradle +4. Run `gradlew setupDecompWorkspace` on windows or `./gradlew setupDecompWorkspace` on linux (remember: do not take the name of root in vain). Running this command on a blank forge workspace will yield errors, so it's important you insert the mod's source in step 3. The source has corrected versions of guild.gradle and the gradle wrapper, if done correctly it should run just fine. 5. The `build.gradle` file will reference these following files: ``` compile files('lib/CodeChickenCore-1.7.10-1.0.4.29-dev.jar') @@ -18,10 +18,9 @@ compile files('lib/CodeChickenLib-1.7.10-1.1.3.140-dev.jar') compile files('lib/NotEnoughItems-1.7.10-1.0.3.74-dev.jar') ``` which means you need to do one of the following things: -1) Find these exact versions of the dependencies, download them and put them into a folder called `libs` in your project's root folder +1) Find these exact versions of the dependencies, download them and put them into a folder called `libs` in your project's root folder. You can download a zip containing all files here: https://bit.ly/3fBxMq0 2) Find other versions, change the `build.gradle` file to reflect this difference and fix any potential errors this could cause (unlikely but not impossible) 3) Remove these dependencies from `build.gradle` along with all the API code. Note that this will break NEI-integration. -I know that this approach is anything but desirable, but until I get around to fixing this, you can always ask me to send you the libraries. 7. Open up the CMD in the root directory and run `gradlew build` on windows or `./gradlew build` on linux 8. Head over to `build/libs` and get the jar (named modid.jar) 9. Open the jar file with an archieve manager of your choice and insert the mod's asset folder into the jar's main directory diff --git a/src/main/java/com/hbm/sound/AudioDynamic.java b/src/main/java/com/hbm/sound/AudioDynamic.java index 90f172e50..c3aa1adb8 100644 --- a/src/main/java/com/hbm/sound/AudioDynamic.java +++ b/src/main/java/com/hbm/sound/AudioDynamic.java @@ -1,10 +1,12 @@ package com.hbm.sound; +import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.Minecraft; import net.minecraft.client.audio.ISound; import net.minecraft.client.audio.MovingSound; +import net.minecraft.client.audio.PositionedSoundRecord; import net.minecraft.client.entity.EntityClientPlayerMP; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityBarrel.java b/src/main/java/com/hbm/tileentity/machine/TileEntityBarrel.java index 3e13e1d59..75a8cebe5 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityBarrel.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityBarrel.java @@ -74,13 +74,16 @@ public class TileEntityBarrel extends TileEntityMachineBase implements IFluidAcc //for when you fill corrosive liquid into an iron tank if(b == ModBlocks.barrel_iron && tank.getTankType().isCorrosive()) { - - BlockFluidBarrel.keepInventory = true; + ItemStack[] copy = this.slots.clone(); + this.slots = new ItemStack[6]; worldObj.setBlock(xCoord, yCoord, zCoord, ModBlocks.barrel_corroded); - worldObj.setTileEntity(xCoord, yCoord, zCoord, this); - this.validate(); + TileEntityBarrel barrel = (TileEntityBarrel)worldObj.getTileEntity(xCoord, yCoord, zCoord); - BlockFluidBarrel.keepInventory = false; + if(barrel != null) { + barrel.tank.setTankType(tank.getTankType()); + barrel.tank.setFill(Math.min(barrel.tank.getMaxFill(), tank.getFill())); + barrel.slots = copy; + } worldObj.playSoundEffect(xCoord + 0.5, yCoord + 0.5, zCoord + 0.5, "random.fizz", 1.0F, 1.0F); }