mirror of
https://github.com/HbmMods/Hbm-s-Nuclear-Tech-GIT.git
synced 2026-01-25 10:32:49 +00:00
the sludge
This commit is contained in:
parent
79c7faf55b
commit
ba220420fe
@ -12,3 +12,8 @@
|
|||||||
* Fixed NTM adding mob spawns to the mushroom island
|
* Fixed NTM adding mob spawns to the mushroom island
|
||||||
* Fixed line break not working on the tip of the day
|
* Fixed line break not working on the tip of the day
|
||||||
* Fixed an issue where AoE abilities can break bedrock
|
* Fixed an issue where AoE abilities can break bedrock
|
||||||
|
* Fixed chemical factory not saving its water and steam tanks
|
||||||
|
* Fixed siphon not working with some newer machines due to using legacy API
|
||||||
|
* Potentially fixed an incompatibility with Aether due to the loading screen replacement
|
||||||
|
* The loading screen replacement will only run up to 25 times per session, with a fixed delay of 5 seconds minimum
|
||||||
|
* The loading screen replacement can be disabled completely in the config
|
||||||
@ -1,6 +1,6 @@
|
|||||||
mod_version=1.0.27
|
mod_version=1.0.27
|
||||||
# Empty build number makes a release type
|
# Empty build number makes a release type
|
||||||
mod_build_number=5378
|
mod_build_number=5383
|
||||||
|
|
||||||
credits=HbMinecraft,\
|
credits=HbMinecraft,\
|
||||||
\ rodolphito (explosion algorithms),\
|
\ rodolphito (explosion algorithms),\
|
||||||
|
|||||||
@ -3,7 +3,7 @@ package com.hbm.lib;
|
|||||||
public class RefStrings {
|
public class RefStrings {
|
||||||
public static final String MODID = "hbm";
|
public static final String MODID = "hbm";
|
||||||
public static final String NAME = "Hbm's Nuclear Tech Mod";
|
public static final String NAME = "Hbm's Nuclear Tech Mod";
|
||||||
public static final String VERSION = "1.0.27 BETA (5378)";
|
public static final String VERSION = "1.0.27 BETA (5383)";
|
||||||
//HBM's Beta Naming Convention:
|
//HBM's Beta Naming Convention:
|
||||||
//V T (X)
|
//V T (X)
|
||||||
//V -> next release version
|
//V -> next release version
|
||||||
|
|||||||
@ -1031,6 +1031,7 @@ public class ModEventHandlerClient {
|
|||||||
public static boolean renderLodeStar = false;
|
public static boolean renderLodeStar = false;
|
||||||
public static long lastStarCheck = 0L;
|
public static long lastStarCheck = 0L;
|
||||||
public static long lastLoadScreenReplacement = 0L;
|
public static long lastLoadScreenReplacement = 0L;
|
||||||
|
public static int loadingScreenReplacementRetry = 0;
|
||||||
|
|
||||||
@SideOnly(Side.CLIENT)
|
@SideOnly(Side.CLIENT)
|
||||||
@SubscribeEvent(priority = EventPriority.LOWEST)
|
@SubscribeEvent(priority = EventPriority.LOWEST)
|
||||||
@ -1040,9 +1041,10 @@ public class ModEventHandlerClient {
|
|||||||
long millis = Clock.get_ms();
|
long millis = Clock.get_ms();
|
||||||
if(millis == 0) millis = System.currentTimeMillis();
|
if(millis == 0) millis = System.currentTimeMillis();
|
||||||
|
|
||||||
if(GeneralConfig.enableLoadScreenReplacement && !(mc.loadingScreen instanceof LoadingScreenRendererNT) && millis > lastLoadScreenReplacement + 10_000) {
|
if(GeneralConfig.enableLoadScreenReplacement && loadingScreenReplacementRetry < 25 && !(mc.loadingScreen instanceof LoadingScreenRendererNT) && millis > lastLoadScreenReplacement + 5_000) {
|
||||||
mc.loadingScreen = new LoadingScreenRendererNT(mc);
|
mc.loadingScreen = new LoadingScreenRendererNT(mc);
|
||||||
lastLoadScreenReplacement = millis;
|
lastLoadScreenReplacement = millis;
|
||||||
|
loadingScreenReplacementRetry++; // this might not do anything, but at least it should prevent a metric fuckton of framebuffers from being created
|
||||||
}
|
}
|
||||||
|
|
||||||
if(event.phase == Phase.START && GeneralConfig.enableSkyboxes) {
|
if(event.phase == Phase.START && GeneralConfig.enableSkyboxes) {
|
||||||
|
|||||||
@ -314,6 +314,9 @@ public class TileEntityMachineChemicalFactory extends TileEntityMachineBase impl
|
|||||||
for(int i = 0; i < inputTanks.length; i++) this.inputTanks[i].readFromNBT(nbt, "i" + i);
|
for(int i = 0; i < inputTanks.length; i++) this.inputTanks[i].readFromNBT(nbt, "i" + i);
|
||||||
for(int i = 0; i < outputTanks.length; i++) this.outputTanks[i].readFromNBT(nbt, "i" + i);
|
for(int i = 0; i < outputTanks.length; i++) this.outputTanks[i].readFromNBT(nbt, "i" + i);
|
||||||
|
|
||||||
|
this.water.readFromNBT(nbt, "w");
|
||||||
|
this.lps.readFromNBT(nbt, "s");
|
||||||
|
|
||||||
this.power = nbt.getLong("power");
|
this.power = nbt.getLong("power");
|
||||||
this.maxPower = nbt.getLong("maxPower");
|
this.maxPower = nbt.getLong("maxPower");
|
||||||
for(int i = 0; i < 4; i++) this.chemplantModule[i].readFromNBT(nbt);
|
for(int i = 0; i < 4; i++) this.chemplantModule[i].readFromNBT(nbt);
|
||||||
@ -326,6 +329,9 @@ public class TileEntityMachineChemicalFactory extends TileEntityMachineBase impl
|
|||||||
for(int i = 0; i < inputTanks.length; i++) this.inputTanks[i].writeToNBT(nbt, "i" + i);
|
for(int i = 0; i < inputTanks.length; i++) this.inputTanks[i].writeToNBT(nbt, "i" + i);
|
||||||
for(int i = 0; i < outputTanks.length; i++) this.outputTanks[i].writeToNBT(nbt, "i" + i);
|
for(int i = 0; i < outputTanks.length; i++) this.outputTanks[i].writeToNBT(nbt, "i" + i);
|
||||||
|
|
||||||
|
this.water.writeToNBT(nbt, "w");
|
||||||
|
this.lps.writeToNBT(nbt, "s");
|
||||||
|
|
||||||
nbt.setLong("power", power);
|
nbt.setLong("power", power);
|
||||||
nbt.setLong("maxPower", maxPower);
|
nbt.setLong("maxPower", maxPower);
|
||||||
for(int i = 0; i < 4; i++) this.chemplantModule[i].writeToNBT(nbt);
|
for(int i = 0; i < 4; i++) this.chemplantModule[i].writeToNBT(nbt);
|
||||||
|
|||||||
4650
src/main/resources/assets/hbm/models/machines/assembly_machine.obj
Normal file
4650
src/main/resources/assets/hbm/models/machines/assembly_machine.obj
Normal file
File diff suppressed because it is too large
Load Diff
Binary file not shown.
|
Before Width: | Height: | Size: 3.2 KiB After Width: | Height: | Size: 2.7 KiB |
Loading…
x
Reference in New Issue
Block a user