diff --git a/changelog b/changelog index 7e3253f27..3b69421f4 100644 --- a/changelog +++ b/changelog @@ -1,5 +1,6 @@ ## Changed * The bedrock ore processor now has an NEI handler +* Boilers and crucibles will only consume as much heat fom the source as they can actually accept instead of a fixed rate, preventing them from wasting excess heat ## Fixed * Fixed incorrect tooltip in the automatic control rod's GUI diff --git a/src/main/java/com/hbm/explosion/ExplosionChaos.java b/src/main/java/com/hbm/explosion/ExplosionChaos.java index e17620e64..19b7caabb 100644 --- a/src/main/java/com/hbm/explosion/ExplosionChaos.java +++ b/src/main/java/com/hbm/explosion/ExplosionChaos.java @@ -42,7 +42,7 @@ import net.minecraft.util.MathHelper; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -@Spaghetti("no") +@Spaghetti("my eyes are bleeding") public class ExplosionChaos { private final static Random random = new Random(); diff --git a/src/main/java/com/hbm/explosion/ExplosionNT.java b/src/main/java/com/hbm/explosion/ExplosionNT.java index 533823d5f..f7aef2c03 100644 --- a/src/main/java/com/hbm/explosion/ExplosionNT.java +++ b/src/main/java/com/hbm/explosion/ExplosionNT.java @@ -28,6 +28,7 @@ import net.minecraft.world.ChunkPosition; import net.minecraft.world.Explosion; import net.minecraft.world.World; +@Deprecated public class ExplosionNT extends Explosion { public Set atttributes = new HashSet(); diff --git a/src/main/java/com/hbm/main/ClientProxy.java b/src/main/java/com/hbm/main/ClientProxy.java index 0928957d3..04feaf810 100644 --- a/src/main/java/com/hbm/main/ClientProxy.java +++ b/src/main/java/com/hbm/main/ClientProxy.java @@ -51,7 +51,8 @@ import com.hbm.particle.*; import com.hbm.particle.helper.ParticleCreators; import com.hbm.particle.psys.engine.EventHandlerParticleEngine; - import com.hbm.render.anim.BusAnimation; +import com.hbm.qmaw.QMAWLoader; +import com.hbm.render.anim.BusAnimation; import com.hbm.render.anim.BusAnimationSequence; import com.hbm.render.anim.HbmAnimations; import com.hbm.render.anim.HbmAnimations.Animation; @@ -104,6 +105,7 @@ import com.hbm.tileentity.machine.oil.*; import net.minecraft.client.renderer.entity.RenderSnowball; import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; + import net.minecraft.client.resources.IReloadableResourceManager; import net.minecraft.client.resources.Language; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -155,6 +157,8 @@ public class ClientProxy extends ServerProxy { registerBlockRenderer(); Jars.initJars(); + + ((IReloadableResourceManager) Minecraft.getMinecraft().getResourceManager()).registerReloadListener(new QMAWLoader()); if(GeneralConfig.enableSoundExtension) { SoundSystemConfig.setNumberNormalChannels(GeneralConfig.normalSoundChannels); diff --git a/src/main/java/com/hbm/qmaw/GuiQMAW.java b/src/main/java/com/hbm/qmaw/GuiQMAW.java new file mode 100644 index 000000000..b579a846e --- /dev/null +++ b/src/main/java/com/hbm/qmaw/GuiQMAW.java @@ -0,0 +1,5 @@ +package com.hbm.qmaw; + +public class GuiQMAW { + +} diff --git a/src/main/java/com/hbm/qmaw/IManualElement.java b/src/main/java/com/hbm/qmaw/IManualElement.java new file mode 100644 index 000000000..e981ad87a --- /dev/null +++ b/src/main/java/com/hbm/qmaw/IManualElement.java @@ -0,0 +1,9 @@ +package com.hbm.qmaw; + +public interface IManualElement { + + public int getWidth(); + public int getHeight(); + public void render(boolean isMouseOver, int mouseX, int mouseY); + public void onClick(); +} diff --git a/src/main/java/com/hbm/qmaw/QMAWLoader.java b/src/main/java/com/hbm/qmaw/QMAWLoader.java new file mode 100644 index 000000000..839849f58 --- /dev/null +++ b/src/main/java/com/hbm/qmaw/QMAWLoader.java @@ -0,0 +1,29 @@ +package com.hbm.qmaw; + +import java.util.HashMap; + +import com.google.gson.Gson; +import com.hbm.main.MainRegistry; + +import net.minecraft.client.resources.IResourceManager; +import net.minecraft.client.resources.IResourceManagerReloadListener; + +public class QMAWLoader implements IResourceManagerReloadListener { + + public static final Gson gson = new Gson(); + public static HashMap qmaw = new HashMap(); + + @Override + public void onResourceManagerReload(IResourceManager resMan) { + MainRegistry.logger.info("[QMAW] Reloading manual..."); + init(); + MainRegistry.logger.info("[QMAW] Loaded " + qmaw.size() + " manual entries!"); + } + + /** Searches the asset folder for QMAW format JSON files and adds entries based on that */ + public static void init() { + qmaw.clear(); + + //dynamic file discovery over all resource domains inside the fucking jar is fucking hard + } +} diff --git a/src/main/java/com/hbm/qmaw/QuickManualAndWiki.java b/src/main/java/com/hbm/qmaw/QuickManualAndWiki.java new file mode 100644 index 000000000..7f206bad6 --- /dev/null +++ b/src/main/java/com/hbm/qmaw/QuickManualAndWiki.java @@ -0,0 +1,5 @@ +package com.hbm.qmaw; + +public class QuickManualAndWiki { + +} diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityCrucible.java b/src/main/java/com/hbm/tileentity/machine/TileEntityCrucible.java index fd3f5248d..7126ccdf3 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityCrucible.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityCrucible.java @@ -322,6 +322,8 @@ public class TileEntityCrucible extends TileEntityMachineBase implements IGUIPro if(diff == 0) { return; } + + diff = Math.min(diff, this.maxHeat - this.heat); if(diff > 0) { diff = (int) Math.ceil(diff * diffusion); diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityHeatBoiler.java b/src/main/java/com/hbm/tileentity/machine/TileEntityHeatBoiler.java index e6aef59a0..d87386a25 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityHeatBoiler.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityHeatBoiler.java @@ -177,6 +177,8 @@ public class TileEntityHeatBoiler extends TileEntityLoadedBase implements IBufPa if(diff == 0) { return; } + + diff = Math.min(diff, this.maxHeat - this.heat); if(diff > 0) { diff = (int) Math.ceil(diff * diffusion); diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityHeatBoilerIndustrial.java b/src/main/java/com/hbm/tileentity/machine/TileEntityHeatBoilerIndustrial.java index 21d273973..418c8164e 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityHeatBoilerIndustrial.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityHeatBoilerIndustrial.java @@ -163,6 +163,8 @@ public class TileEntityHeatBoilerIndustrial extends TileEntityLoadedBase impleme if(diff == 0) { return; } + + diff = Math.min(diff, this.maxHeat - this.heat); if(diff > 0) { diff = (int) Math.ceil(diff * diffusion); diff --git a/src/main/resources/assets/hbm/manual/demo.json b/src/main/resources/assets/hbm/manual/demo.json new file mode 100644 index 000000000..cb65f7fb9 --- /dev/null +++ b/src/main/resources/assets/hbm/manual/demo.json @@ -0,0 +1,9 @@ +{ + "name": "DEMO", + "icon": ["hbm:item.gun_light_revolver", 1, 0], + "content": { + "en_US": { + "This is a test page that links to [[Demo|DEMO]].\n\nFormat line break" + } + } +} diff --git a/src/main/resources/assets/hbm/textures/gui/GUICoal.png b/src/main/resources/assets/hbm/textures/gui/GUICoal.png deleted file mode 100644 index 64a2c1bff..000000000 Binary files a/src/main/resources/assets/hbm/textures/gui/GUICoal.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/gui/gui_ams_base.png b/src/main/resources/assets/hbm/textures/gui/gui_ams_base.png deleted file mode 100644 index 6f94393f8..000000000 Binary files a/src/main/resources/assets/hbm/textures/gui/gui_ams_base.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/gui/gui_ams_base_alt.png b/src/main/resources/assets/hbm/textures/gui/gui_ams_base_alt.png deleted file mode 100644 index b89077159..000000000 Binary files a/src/main/resources/assets/hbm/textures/gui/gui_ams_base_alt.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/gui/gui_ams_emitter.png b/src/main/resources/assets/hbm/textures/gui/gui_ams_emitter.png deleted file mode 100644 index e3d6a83b5..000000000 Binary files a/src/main/resources/assets/hbm/textures/gui/gui_ams_emitter.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/gui/gui_ams_limiter.png b/src/main/resources/assets/hbm/textures/gui/gui_ams_limiter.png deleted file mode 100644 index 6cb4472ce..000000000 Binary files a/src/main/resources/assets/hbm/textures/gui/gui_ams_limiter.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/gui/gui_cmb_manufactory.png b/src/main/resources/assets/hbm/textures/gui/gui_cmb_manufactory.png deleted file mode 100644 index e23738da6..000000000 Binary files a/src/main/resources/assets/hbm/textures/gui/gui_cmb_manufactory.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/gui/gui_cyclotron.png b/src/main/resources/assets/hbm/textures/gui/gui_cyclotron.png deleted file mode 100644 index 3f3bb46de..000000000 Binary files a/src/main/resources/assets/hbm/textures/gui/gui_cyclotron.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/gui/gui_drill.png b/src/main/resources/assets/hbm/textures/gui/gui_drill.png deleted file mode 100644 index 16fb695ae..000000000 Binary files a/src/main/resources/assets/hbm/textures/gui/gui_drill.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/gui/gui_info.png b/src/main/resources/assets/hbm/textures/gui/gui_info.png deleted file mode 100644 index 587d44964..000000000 Binary files a/src/main/resources/assets/hbm/textures/gui/gui_info.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/gui/gui_radiobox.png b/src/main/resources/assets/hbm/textures/gui/gui_radiobox.png deleted file mode 100644 index 430580e2e..000000000 Binary files a/src/main/resources/assets/hbm/textures/gui/gui_radiobox.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/gui/gui_reactor_large_experimental.png b/src/main/resources/assets/hbm/textures/gui/gui_reactor_large_experimental.png deleted file mode 100644 index 6be614cb8..000000000 Binary files a/src/main/resources/assets/hbm/textures/gui/gui_reactor_large_experimental.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/gui/gui_selenium.png b/src/main/resources/assets/hbm/textures/gui/gui_selenium.png deleted file mode 100644 index 654594236..000000000 Binary files a/src/main/resources/assets/hbm/textures/gui/gui_selenium.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/gui/gui_telelinker.png b/src/main/resources/assets/hbm/textures/gui/gui_telelinker.png deleted file mode 100644 index ba165d278..000000000 Binary files a/src/main/resources/assets/hbm/textures/gui/gui_telelinker.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/gui/gui_watz_multiblock.png b/src/main/resources/assets/hbm/textures/gui/gui_watz_multiblock.png deleted file mode 100644 index a89e83f6b..000000000 Binary files a/src/main/resources/assets/hbm/textures/gui/gui_watz_multiblock.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/gui/gui_wiki.png b/src/main/resources/assets/hbm/textures/gui/gui_wiki.png index 90785445b..25d913919 100644 Binary files a/src/main/resources/assets/hbm/textures/gui/gui_wiki.png and b/src/main/resources/assets/hbm/textures/gui/gui_wiki.png differ diff --git a/src/main/resources/assets/hbm/textures/gui/particleaccelerator/gui_dipole.png b/src/main/resources/assets/hbm/textures/gui/particleaccelerator/gui_dipole.png new file mode 100644 index 000000000..38f9935e9 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/gui/particleaccelerator/gui_dipole.png differ diff --git a/src/main/resources/assets/hbm/textures/gui/puf6Tank.png b/src/main/resources/assets/hbm/textures/gui/puf6Tank.png deleted file mode 100644 index 07da76dac..000000000 Binary files a/src/main/resources/assets/hbm/textures/gui/puf6Tank.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/gui/uf6Tank.png b/src/main/resources/assets/hbm/textures/gui/uf6Tank.png deleted file mode 100644 index 66371c4b3..000000000 Binary files a/src/main/resources/assets/hbm/textures/gui/uf6Tank.png and /dev/null differ