xircon/Hbm-s-Nuclear-Tech-GIT
1
0
Fork 0
mirror of https://github.com/HbmMods/Hbm-s-Nuclear-Tech-GIT.git synced 2026-01-25 10:32:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

top 5 videos

Browse Source
This commit is contained in:
Bob 2025-01-06 19:56:48 +01:00
parent 3400fed16e
commit c34c412810
12 changed files with 31 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changelog
View File

@ -19,6 +19,9 @@
* Some secret ammo types are now craftable
* Updated the assault rifle's texture
* Shooting at old CRT screens now breaks them
* Leviathan turbines now have a tooltip showing their buffers
* Fullerene now only uses visible light instead of UV to make, meaning fullerite can be obtained without a fusion or watz reactor (still requiring vacuum oil though)
* Crumb yields from bedrock ore processing has been heavily decreased, all recipes that yield crumbs produce no more than one pile
## Fixed
* Fixed `ITEM_TOOLTIP_SHOW_CUSTOM_NUKE` client config overriding `ITEM_TOOLTIP_SHOW_OREDICT` due to name overlap
@ -33,3 +36,5 @@
* Potentially fixed an issue where cargo planes do not successfully spawn on lower render distances
* Fixed glyphids not calling their `onDeath` function properly, causing them to not drop anything and preventing the appropriate forge events from firing
* Fixed GL state leak caused by plasma blast particles, causing other particles (especially bones) to render weird
* Fixed night vision goggles being constantly disabled due to m1tty's night vision removal out of water
* Fixed armor on test dummies entering the sneaked state in third person view when the player sneaks

2
gradle.properties
View File

@ -1,6 +1,6 @@
mod_version=1.0.27
# Empty build number makes a release type
mod_build_number=5193
mod_build_number=5202
credits=HbMinecraft,\
\ rodolphito (explosion algorithms),\

20
src/main/java/com/hbm/blocks/machine/MachineChungus.java
View File

@ -13,7 +13,6 @@ import com.hbm.inventory.fluid.tank.FluidTank;
import com.hbm.inventory.fluid.trait.FT_Coolable;
import com.hbm.tileentity.TileEntityProxyCombo;
import com.hbm.tileentity.machine.TileEntityChungus;
import com.hbm.tileentity.machine.oil.TileEntityMachineFractionTower;
import com.hbm.util.BobMathUtil;
import com.hbm.util.I18nUtil;
@ -148,34 +147,27 @@ public class MachineChungus extends BlockDummyable implements ITooltipProvider,
@Override
public void printHook(Pre event, World world, int x, int y, int z) {
int[] pos = this.findCore(world, x, y, z);
if(pos == null)
return;
if(pos == null) return;
TileEntity te = world.getTileEntity(pos[0], pos[1], pos[2]);
if(!(te instanceof TileEntityChungus))
return;
if(!(te instanceof TileEntityChungus)) return;
TileEntityChungus chungus = (TileEntityChungus) te;
List<String> text = new ArrayList();
FluidTank tankInput = chungus.getReceivingTanks()[0];
FluidTank tankOutput = chungus.getSendingTanks()[0];
FluidTank tankInput = chungus.tanks[0];
FluidTank tankOutput = chungus.tanks[1];
FluidType inputType = tankInput.getTankType();
FluidType outputType = Fluids.NONE;
if (inputType.hasTrait(FT_Coolable.class)) {
if(inputType.hasTrait(FT_Coolable.class)) {
outputType = inputType.getTrait(FT_Coolable.class).coolsTo;
}
text.add(EnumChatFormatting.GREEN + "-> " + EnumChatFormatting.RESET + inputType.getLocalizedName() + ": " + tankInput.getFill() + "/" + tankInput.getMaxFill() + "mB");
text.add(EnumChatFormatting.RED + "<- " + EnumChatFormatting.RESET + outputType.getLocalizedName() + ": " + tankOutput.getFill() + "/" + tankOutput.getMaxFill() + "mB");
text.add(EnumChatFormatting.YELLOW + "** " + EnumChatFormatting.RESET + BobMathUtil.getShortNumber(chungus.power) + "/" + BobMathUtil.getShortNumber(chungus.getMaxPower()) + "HE");
text.add(EnumChatFormatting.RED + "<- " + EnumChatFormatting.RESET + BobMathUtil.getShortNumber(chungus.power) + "/" + BobMathUtil.getShortNumber(chungus.getMaxPower()) + "HE");
ILookOverlay.printGeneric(event, I18nUtil.resolveKey(getUnlocalizedName() + ".name"), 0xffff00, 0x404000, text);

4
src/main/java/com/hbm/inventory/recipes/CentrifugeRecipes.java
View File

@ -529,8 +529,8 @@ public class CentrifugeRecipes extends SerializableRecipe {
recipes.put(new ComparableStack(ItemBedrockOreNew.make(BedrockOreGrade.PRIMARY_NOSULFURIC, type)), new ItemStack[] {ItemBedrockOreNew.extract(type.primary1, 1), ItemBedrockOreNew.extract(type.primary2, 1), ItemBedrockOreNew.make(BedrockOreGrade.CRUMBS, type)});
recipes.put(new ComparableStack(ItemBedrockOreNew.make(BedrockOreGrade.PRIMARY_NOSOLVENT, type)), new ItemStack[] {ItemBedrockOreNew.extract(type.primary1, 1), ItemBedrockOreNew.extract(type.primary2, 1), ItemBedrockOreNew.make(BedrockOreGrade.CRUMBS, type)});
recipes.put(new ComparableStack(ItemBedrockOreNew.make(BedrockOreGrade.PRIMARY_NORAD, type)), new ItemStack[] {ItemBedrockOreNew.extract(type.primary1, 1), ItemBedrockOreNew.extract(type.primary2, 1), ItemBedrockOreNew.make(BedrockOreGrade.CRUMBS, type)});
recipes.put(new ComparableStack(ItemBedrockOreNew.make(BedrockOreGrade.PRIMARY_FIRST, type)), new ItemStack[] {ItemBedrockOreNew.extract(type.primary1, 1), ItemBedrockOreNew.extract(type.primary1, 1), ItemBedrockOreNew.extract(type.primary2, 1), ItemBedrockOreNew.make(BedrockOreGrade.CRUMBS, type, 2)});
recipes.put(new ComparableStack(ItemBedrockOreNew.make(BedrockOreGrade.PRIMARY_SECOND, type)), new ItemStack[] {ItemBedrockOreNew.extract(type.primary1, 1), ItemBedrockOreNew.extract(type.primary2, 1), ItemBedrockOreNew.extract(type.primary2, 1), ItemBedrockOreNew.make(BedrockOreGrade.CRUMBS, type, 2)});
recipes.put(new ComparableStack(ItemBedrockOreNew.make(BedrockOreGrade.PRIMARY_FIRST, type)), new ItemStack[] {ItemBedrockOreNew.extract(type.primary1, 1), ItemBedrockOreNew.extract(type.primary1, 1), ItemBedrockOreNew.extract(type.primary2, 1), ItemBedrockOreNew.make(BedrockOreGrade.CRUMBS, type, 1)});
recipes.put(new ComparableStack(ItemBedrockOreNew.make(BedrockOreGrade.PRIMARY_SECOND, type)), new ItemStack[] {ItemBedrockOreNew.extract(type.primary1, 1), ItemBedrockOreNew.extract(type.primary2, 1), ItemBedrockOreNew.extract(type.primary2, 1), ItemBedrockOreNew.make(BedrockOreGrade.CRUMBS, type, 1)});
recipes.put(new ComparableStack(ItemBedrockOreNew.make(BedrockOreGrade.SULFURIC_WASHED, type)), new ItemStack[] {ItemBedrockOreNew.extract(type.byproductAcid1, 1), ItemBedrockOreNew.extract(type.byproductAcid2, 1), ItemBedrockOreNew.extract(type.byproductAcid3, 1), ItemBedrockOreNew.make(BedrockOreGrade.CRUMBS, type)});
recipes.put(new ComparableStack(ItemBedrockOreNew.make(BedrockOreGrade.SOLVENT_WASHED, type)), new ItemStack[] {ItemBedrockOreNew.extract(type.byproductSolvent1, 1), ItemBedrockOreNew.extract(type.byproductSolvent2, 1), ItemBedrockOreNew.extract(type.byproductSolvent3, 1), ItemBedrockOreNew.make(BedrockOreGrade.CRUMBS, type)});

4
src/main/java/com/hbm/inventory/recipes/ElectrolyserMetalRecipes.java
View File

@ -136,13 +136,13 @@ public class ElectrolyserMetalRecipes extends SerializableRecipe {
ArrayList<Pair<Object, Integer>> productsF = new ArrayList<>();
productsF.add(new Pair(type.primary1, 8));
productsF.add(new Pair(type.primary2, 4));
productsF.add(new Pair(ItemBedrockOreNew.make(BedrockOreGrade.CRUMBS, type), 3));
productsF.add(new Pair(ItemBedrockOreNew.make(BedrockOreGrade.CRUMBS, type), 1));
recipes.put(new ComparableStack(ItemBedrockOreNew.make(BedrockOreGrade.PRIMARY_FIRST, type)), makeBedrockOreProduct(productsF));
ArrayList<Pair<Object, Integer>> productsS = new ArrayList<>();
productsS.add(new Pair(type.primary1, 4));
productsS.add(new Pair(type.primary2, 8));
productsS.add(new Pair(ItemBedrockOreNew.make(BedrockOreGrade.CRUMBS, type),3));
productsS.add(new Pair(ItemBedrockOreNew.make(BedrockOreGrade.CRUMBS, type), 1));
recipes.put(new ComparableStack(ItemBedrockOreNew.make(BedrockOreGrade.PRIMARY_SECOND, type)), makeBedrockOreProduct(productsS));

2
src/main/java/com/hbm/inventory/recipes/SILEXRecipes.java
View File

@ -641,7 +641,7 @@ public class SILEXRecipes {
);
recipes.put(new ComparableStack(ModItems.fluid_icon, 1, Fluids.FULLERENE.getID()),
new SILEXRecipe(1_000, 1_000, EnumWavelengths.UV).addOut(DictFrame.fromOne(ModItems.powder_ash, EnumAshType.FULLERENE), 1));
new SILEXRecipe(1_000, 1_000, EnumWavelengths.VISIBLE).addOut(DictFrame.fromOne(ModItems.powder_ash, EnumAshType.FULLERENE), 1));
}
private static final HashMap<Item, Item> tinyWasteTranslation = new HashMap();

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

@ -3,7 +3,7 @@ package com.hbm.lib;
public class RefStrings {
public static final String MODID = "hbm";
public static final String NAME = "Hbm's Nuclear Tech Mod";
public static final String VERSION = "1.0.27 BETA (5193)";
public static final String VERSION = "1.0.27 BETA (5202)";
//HBM's Beta Naming Convention:
//V T (X)
//V -> next release version

6
src/main/java/com/hbm/render/model/ModelArmorBase.java
View File

@ -79,11 +79,11 @@ public class ModelArmorBase extends ModelBiped {
rightArm.rotateAngleX = rightArm.rotateAngleX * 0.5F - ((float) Math.PI / 10F) * hold;
}
this.isSneak = player.isSneaking();
this.isRiding = player.isRiding();
}
this.isSneak = entity.isSneaking();
this.isRiding = entity.isRiding();
if(this.isRiding) {
rightArm.rotateAngleX += -((float) Math.PI / 5F);
leftArm.rotateAngleX += -((float) Math.PI / 5F);

11
src/main/java/com/hbm/render/model/ModelT45Boots.java
View File

@ -11,7 +11,6 @@ import org.lwjgl.opengl.GL11;
import net.minecraft.client.model.ModelBiped;
import net.minecraft.client.model.ModelRenderer;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
public class ModelT45Boots extends ModelBiped {
// fields
@ -74,14 +73,8 @@ public class ModelT45Boots extends ModelBiped {
@Override
public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5, Entity entity) {
if (entity instanceof EntityPlayer) {
EntityPlayer player = (EntityPlayer) entity;
if (player.isSneaking()) {
this.isSneak = true;
} else {
this.isSneak = false;
}
}
this.isSneak = entity.isSneaking();
this.isRiding = entity.isRiding();
super.setRotationAngles(f, f1, f2, f3, f4, f5, entity);
this.leftleg.rotationPointX = this.bipedLeftLeg.rotationPointX;

9
src/main/java/com/hbm/render/model/ModelT45Chest.java
View File

@ -211,11 +211,6 @@ public class ModelT45Chest extends ModelBiped {
if (entity instanceof EntityPlayer) {
EntityPlayer player = (EntityPlayer) entity;
if (player.isSneaking()) {
this.isSneak = true;
} else {
this.isSneak = false;
}
ItemStack itemstack = player.inventory.getCurrentItem();
this.heldItemRight = itemstack != null ? 1 : 0;
@ -232,6 +227,10 @@ public class ModelT45Chest extends ModelBiped {
if(itemstack != null && player.getHeldItem().getItem() instanceof IHoldableWeapon) this.aimedBow = true;
if(itemstack != null && player.getHeldItem().getItem() instanceof ItemGunBaseNT) this.aimedBow = true;
}
this.isSneak = entity.isSneaking();
this.isRiding = entity.isRiding();
super.setRotationAngles(f, f1, f2, f3, f4, f5, entity);
this.chest.rotationPointX = this.bipedBody.rotationPointX;
this.chest.rotationPointY = this.bipedBody.rotationPointY;

11
src/main/java/com/hbm/render/model/ModelT45Helmet.java
View File

@ -11,7 +11,6 @@ import org.lwjgl.opengl.GL11;
import net.minecraft.client.model.ModelBiped;
import net.minecraft.client.model.ModelRenderer;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
public class ModelT45Helmet extends ModelBiped {
// fields
@ -106,14 +105,8 @@ public class ModelT45Helmet extends ModelBiped {
@Override
public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5, Entity entity) {
if (entity instanceof EntityPlayer) {
EntityPlayer player = (EntityPlayer) entity;
if (player.isSneaking()) {
this.isSneak = true;
} else {
this.isSneak = false;
}
}
this.isSneak = entity.isSneaking();
this.isRiding = entity.isRiding();
super.setRotationAngles(f, f1, f2, f3, f4, f5, entity);
this.helmet.rotationPointX = this.bipedHead.rotationPointX;

11
src/main/java/com/hbm/render/model/ModelT45Legs.java
View File

@ -11,7 +11,6 @@ import org.lwjgl.opengl.GL11;
import net.minecraft.client.model.ModelBiped;
import net.minecraft.client.model.ModelRenderer;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
public class ModelT45Legs extends ModelBiped {
// fields
@ -91,14 +90,8 @@ public class ModelT45Legs extends ModelBiped {
@Override
public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5, Entity entity) {
if (entity instanceof EntityPlayer) {
EntityPlayer player = (EntityPlayer) entity;
if (player.isSneaking()) {
this.isSneak = true;
} else {
this.isSneak = false;
}
}
this.isSneak = entity.isSneaking();
this.isRiding = entity.isRiding();
super.setRotationAngles(f, f1, f2, f3, f4, f5, entity);
this.leftleg.rotationPointX = this.bipedLeftLeg.rotationPointX;