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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
BallOfEnergy1 2023-03-15 17:51:35 -05:00
commit 8a57f66fa8
8 changed files with 29 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/hbm/blocks/generic/BlockGrate.java
View File

@ -100,10 +100,12 @@ public class BlockGrate extends Block implements ITooltipProvider {
public void addCollisionBoxesToList(World world, int x, int y, int z, AxisAlignedBB entityBounding, List list, Entity entity) {
if(this != ModBlocks.steel_grate_wide || !(entity instanceof EntityItem || entity instanceof EntityXPOrb)) {
super.addCollisionBoxesToList(world, x, y, z, entityBounding, list, entity);
return;
}
if((entity instanceof EntityItem || entity instanceof EntityXPOrb) && entity.posY < y + 1.5) {
entity.motionX = 0;
entity.motionY = -0.25;
entity.motionZ = 0;
entity.setPosition(entity.posX, entity.posY - 0.125, entity.posZ);

9
src/main/java/com/hbm/inventory/material/Mats.java
View File

@ -101,9 +101,9 @@ public class Mats {
public static final NTMMaterial MAT_ALUMINIUM = makeSmeltable(1300, AL, 0xFFFFFF, 0x344550, 0xD0B8EB).setShapes(WIRE, INGOT, DUST, PLATE, CASTPLATE, BLOCK);
public static final NTMMaterial MAT_LEAD = makeSmeltable(8200, PB, 0xA6A6B2, 0x03030F, 0x646470).setShapes(NUGGET, INGOT, DUST, PLATE, CASTPLATE, BLOCK);
public static final NTMMaterial MAT_BISMUTH = makeSmeltable(8300, df("Bismuth"), 0xB200FF).setShapes(NUGGET, BILLET, INGOT, DUST, BLOCK);
public static final NTMMaterial MAT_ARSENIC = makeSmeltable(3300, AS, 0x558080).setShapes(NUGGET, INGOT);
public static final NTMMaterial MAT_TANTALIUM = makeSmeltable(7300, TA, 0xA89B74).setShapes(NUGGET, INGOT, DUST, BLOCK);
public static final NTMMaterial MAT_NIOBIUM = makeSmeltable(4100, NB, 0xD576B1).setShapes(NUGGET, DUSTTINY, INGOT, DUST, BLOCK);
public static final NTMMaterial MAT_ARSENIC = makeSmeltable(3300, AS, 0x6CBABA, 0x242525, 0x558080).setShapes(NUGGET, INGOT);
public static final NTMMaterial MAT_TANTALIUM = makeSmeltable(7300, TA, 0xFFFFFF, 0x1D1D36, 0xA89B74).setShapes(NUGGET, INGOT, DUST, BLOCK);
public static final NTMMaterial MAT_NIOBIUM = makeSmeltable(4100, NB, 0xB76EC9, 0x2F2D42, 0xD576B1).setShapes(NUGGET, DUSTTINY, INGOT, DUST, BLOCK);
public static final NTMMaterial MAT_BERYLLIUM = makeSmeltable(400, BE, 0xB2B2A6, 0x0F0F03, 0xAE9572).setShapes(NUGGET, INGOT, DUST, BLOCK);
public static final NTMMaterial MAT_COBALT = makeSmeltable(2700, CO, 0xC2D1EE, 0x353554, 0x8F72AE).setShapes(NUGGET, DUSTTINY, BILLET, INGOT, DUST, BLOCK);
public static final NTMMaterial MAT_BORON = makeSmeltable(500, B, 0xBDC8D2, 0x29343E, 0xAD72AE).setShapes(DUSTTINY, INGOT, DUST, BLOCK);
@ -117,10 +117,11 @@ public class Mats {
public static final NTMMaterial MAT_STAR = makeSmeltable(_AS + 5, STAR, 0xCCCCEA, 0x11111A, 0xA5A5D3).setShapes(INGOT, DUST, BLOCK);
public static final NTMMaterial MAT_TCALLOY = makeSmeltable(_AS + 6, TCALLOY, 0xD4D6D6, 0x323D3D, 0x9CA6A6).setShapes(INGOT, DUST);
public static final NTMMaterial MAT_FERRO = makeSmeltable(_AS + 7, FERRO, 0xB7B7C9, 0x101022, 0x6B6B8B).setShapes(INGOT);
public static final NTMMaterial MAT_MAGTUNG = makeSmeltable(_AS + 8, MAGTUNG, 0x22A2A2).setShapes(INGOT, DUST, BLOCK);
public static final NTMMaterial MAT_MAGTUNG = makeSmeltable(_AS + 8, MAGTUNG, 0x22A2A2, 0x0F0F0F, 0x22A2A2).setShapes(INGOT, DUST, BLOCK);
public static final NTMMaterial MAT_CMB = makeSmeltable(_AS + 9, CMB, 0x6F6FB4, 0x000011, 0x6F6FB4).setShapes(INGOT, DUST, PLATE, CASTPLATE, BLOCK);
public static final NTMMaterial MAT_FLUX = makeAdditive(_AS + 10, df("Flux"), 0x404242, 0x404242, 0xDECCAD).setShapes(DUST);
public static final NTMMaterial MAT_SLAG = makeSmeltable(_AS + 11, SLAG, 0x554940, 0x34281F, 0x6C6562).setShapes(BLOCK);
public static final NTMMaterial MAT_DESH = makeSmeltable(_AS + 12, DESH, 0xFF6D6D, 0x720000, 0xF22929).setShapes(INGOT, DUST, CASTPLATE, BLOCK);
@Deprecated public static NTMMaterial makeSmeltable(int id, DictFrame dict, int color) { return makeSmeltable(id, dict, color, color, color); }
@Deprecated public static NTMMaterial makeAdditive(int id, DictFrame dict, int color) { return makeAdditive(id, dict, color, color, color); }

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

@ -906,7 +906,7 @@ public class AssemblerRecipes {
new OreDictStack(ANY_PLASTICEXPLOSIVE.ingot(), 8),
new OreDictStack(KEY_ANYPANE, 6),
new OreDictStack(STEEL.plate(), 4),
}, 100);
}, 100);
makeRecipe(new ComparableStack(ModBlocks.machine_difurnace_rtg_off, 1), new AStack[] {
new ComparableStack(ModBlocks.machine_difurnace_off, 1),
@ -916,6 +916,17 @@ public class AssemblerRecipes {
new OreDictStack(OreDictManager.getReflector(), 8),
new OreDictStack(CU.plate(), 12)
}, 150);
makeRecipe(new ComparableStack(ModBlocks.machine_catalytic_reformer, 1), new AStack[] {
new OreDictStack(STEEL.plateCast(), 12),
new OreDictStack(CU.plate528(), 8),
new OreDictStack(NB.ingot(), 8),
new OreDictStack(TCALLOY.ingot(), 4),
new ComparableStack(ModItems.hull_big_steel, 3),
new ComparableStack(ModItems.pipes_steel, 1),
new ComparableStack(ModItems.motor, 1),
new ComparableStack(ModItems.circuit_red_copper, 3)
}, 150);
makeRecipe(new ComparableStack(ModBlocks.block_cap_nuka, 1), new AStack[] { new ComparableStack(ModItems.cap_nuka, 128) }, 10);
makeRecipe(new ComparableStack(ModBlocks.block_cap_quantum, 1), new AStack[] { new ComparableStack(ModItems.cap_quantum, 128) }, 10);

10
src/main/java/com/hbm/items/special/ItemAutogen.java
View File

@ -49,7 +49,7 @@ public class ItemAutogen extends Item {
TextureMap map = (TextureMap) reg;
for(NTMMaterial mat : Mats.orderedList) {
if(!textureOverrides.containsKey(mat) && mat.solidColorLight != mat.solidColorDark) {
if(!textureOverrides.containsKey(mat) && mat.solidColorLight != mat.solidColorDark && (shape == null || mat.shapes.contains(shape))) { //only generate icons if there is no override, color variation is available and if the icon will actually be used
String placeholderName = this.getIconString() + "-" + mat.names[0]; //the part after the dash is discarded - the name only has to be unique so that the hashmap which holds all the icon definitions can hold multiple references
//TextureAtlasSpriteMutatable mutableIcon = new TextureAtlasSpriteMutatable(placeholderName, new RGBMutatorInterpolatedComponentRemap(0xFFFFFF, 0x565656, mat.solidColorLight, mat.solidColorDark));
TextureAtlasSpriteMutatable mutableIcon = new TextureAtlasSpriteMutatable(placeholderName, new RGBMutatorInterpolatedComponentRemap(0xFFFFFF, 0x505050, mat.solidColorLight, mat.solidColorDark));
@ -68,18 +68,18 @@ public class ItemAutogen extends Item {
@SideOnly(Side.CLIENT)
public void getSubItems(Item item, CreativeTabs tab, List list) {
/*for(NTMMaterial mat : Mats.orderedList) {
for(NTMMaterial mat : Mats.orderedList) {
if(mat.shapes.contains(this.shape)) {
list.add(new ItemStack(item, 1, mat.id));
}
}*/
}
for(NTMMaterial mat : Mats.orderedList) {
/*for(NTMMaterial mat : Mats.orderedList) {
if(mat.smeltable == SmeltingBehavior.SMELTABLE || mat.smeltable == SmeltingBehavior.ADDITIVE) {
list.add(new ItemStack(item, 1, mat.id));
}
}
}*/
}
@Override

4
src/main/java/com/hbm/items/weapon/ItemAmmoHIMARS.java
View File

@ -173,7 +173,7 @@ public class ItemAmmoHIMARS extends Item {
}
};
this.itemTypes[SMALL_WP] = new HIMARSRocket("standard_he", "himars_standard_he", 0) {
this.itemTypes[SMALL_WP] = new HIMARSRocket("standard_wp", "himars_standard_wp", 0) {
public void onImpact(EntityArtilleryRocket rocket, MovingObjectPosition mop) {
standardExplosion(rocket, mop, 20F, 3F, false);
ExplosionLarge.spawnShrapnels(rocket.worldObj, (int) mop.hitVec.xCoord, (int) mop.hitVec.yCoord, (int) mop.hitVec.zCoord, 30);
@ -203,7 +203,7 @@ public class ItemAmmoHIMARS extends Item {
standardMush(rocket, mop, 20);
}};
this.itemTypes[LARGE_TB] = new HIMARSRocket("standard_tb", "himars_standard_tb", 0) {
this.itemTypes[LARGE_TB] = new HIMARSRocket("single_tb", "himars_single_tb", 1) {
public void onImpact(EntityArtilleryRocket rocket, MovingObjectPosition mop) {
standardExplosion(rocket, mop, 50F, 12F, true);
ExplosionLarge.spawnShrapnels(rocket.worldObj, (int) mop.hitVec.xCoord, (int) mop.hitVec.yCoord, (int) mop.hitVec.zCoord, 30);

3
src/main/java/com/hbm/render/tileentity/RenderTurretHIMARS.java
View File

@ -51,9 +51,9 @@ public class RenderTurretHIMARS extends TileEntitySpecialRenderer implements IIt
if(turret.typeLoaded >= 0) {
HIMARSRocket type = ItemAmmoHIMARS.itemTypes[turret.typeLoaded];
bindTexture(type.texture);
if(type.modelType == 0) {
bindTexture(ResourceManager.himars_standard_tex);
ResourceManager.turret_himars.renderPart("TubeStandard");
for(int i = 0; i < turret.ammo; i++) {
@ -62,7 +62,6 @@ public class RenderTurretHIMARS extends TileEntitySpecialRenderer implements IIt
}
if(type.modelType == 1) {
bindTexture(ResourceManager.himars_single_tex);
ResourceManager.turret_himars.renderPart("TubeSingle");
if(turret.hasAmmo()) {

1
src/main/resources/assets/hbm/lang/de_DE.lang
View File

@ -706,6 +706,7 @@ hbmmat.cobalt=Kobalt
hbmmat.cobalt60=Kobalt-60
hbmmat.coltan=Coltan
hbmmat.copper=Kupfer
hbmmat.desh=Desh
hbmmat.dineutronium=Dineutronium
hbmmat.durasteel=Schnellarbeitsstahl
hbmmat.euphemium=Euphemium

1
src/main/resources/assets/hbm/lang/en_US.lang
View File

@ -1271,6 +1271,7 @@ hbmmat.cobalt=Cobalt
hbmmat.cobalt60=Cobalt-60
hbmmat.coltan=Coltan
hbmmat.copper=Copper
hbmmat.desh=Desh
hbmmat.dineutronium=Dineutronium
hbmmat.durasteel=High-Speed Steel
hbmmat.euphemium=Euphemium