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

fixed ore dict blunders, more connected pain

Browse Source
This commit is contained in:
Boblet 2021-09-30 14:31:44 +02:00
parent 451014aad6
commit 6eb7ebe021
9 changed files with 40 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/hbm/crafting/PowderRecipes.java
View File

@ -34,7 +34,7 @@ public class PowderRecipes {
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.powder_semtex_mix, 3), new Object[] { ModItems.solid_fuel, ModItems.cordite, "dustSaltpeter" }));
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.powder_semtex_mix, 1), new Object[] { ModItems.solid_fuel, ModItems.ballistite, "dustSaltpeter" }));
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.powder_desh_mix, 1), new Object[] { "dustSmallBoron", "dustSmallBoron", "dustSmallLanthanum", "dustSmallLanthanum", "dustSmallCerium", "dustSmallCobalt", "dustSmallLithium", "dustSmallNeodymium", "dustSmallNiobium" }));
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.powder_desh_mix, 1), new Object[] { "dustTinyBoron", "dustTinyBoron", "dustTinyLanthanum", "dustTinyLanthanum", "dustTinyCerium", "dustTinyCobalt", "dustTinyLithium", "dustTinyNeodymium", "dustTinyNiobium" }));
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.powder_desh_mix, 9), new Object[] { "dustBoron", "dustBoron", "dustLanthanum", "dustLanthanum", "dustCerium", "dustCobalt", "dustLithium", "dustNeodymium", "dustNiobium" }));
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.powder_desh_ready, 1), new Object[] { ModItems.powder_desh_mix, ModItems.nugget_mercury, ModItems.nugget_mercury, "dustCoal" }));

6
src/main/java/com/hbm/hazard/HazardRegistry.java
View File

@ -5,7 +5,6 @@ import static com.hbm.items.ModItems.*;
import com.hbm.hazard.transformer.HazardTransformerRadiationNBT;
import com.hbm.hazard.type.*;
import com.hbm.items.special.ItemHazard;
import com.hbm.items.special.ItemWasteLong;
import com.hbm.items.special.ItemWasteShort;
import com.hbm.lib.RefStrings;
@ -90,6 +89,7 @@ public class HazardRegistry {
public static final float powder_mult = 3.0F;
public static final float powder = ingot * powder_mult;
public static final float powder_tiny = nugget * powder_mult;
public static final float ore = ingot;
public static final float block = 10.0F;
public static final float crystal = block;
public static final float billet = 0.5F;
@ -115,9 +115,9 @@ public class HazardRegistry {
HazardSystem.register(Items.pumpkin_pie, makeData(EXPLOSIVE, 4F));
HazardSystem.register("dustCoal", makeData(COAL, powder));
HazardSystem.register("dustSmallCoal", makeData(COAL, powder_tiny));
HazardSystem.register("dustTinyCoal", makeData(COAL, powder_tiny));
HazardSystem.register("dustLignite", makeData(COAL, powder));
HazardSystem.register("dustSmallLignite", makeData(COAL, powder_tiny));
HazardSystem.register("dustTinyLignite", makeData(COAL, powder_tiny));
HazardSystem.register(ingot_semtex, makeData(EXPLOSIVE, 10F));
HazardSystem.register(block_semtex, makeData(EXPLOSIVE, 40F));

27
src/main/java/com/hbm/inventory/OreDictManager.java
View File

@ -211,21 +211,12 @@ public class OreDictManager {
this.mats = mats;
}
public DictFrame rad(float rad) {
return this.haz(new HazardEntry(HazardRegistry.RADIATION, rad));
}
public DictFrame hot(float time) {
return this.haz(new HazardEntry(HazardRegistry.HOT, time));
}
public DictFrame blinding(float time) {
return this.haz(new HazardEntry(HazardRegistry.BLINDING, time));
}
public DictFrame asbestos(float asb) {
return this.haz(new HazardEntry(HazardRegistry.ASBESTOS, asb));
}
public DictFrame hydro(float h) {
return this.haz(new HazardEntry(HazardRegistry.HYDROACTIVE, h));
}
public DictFrame rad(float rad) { return this.haz(new HazardEntry(HazardRegistry.RADIATION, rad)); }
public DictFrame hot(float time) { return this.haz(new HazardEntry(HazardRegistry.HOT, time)); }
public DictFrame blinding(float time) { return this.haz(new HazardEntry(HazardRegistry.BLINDING, time)); }
public DictFrame asbestos(float asb) { return this.haz(new HazardEntry(HazardRegistry.ASBESTOS, asb)); }
public DictFrame hydro(float h) { return this.haz(new HazardEntry(HazardRegistry.HYDROACTIVE, h)); }
public DictFrame haz(HazardEntry hazard) {
hazards.add(hazard);
return this;
@ -241,7 +232,7 @@ public class OreDictManager {
}
public DictFrame dustSmall(Item... dustSmall) {
hazMult = HazardRegistry.powder_tiny;
return makeItem("dustSmall", dustSmall);
return makeItem("dustTiny", dustSmall);
}
public DictFrame dust(Item... dust) {
hazMult = HazardRegistry.powder;
@ -269,11 +260,11 @@ public class OreDictManager {
return makeBlocks("block", block);
}
public DictFrame ore(Block... ore) {
hazMult = 0.0F;
hazMult = HazardRegistry.ore;
return makeBlocks("ore", ore);
}
public DictFrame oreNether(Block... oreNether) {
hazMult = 0.0F;
hazMult = HazardRegistry.ore;
return makeBlocks("oreNether", oreNether);
}

1
src/main/java/com/hbm/render/block/RenderBlockCT.java
View File

@ -24,7 +24,6 @@ public class RenderBlockCT implements ISimpleBlockRenderingHandler {
rbct.prepWorld(world);
CTContext.loadContext(world, x, y, z, block);
rbct.setRenderBounds(0, 0, 0, 1, 1, 1);
rbct.renderStandardBlock(block, x, y, z);
CTContext.dropContext();

15
src/main/java/com/hbm/render/block/ct/CT.java
View File

@ -32,4 +32,19 @@ public class CT {
public static final int vtr = 17;
public static final int vbl = 18;
public static final int vbr = 19;
/* _____________________
* / I am in great pain. \
* \ Please kill me. /
* ---------------------
* \
* \ \
* \ _\^
* \ _- oo\
* \---- \______
* \ )\
* ||-----|| \
* || ||
*/
}

15
src/main/java/com/hbm/render/block/ct/RenderBlocksCT.java
View File

@ -12,9 +12,6 @@ import net.minecraft.client.renderer.Tessellator;
import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess;
/*
* this was the biggest fucking waste of my time and i wish everyone who thought this was a good idea the nastiest fucking diarrhea
*/
public class RenderBlocksCT extends RenderBlocks {
public static RenderBlocksCT instance = new RenderBlocksCT();
@ -111,7 +108,8 @@ public class RenderBlocksCT extends RenderBlocks {
public void renderFaceZNeg(Block block, double x, double y, double z, IIcon icon) {
//super.renderFaceZNeg(block, x, y, z, icon);
}
/// ORDER: LEXICAL ///
private void drawFace(double[] ftl, double[] ftr, double[] fbl, double[] fbr, IIcon itl, IIcon itr, IIcon ibl, IIcon ibr) {
double[] ftc = avgCoords(ftl, ftr);
@ -128,11 +126,14 @@ public class RenderBlocksCT extends RenderBlocks {
drawSubFace(fcc, this.cc, fcr, this.cr, fbc, this.bc, fbr, this.br, steel);*/
}
/// ORDER: LEXICAL ///
private void drawSubFace(double[] ftl, VertInfo ntl, double[] ftr, VertInfo ntr, double[] fbl, VertInfo nbl, double[] fbr, VertInfo nbr, IIcon icon) {
drawVert(ftr, icon.getMinU(), icon.getMaxV(), ntr);
/// ORDER: ROTATIONAL ///
drawVert(ftl, icon.getMinU(), icon.getMinV(), ntl);
drawVert(ftr, icon.getMaxU(), icon.getMinV(), ntr);
drawVert(fbr, icon.getMaxU(), icon.getMaxV(), nbr);
drawVert(fbl, icon.getMaxU(), icon.getMinV(), nbl);
drawVert(fbl, icon.getMinU(), icon.getMaxV(), nbl);
}
private void drawVert(double[] coord, double u, double v, VertInfo info) {
@ -142,7 +143,7 @@ public class RenderBlocksCT extends RenderBlocks {
private void drawVert(double x, double y, double z, double u, double v, VertInfo info) {
if(this.enableAO) {
tess.setColorOpaque_F(info.red, info.blue, info.green);
tess.setColorOpaque_F(info.red, info.green, info.blue);
tess.setBrightness(info.brightness);
}

9
src/main/java/com/hbm/render/item/ItemRenderMissile.java
View File

@ -16,6 +16,10 @@ public class ItemRenderMissile implements IItemRenderer {
@Override
public boolean handleRenderType(ItemStack item, ItemRenderType type) {
if(MissileMultipart.loadFromStruct(ItemCustomMissile.getStruct(item)) == null)
return false;
switch(type) {
case EQUIPPED:
case EQUIPPED_FIRST_PERSON:
@ -70,11 +74,6 @@ public class ItemRenderMissile implements IItemRenderer {
GL11.glTranslated(7, 14, 0);
GL11.glScaled(-scale, -scale, -scale);
/*if(part.type.name().equals(PartType.FINS.name())) {
GL11.glTranslated(0, 0, 0);
//GL11.glRotated(-45, 1, 0, 0);
}*/
GL11.glRotatef(System.currentTimeMillis() / 25 % 360, 0, -1, 0);
MissilePronter.prontMissile(missile, Minecraft.getMinecraft().renderEngine);

5
src/main/java/com/hbm/render/item/ItemRenderMissilePart.java
View File

@ -52,11 +52,6 @@ public class ItemRenderMissilePart implements IItemRenderer {
double s = 0.4;
GL11.glScaled(s, s, s);
/*if(part.type.name().equals(PartType.FINS.name())) {
GL11.glTranslated(0, 0, 0);
//GL11.glRotated(-45, 1, 0, 0);
}*/
Minecraft.getMinecraft().renderEngine.bindTexture(part.texture);
part.model.renderAll();

3
src/main/java/com/hbm/render/util/MissilePronter.java
View File

@ -10,9 +10,6 @@ public class MissilePronter {
public static void prontMissile(MissileMultipart missile, TextureManager tex) {
//if(!missile.hadFuselage())
// return;
GL11.glPushMatrix();
if(missile.thruster != null && missile.thruster.type.name().equals(PartType.THRUSTER.name())) {