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

stats, fixes

Browse Source
This commit is contained in:
Bob 2024-05-14 21:05:22 +02:00
parent c38362ae2a
commit 19a0bb0132
4 changed files with 27 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changelog
View File

@ -3,7 +3,10 @@
* Nerfed conventional explosives (dynamite, TNT, semtex, C4) in order to not outclass small nukes
* Plastic explosive blocks no longer drop and blocks
* Sellafite diamond ore now shreds into diamond gravel
* ICF vessel blocks now use half as much fullerite as before
* ICF capacitor and turbocharger blocks are now quite a bit cheaper
## Fixed
* Fixed missing localization for meteorite ores and the new crucible materials
* Removed the starmetal crystallization recipe, despite starmetal ore no longer existing
* Fixed the ICF structure block detection being incorrect, omitting some parts

12
src/main/java/com/hbm/inventory/recipes/AssemblerRecipes.java
View File

@ -939,7 +939,7 @@ public class AssemblerRecipes extends SerializableRecipe {
}, 600);
makeRecipe(new ComparableStack(ModBlocks.icf_laser_component, 1, EnumICFPart.CELL.ordinal()), new AStack[] {
new ComparableStack(ModItems.ingot_cft, 4),
new ComparableStack(ModItems.ingot_cft, 2),
new OreDictStack(ANY_BISMOIDBRONZE.plateCast(), 4),
new ComparableStack(ModBlocks.glass_quartz, 16)
}, 200);
@ -949,14 +949,14 @@ public class AssemblerRecipes extends SerializableRecipe {
new OreDictStack(Fluids.XENON.getDict(16_000))
}, 200);
makeRecipe(new ComparableStack(ModBlocks.icf_laser_component, 1, EnumICFPart.CAPACITOR.ordinal()), new AStack[] {
new OreDictStack(ANY_RESISTANTALLOY.plateWelded(), 2),
new OreDictStack(ANY_RESISTANTALLOY.plateWelded(), 1),
new OreDictStack(ND.wireDense(), 16),
new OreDictStack(SBD.ingot(), 4)
new OreDictStack(SBD.ingot(), 2)
}, 200);
makeRecipe(new ComparableStack(ModBlocks.icf_laser_component, 1, EnumICFPart.TURBO.ordinal()), new AStack[] {
new OreDictStack(ANY_RESISTANTALLOY.plateWelded(), 2),
new OreDictStack(DNT.wireDense(), 8),
new OreDictStack(SBD.ingot(), 16)
new OreDictStack(DNT.wireDense(), 4),
new OreDictStack(SBD.ingot(), 4)
}, 200);
makeRecipe(new ComparableStack(ModBlocks.icf_laser_component, 1, EnumICFPart.CASING.ordinal()), new AStack[] {
new OreDictStack(ANY_BISMOIDBRONZE.plateCast(), 4),
@ -980,7 +980,7 @@ public class AssemblerRecipes extends SerializableRecipe {
new OreDictStack(TI.plateWelded(), 2),
}, 200);
makeRecipe(new ComparableStack(ModBlocks.icf_component, 1, 1), new AStack[] {
new ComparableStack(ModItems.ingot_cft, 2),
new ComparableStack(ModItems.ingot_cft, 1),
new OreDictStack(CMB.plateCast(), 1),
new OreDictStack(W.plateWelded(), 2),
}, 200);

29
src/main/java/com/hbm/items/machine/ItemICFPellet.java
View File

@ -31,20 +31,20 @@ public class ItemICFPellet extends Item {
public static enum EnumICFFuel {
HYDROGEN( 0x4040FF, 1.0D, 1.0D, 1.0D),
DEUTERIUM( 0x2828CB, 1.0D, 1.0D, 1.0D),
TRITIUM( 0x000092, 1.0D, 1.0D, 1.0D),
HELIUM3( 0xFFF09F, 1.0D, 1.0D, 1.0D),
HELIUM4( 0xFF9B60, 1.0D, 1.0D, 1.0D),
LITHIUM( 0xE9E9E9, 1.0D, 1.0D, 1.0D),
BERYLLIUM( 0xA79D80, 1.0D, 1.0D, 1.0D),
BORON( 0x697F89, 1.0D, 1.0D, 1.0D),
CARBON( 0x454545, 1.0D, 1.0D, 1.0D),
OXYGEN( 0xB4E2FF, 1.0D, 1.0D, 1.0D),
SODIUM( 0xDFE4E7, 1.0D, 1.0D, 1.0D),
HYDROGEN( 0x4040FF, 1.00D, 0.85D, 1.00D),
DEUTERIUM( 0x2828CB, 1.25D, 1.00D, 1.00D),
TRITIUM( 0x000092, 1.50D, 1.00D, 1.05D),
HELIUM3( 0xFFF09F, 1.75D, 1.00D, 1.25D),
HELIUM4( 0xFF9B60, 2.00D, 1.00D, 1.50D),
LITHIUM( 0xE9E9E9, 1.25D, 0.85D, 2.00D),
BERYLLIUM( 0xA79D80, 2.00D, 1.00D, 2.50D),
BORON( 0x697F89, 3.00D, 0.50D, 3.50D),
CARBON( 0x454545, 2.00D, 1.00D, 5.00D),
OXYGEN( 0xB4E2FF, 1.25D, 1.50D, 7.50D),
SODIUM( 0xDFE4E7, 3.00D, 0.75D, 8.75D),
//aluminium, silicon, phosphorus
CHLORINE( 0xDAE598, 1.0D, 1.0D, 1.0D),
CALCIUM( 0xD2C7A9, 1.0D, 1.0D, 1.0D),
CHLORINE( 0xDAE598, 2.50D, 1.00D, 10.0D),
CALCIUM( 0xD2C7A9, 3.00D, 1.00D, 12.5D),
//titanium
;
@ -182,10 +182,11 @@ public class ItemICFPellet extends Item {
@Override
public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean bool) {
boolean muon = stack.hasTagCompound() && stack.stackTagCompound.getBoolean("muon");
list.add(EnumChatFormatting.GREEN + "Depletion: " + String.format(Locale.US, "%.1f", getDurabilityForDisplay(stack) * 100D) + "%");
list.add(EnumChatFormatting.YELLOW + "Fuel: " + I18nUtil.resolveKey("icffuel." + getType(stack, true).name().toLowerCase(Locale.US)) + " / " + I18nUtil.resolveKey("icffuel." + getType(stack, false).name().toLowerCase(Locale.US)));
list.add(EnumChatFormatting.YELLOW + "Heat required: " + BobMathUtil.getShortNumber(this.getFusingDifficulty(stack)) + "TU");
list.add(EnumChatFormatting.YELLOW + "Reactivity multiplier: x" + (int) (getType(stack, true).reactionMult * getType(stack, false).reactionMult * 100) / 100D);
if(stack.hasTagCompound() && stack.stackTagCompound.getBoolean("muon")) list.add(EnumChatFormatting.DARK_AQUA + "Muon catalyzed!");
if(muon) list.add(EnumChatFormatting.DARK_AQUA + "Muon catalyzed!");
}
}

6
src/main/java/com/hbm/tileentity/machine/TileEntityICFStruct.java
View File

@ -28,9 +28,9 @@ public class TileEntityICFStruct extends TileEntity {
if(!cbarp(ModBlocks.icf_component, 2, 0, 3, i, dir)) return;
for(int j = -1; j <= 1; j++) if(!cbarp(ModBlocks.icf_component, Math.abs(i) <= 2 ? 2 : 4, j, 1, i, dir)) return;
for(int j = -1; j <= 1; j++) if(!cbarp(ModBlocks.icf_component, Math.abs(i) <= 2 ? 2 : 4, j, 2, i, dir)) return;
for(int j = -1; j <= 1; j++) if(j != 0) if(!cbarp(ModBlocks.icf_component, Math.abs(i) <= 2 ? 2 : 4, j, 3, i, dir)) return;
for(int j = -1; j <= 1; j++) if(!cbarp(ModBlocks.icf_component, Math.abs(i) <= 2 ? 2 : 4, j, 4, i, dir)) return;
for(int j = -2; j <= 2; j++) if(!cbarp(ModBlocks.icf_component, Math.abs(i) <= 2 ? 2 : 4, j, 2, i, dir)) return;
for(int j = -2; j <= 2; j++) if(j != 0) if(!cbarp(ModBlocks.icf_component, Math.abs(i) <= 2 ? 2 : 4, j, 3, i, dir)) return;
for(int j = -2; j <= 2; j++) if(!cbarp(ModBlocks.icf_component, Math.abs(i) <= 2 ? 2 : 4, j, 4, i, dir)) return;
for(int j = -1; j <= 1; j++) if(!cbarp(ModBlocks.icf_component, Math.abs(i) <= 2 ? 2 : 4, j, 5, i, dir)) return;
}