xircon/Hbm-s-Nuclear-Tech-GIT
1
0
Fork 0
mirror of https://github.com/HbmMods/Hbm-s-Nuclear-Tech-GIT.git synced 2026-03-14 05:35:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'HbmMods:master' into master

Browse Source
This commit is contained in:
Raaaaaaaaaay 2026-02-25 14:33:47 +02:00 committed by GitHub
commit 6fb495bd7b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changelog
View File

@ -27,4 +27,6 @@
* Decreased the fusing difficulty of chlorine and calcium in the ICF which should hopefully make ClCa fuel pellets usable (untested) * Decreased the fusing difficulty of chlorine and calcium in the ICF which should hopefully make ClCa fuel pellets usable (untested)
* Fixed loot piles only having a single block render AABB, causing armor rewards from red rooms to blink out of existence at certain angles * Fixed loot piles only having a single block render AABB, causing armor rewards from red rooms to blink out of existence at certain angles
* Fixed filled crate blocks not dropping crate items with a stack lock in place * Fixed filled crate blocks not dropping crate items with a stack lock in place
* Fixed stack lock not being applied when an item crate is opened, allowing them to be stacked while the item is open * Fixed stack lock not being applied when an item crate is opened, allowing them to be stacked while the item is open
* Fixed clientonly melee component call on the power armor melee controller
* Fixed SEDNA melee (bayonets, power armor melee) being able to punch dead or dying entities, which would swallow hits intended for entities behind them

2
gradle.properties
View File

@ -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=5615 mod_build_number=5616
credits=HbMinecraft,\ credits=HbMinecraft,\
\ rodolphito (explosion algorithms),\ \ rodolphito (explosion algorithms),\

10
src/main/java/com/hbm/items/weapon/sedna/factory/XFactoryPA.java
View File

@ -43,7 +43,7 @@ public class XFactoryPA {
} }
public static BiConsumer<ItemStack, LambdaContext> ORCHESTRA = (stack, ctx) -> { public static BiConsumer<ItemStack, LambdaContext> ORCHESTRA = (stack, ctx) -> {
IPAMelee component = IPAWeaponsProvider.getMeleeComponentClient(); IPAMelee component = IPAWeaponsProvider.getMeleeComponentCommon(ctx.getPlayer());
if(component != null) component.orchestra(stack, ctx); if(component != null) component.orchestra(stack, ctx);
}; };
@ -54,11 +54,11 @@ public class XFactoryPA {
}; };
public static BiConsumer<ItemStack, LambdaContext> LAMBDA_CLICK_MELEE_PRIMARY = (stack, ctx) -> { public static BiConsumer<ItemStack, LambdaContext> LAMBDA_CLICK_MELEE_PRIMARY = (stack, ctx) -> {
IPAMelee component = IPAWeaponsProvider.getMeleeComponentClient(); IPAMelee component = IPAWeaponsProvider.getMeleeComponentCommon(ctx.getPlayer());
if(component != null) component.clickPrimary(stack, ctx); if(component != null) component.clickPrimary(stack, ctx);
}; };
public static BiConsumer<ItemStack, LambdaContext> LAMBDA_CLICK_MELEE_SENONDARY = (stack, ctx) -> { public static BiConsumer<ItemStack, LambdaContext> LAMBDA_CLICK_MELEE_SENONDARY = (stack, ctx) -> {
IPAMelee component = IPAWeaponsProvider.getMeleeComponentClient(); IPAMelee component = IPAWeaponsProvider.getMeleeComponentCommon(ctx.getPlayer());
if(component != null) component.clickSecondary(stack, ctx); if(component != null) component.clickSecondary(stack, ctx);
}; };
@ -76,11 +76,11 @@ public class XFactoryPA {
} }
public static BiConsumer<ItemStack, LambdaContext> LAMBDA_CLICK_RANGED_PRIMARY = (stack, ctx) -> { public static BiConsumer<ItemStack, LambdaContext> LAMBDA_CLICK_RANGED_PRIMARY = (stack, ctx) -> {
IPARanged component = IPAWeaponsProvider.getRangedComponentClient(); IPARanged component = IPAWeaponsProvider.getRangedComponentCommon(ctx.getPlayer());
if(component != null) component.clickPrimary(stack, ctx); if(component != null) component.clickPrimary(stack, ctx);
}; };
public static BiConsumer<ItemStack, LambdaContext> LAMBDA_CLICK_RANGED_SENONDARY = (stack, ctx) -> { public static BiConsumer<ItemStack, LambdaContext> LAMBDA_CLICK_RANGED_SENONDARY = (stack, ctx) -> {
IPARanged component = IPAWeaponsProvider.getRangedComponentClient(); IPARanged component = IPAWeaponsProvider.getRangedComponentCommon(ctx.getPlayer());
if(component != null) component.clickSecondary(stack, ctx); if(component != null) component.clickSecondary(stack, ctx);
}; };

2
src/main/java/com/hbm/lib/RefStrings.java
View File

@ -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 (5615)"; public static final String VERSION = "1.0.27 BETA (5616)";
//HBM's Beta Naming Convention: //HBM's Beta Naming Convention:
//V T (X) //V T (X)
//V -> next release version //V -> next release version

2
src/main/java/com/hbm/util/EntityDamageUtil.java
View File

@ -454,7 +454,7 @@ public class EntityDamageUtil {
for(int i = 0; i < list.size(); ++i) { for(int i = 0; i < list.size(); ++i) {
Entity entity = (Entity) list.get(i); Entity entity = (Entity) list.get(i);
if(entity.canBeCollidedWith()) { if(entity.canBeCollidedWith() && entity.isEntityAlive()) {
double borderSize = entity.getCollisionBorderSize() + threshold; double borderSize = entity.getCollisionBorderSize() + threshold;
AxisAlignedBB axisalignedbb = entity.boundingBox.expand(borderSize, borderSize, borderSize); AxisAlignedBB axisalignedbb = entity.boundingBox.expand(borderSize, borderSize, borderSize);