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 branch 'locale_update' of https://github.com/EverMine/Hbm-s-Nuclear-Tech-GIT into locale_update

Browse Source
This commit is contained in:
ItsMakar 2025-02-20 09:31:25 +02:00
commit 66feaf292f
3 changed files with 82 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/hbm/particle/ParticleHaze.java
View File

@ -21,8 +21,8 @@ import net.minecraft.world.World;
public class ParticleHaze extends EntityFX { public class ParticleHaze extends EntityFX {
private static final ResourceLocation texture = new ResourceLocation(RefStrings.MODID + ":textures/particle/haze.png"); private static final ResourceLocation texture = new ResourceLocation(RefStrings.MODID + ":textures/particle/haze.png");
private TextureManager theRenderEngine; private final TextureManager theRenderEngine;
private int maxAge; private final int maxAge;
public ParticleHaze(TextureManager p_i1213_1_, World p_i1218_1_, double p_i1218_2_, double p_i1218_4_, double p_i1218_6_) { public ParticleHaze(TextureManager p_i1213_1_, World p_i1218_1_, double p_i1218_2_, double p_i1218_4_, double p_i1218_6_) {
super(p_i1218_1_, p_i1218_2_, p_i1218_4_, p_i1218_6_); super(p_i1218_1_, p_i1218_2_, p_i1218_4_, p_i1218_6_);
@ -94,6 +94,7 @@ public class ParticleHaze extends EntityFX {
Random rand = new Random(50); Random rand = new Random(50);
GL11.glPushMatrix();
for(int i = 0; i < 25; i++) { for(int i = 0; i < 25; i++) {
double dX = rand.nextGaussian() * 2.5D; double dX = rand.nextGaussian() * 2.5D;
@ -115,9 +116,8 @@ public class ParticleHaze extends EntityFX {
tess.addVertexWithUV((double) (pX + p_70539_3_ * size + p_70539_6_ * size), (double) (pY + p_70539_4_ * size), (double) (pZ + p_70539_5_ * size + p_70539_7_ * size), 0, 0); tess.addVertexWithUV((double) (pX + p_70539_3_ * size + p_70539_6_ * size), (double) (pY + p_70539_4_ * size), (double) (pZ + p_70539_5_ * size + p_70539_7_ * size), 0, 0);
tess.addVertexWithUV((double) (pX + p_70539_3_ * size - p_70539_6_ * size), (double) (pY - p_70539_4_ * size), (double) (pZ + p_70539_5_ * size - p_70539_7_ * size), 0, 1); tess.addVertexWithUV((double) (pX + p_70539_3_ * size - p_70539_6_ * size), (double) (pY - p_70539_4_ * size), (double) (pZ + p_70539_5_ * size - p_70539_7_ * size), 0, 1);
tess.draw(); tess.draw();
GL11.glTranslatef((float) -dX, (float) -dY, (float) -dZ);
} }
GL11.glPopMatrix();
GL11.glAlphaFunc(GL11.GL_GREATER, 0.1F); GL11.glAlphaFunc(GL11.GL_GREATER, 0.1F);
GL11.glDisable(GL12.GL_RESCALE_NORMAL); GL11.glDisable(GL12.GL_RESCALE_NORMAL);

6
src/main/java/com/hbm/particle/ParticleRadiationFog.java
View File

@ -21,7 +21,7 @@ import net.minecraft.world.World;
public class ParticleRadiationFog extends EntityFX { public class ParticleRadiationFog extends EntityFX {
private static final ResourceLocation texture = new ResourceLocation(RefStrings.MODID + ":textures/particle/fog.png"); private static final ResourceLocation texture = new ResourceLocation(RefStrings.MODID + ":textures/particle/fog.png");
private TextureManager theRenderEngine; private final TextureManager theRenderEngine;
private int maxAge; private int maxAge;
public ParticleRadiationFog(TextureManager p_i1213_1_, World p_i1218_1_, double p_i1218_2_, double p_i1218_4_, double p_i1218_6_) { public ParticleRadiationFog(TextureManager p_i1213_1_, World p_i1218_1_, double p_i1218_2_, double p_i1218_4_, double p_i1218_6_) {
@ -95,6 +95,7 @@ public class ParticleRadiationFog extends EntityFX {
Random rand = new Random(50); Random rand = new Random(50);
GL11.glPushMatrix();
for(int i = 0; i < 25; i++) { for(int i = 0; i < 25; i++) {
double dX = (rand.nextGaussian() - 1D) * 2.5D; double dX = (rand.nextGaussian() - 1D) * 2.5D;
@ -116,9 +117,8 @@ public class ParticleRadiationFog extends EntityFX {
tess.addVertexWithUV((double)(pX + p_70539_3_ * size + p_70539_6_ * size), (double)(pY + p_70539_4_ * size), (double)(pZ + p_70539_5_ * size + p_70539_7_ * size), 0, 0); tess.addVertexWithUV((double)(pX + p_70539_3_ * size + p_70539_6_ * size), (double)(pY + p_70539_4_ * size), (double)(pZ + p_70539_5_ * size + p_70539_7_ * size), 0, 0);
tess.addVertexWithUV((double)(pX + p_70539_3_ * size - p_70539_6_ * size), (double)(pY - p_70539_4_ * size), (double)(pZ + p_70539_5_ * size - p_70539_7_ * size), 0, 1); tess.addVertexWithUV((double)(pX + p_70539_3_ * size - p_70539_6_ * size), (double)(pY - p_70539_4_ * size), (double)(pZ + p_70539_5_ * size - p_70539_7_ * size), 0, 1);
tess.draw(); tess.draw();
GL11.glTranslatef((float) -dX, (float) -dY, (float) -dZ);
} }
GL11.glPopMatrix();
GL11.glDisable(GL12.GL_RESCALE_NORMAL); GL11.glDisable(GL12.GL_RESCALE_NORMAL);
GL11.glEnable(GL11.GL_LIGHTING); GL11.glEnable(GL11.GL_LIGHTING);

9
src/main/java/com/hbm/tileentity/machine/TileEntityMachineRotaryFurnace.java
View File

@ -12,6 +12,7 @@ import com.hbm.inventory.gui.GUIMachineRotaryFurnace;
import com.hbm.inventory.material.MaterialShapes; import com.hbm.inventory.material.MaterialShapes;
import com.hbm.inventory.material.Mats; import com.hbm.inventory.material.Mats;
import com.hbm.inventory.material.Mats.MaterialStack; import com.hbm.inventory.material.Mats.MaterialStack;
import com.hbm.inventory.material.NTMMaterial;
import com.hbm.inventory.recipes.RotaryFurnaceRecipes; import com.hbm.inventory.recipes.RotaryFurnaceRecipes;
import com.hbm.inventory.recipes.RotaryFurnaceRecipes.RotaryFurnaceRecipe; import com.hbm.inventory.recipes.RotaryFurnaceRecipes.RotaryFurnaceRecipe;
import com.hbm.lib.Library; import com.hbm.lib.Library;
@ -239,6 +240,10 @@ public class TileEntityMachineRotaryFurnace extends TileEntityMachinePolluting i
this.progress = nbt.getFloat("prog"); this.progress = nbt.getFloat("prog");
this.burnTime = nbt.getInteger("burn"); this.burnTime = nbt.getInteger("burn");
this.maxBurnTime = nbt.getInteger("maxBurn"); this.maxBurnTime = nbt.getInteger("maxBurn");
if (nbt.hasKey("outType")) {
NTMMaterial mat = Mats.matById.get(nbt.getInteger("outType"));
this.output = new MaterialStack(mat, nbt.getInteger("outAmount"));
}
} }
@Override @Override
@ -250,6 +255,10 @@ public class TileEntityMachineRotaryFurnace extends TileEntityMachinePolluting i
nbt.setFloat("prog", progress); nbt.setFloat("prog", progress);
nbt.setInteger("burn", burnTime); nbt.setInteger("burn", burnTime);
nbt.setInteger("maxBurn", maxBurnTime); nbt.setInteger("maxBurn", maxBurnTime);
if (this.output != null) {
nbt.setInteger("outType", this.output.material.id);
nbt.setInteger("outAmount", this.output.amount);
}
} }
public DirPos[] getSteamPos() { public DirPos[] getSteamPos() {