aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTechnus <daniel112092@gmail.com>2017-03-10 08:33:37 +0100
committerTechnus <daniel112092@gmail.com>2017-03-10 08:33:37 +0100
commit2bffbd4a856a694c08f4ef4f9dec9c395122c8e0 (patch)
tree8b8a6e85f062a3f389c85977022c69868883d750
parentb7e0b712f8f1b71c9fce9e198c0366c9551025bb (diff)
downloadGT5-Unofficial-2bffbd4a856a694c08f4ef4f9dec9c395122c8e0.tar.gz
GT5-Unofficial-2bffbd4a856a694c08f4ef4f9dec9c395122c8e0.tar.bz2
GT5-Unofficial-2bffbd4a856a694c08f4ef4f9dec9c395122c8e0.zip
Cleanup, minor values change
-rw-r--r--src/main/java/com/github/technus/tectech/elementalMatter/commonValues.java15
-rw-r--r--src/main/java/com/github/technus/tectech/elementalMatter/definitions/dHadronDefinition.java2
-rw-r--r--src/main/java/com/github/technus/tectech/elementalMatter/definitions/eBosonDefinition.java2
-rw-r--r--src/main/java/com/github/technus/tectech/elementalMatter/definitions/eLeptonDefinition.java10
4 files changed, 14 insertions, 15 deletions
diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/commonValues.java b/src/main/java/com/github/technus/tectech/elementalMatter/commonValues.java
index 124071ff38..1a1ff56aca 100644
--- a/src/main/java/com/github/technus/tectech/elementalMatter/commonValues.java
+++ b/src/main/java/com/github/technus/tectech/elementalMatter/commonValues.java
@@ -6,20 +6,19 @@ import net.minecraft.util.EnumChatFormatting;
* Created by danie_000 on 11.01.2017.
*/
public final class commonValues {
- public final static String tecMark = EnumChatFormatting.BLUE + "Tec" + EnumChatFormatting.DARK_BLUE + "Tech"
- + EnumChatFormatting.BLUE + ": Elemental Matter";
+ public final static String tecMark =
+ EnumChatFormatting.BLUE + "Tec" +
+ EnumChatFormatting.DARK_BLUE + "Tech" +
+ EnumChatFormatting.BLUE + ": Elemental Matter";
public final static byte decayAt = 0;// hatches compute dacays
- public final static byte multiPurge1At = 2;// multiblocks clean their
- // hatches 1
+ public final static byte multiPurge1At = 2;// multiblocks clean their hatches 1
public final static byte moveAt = 4;// move stuff around
public final static byte recipeAt = 6;// move stuff around
- public final static byte multiPurge2At = 8;// multiblocks clean their
- // hatches 2
+ public final static byte multiPurge2At = 8;// multiblocks clean their hatches 2
public final static byte overflowAt = 10;// then hatches clean themselves
// - in case some hatches are not in multiblock structure
public final static byte multiCheckAt = 12;// multiblock checks it's state
- public final static byte disperseAt = 14;// overflow hatches perform
- // disperse
+ public final static byte disperseAt = 14;// overflow hatches perform disperse
public final static boolean DEBUGMODE = true;
}
diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/definitions/dHadronDefinition.java b/src/main/java/com/github/technus/tectech/elementalMatter/definitions/dHadronDefinition.java
index 2af2acf328..9b615168bd 100644
--- a/src/main/java/com/github/technus/tectech/elementalMatter/definitions/dHadronDefinition.java
+++ b/src/main/java/com/github/technus/tectech/elementalMatter/definitions/dHadronDefinition.java
@@ -79,7 +79,7 @@ public final class dHadronDefinition extends cElementalDefinition {
this.mass = mass * 5.543F * (float) mult;//yes it becomes heavier
if (this.mass == protonMass && this.amount == 3) this.rawLifeTime = 1e35F;
- else if (this.mass == neutronMass && this.amount == 3) this.rawLifeTime = 17630F;
+ else if (this.mass == neutronMass && this.amount == 3) this.rawLifeTime = 882F;
else {
if (this.amount == 3) {
this.rawLifeTime = (1.34F / this.mass) * (float) Math.pow(9.81, charge);
diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/definitions/eBosonDefinition.java b/src/main/java/com/github/technus/tectech/elementalMatter/definitions/eBosonDefinition.java
index 648b47d2ad..21f1ff9a20 100644
--- a/src/main/java/com/github/technus/tectech/elementalMatter/definitions/eBosonDefinition.java
+++ b/src/main/java/com/github/technus/tectech/elementalMatter/definitions/eBosonDefinition.java
@@ -8,7 +8,7 @@ import com.github.technus.tectech.elementalMatter.classes.cElementalPrimitive;
* Created by danie_000 on 22.10.2016.
*/
public final class eBosonDefinition extends cElementalPrimitive {
- public static final eBosonDefinition boson_Y__ = new eBosonDefinition("Photon", "\u03b3", 0, 1e-19F, 0, -1,27);
+ public static final eBosonDefinition boson_Y__ = new eBosonDefinition("Photon", "\u03b3", 0, 1e-18F, 0, -1,27);
public static final eBosonDefinition boson_H__ = new eBosonDefinition("Higgs", "\u0397", 0, 126.09e9F, 0, -2,28);
//deadEnd
public static final cElementalDecay deadEnd = new cElementalDecay(boson_Y__,boson_Y__);
diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/definitions/eLeptonDefinition.java b/src/main/java/com/github/technus/tectech/elementalMatter/definitions/eLeptonDefinition.java
index 40b0f13ad8..176f0e1950 100644
--- a/src/main/java/com/github/technus/tectech/elementalMatter/definitions/eLeptonDefinition.java
+++ b/src/main/java/com/github/technus/tectech/elementalMatter/definitions/eLeptonDefinition.java
@@ -27,12 +27,12 @@ public final class eLeptonDefinition extends cElementalPrimitive {
}
public static void run() {
- lepton_e.init(lepton_e_, 10000F, 2, 3,
+ lepton_e.init(lepton_e_, 100000F, 2, 3,
new cElementalDecay(0.9F, lepton_e),
new cElementalDecay(0.05F, nothing),
eBosonDefinition.deadEnd,//makes photons and don't care
new cElementalDecay(lepton_e, eBosonDefinition.boson_Y__));
- lepton_m.init(lepton_m_, 1.1e-7F, 0, 1,
+ lepton_m.init(lepton_m_, 2.197019e-6F, 0, 1,
new cElementalDecay(0.9F, lepton_e, lepton_Ve_, lepton_Vm),
eBosonDefinition.deadEnd);//makes photons and don't care
lepton_t.init(lepton_t_, 2.906e-13F, 1, 3,
@@ -41,15 +41,15 @@ public final class eLeptonDefinition extends cElementalPrimitive {
new cElementalDecay(0.05F, lepton_m, lepton_Vm_, lepton_Vt, eBosonDefinition.boson_H__),
eBosonDefinition.deadEnd);//makes photons and don't care
- lepton_e_.init(lepton_e, 9000F, 2, 3,
+ lepton_e_.init(lepton_e, 100000F, 2, 3,
new cElementalDecay(0.9F, lepton_e_),
new cElementalDecay(0.05F, nothing),
eBosonDefinition.deadEnd,//makes photons and don't care
new cElementalDecay(lepton_e_, eBosonDefinition.boson_Y__));
- lepton_m_.init(lepton_m, 1.1e-7F, 0, 1,
+ lepton_m_.init(lepton_m, 2.197e-6F, 0, 1,
new cElementalDecay(0.9F, lepton_e_, lepton_Ve, lepton_Vm_),
eBosonDefinition.deadEnd);//makes photons and don't care
- lepton_t_.init(lepton_t, 2.906e-13F, 1, 3,
+ lepton_t_.init(lepton_t, 2.9e-13F, 1, 3,
new cElementalDecay(0.8F, lepton_m_, lepton_Vm, lepton_Vt_, eBosonDefinition.boson_Y__),
new cElementalDecay(0.1F, lepton_e_, lepton_Ve, lepton_Vm_),
new cElementalDecay(0.05F, lepton_m_, lepton_Vm, lepton_Vt_, eBosonDefinition.boson_H__),