no
@ -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
|
||||
|
||||
@ -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();
|
||||
|
||||
@ -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<ExAttrib> atttributes = new HashSet();
|
||||
|
||||
@ -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);
|
||||
|
||||
5
src/main/java/com/hbm/qmaw/GuiQMAW.java
Normal file
@ -0,0 +1,5 @@
|
||||
package com.hbm.qmaw;
|
||||
|
||||
public class GuiQMAW {
|
||||
|
||||
}
|
||||
9
src/main/java/com/hbm/qmaw/IManualElement.java
Normal file
@ -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();
|
||||
}
|
||||
29
src/main/java/com/hbm/qmaw/QMAWLoader.java
Normal file
@ -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<String, QuickManualAndWiki> 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
|
||||
}
|
||||
}
|
||||
5
src/main/java/com/hbm/qmaw/QuickManualAndWiki.java
Normal file
@ -0,0 +1,5 @@
|
||||
package com.hbm.qmaw;
|
||||
|
||||
public class QuickManualAndWiki {
|
||||
|
||||
}
|
||||
@ -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);
|
||||
|
||||
@ -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);
|
||||
|
||||
@ -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);
|
||||
|
||||
9
src/main/resources/assets/hbm/manual/demo.json
Normal file
@ -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"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Before Width: | Height: | Size: 2.4 KiB |
|
Before Width: | Height: | Size: 6.3 KiB |
|
Before Width: | Height: | Size: 6.2 KiB |
|
Before Width: | Height: | Size: 2.4 KiB |
|
Before Width: | Height: | Size: 3.0 KiB |
|
Before Width: | Height: | Size: 2.6 KiB |
|
Before Width: | Height: | Size: 4.0 KiB |
|
Before Width: | Height: | Size: 2.0 KiB |
|
Before Width: | Height: | Size: 1.1 KiB |
|
Before Width: | Height: | Size: 1.9 KiB |
|
Before Width: | Height: | Size: 11 KiB |
|
Before Width: | Height: | Size: 3.4 KiB |
|
Before Width: | Height: | Size: 1.3 KiB |
|
Before Width: | Height: | Size: 3.7 KiB |
|
Before Width: | Height: | Size: 893 B After Width: | Height: | Size: 1.1 KiB |
|
After Width: | Height: | Size: 3.8 KiB |
|
Before Width: | Height: | Size: 4.8 KiB |
|
Before Width: | Height: | Size: 4.8 KiB |