aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitignore4
-rw-r--r--build.gradle9
-rw-r--r--build.properties3
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Fusion_MK4.java63
4 files changed, 40 insertions, 39 deletions
diff --git a/.gitignore b/.gitignore
index f5f4159b45..db95f60f51 100644
--- a/.gitignore
+++ b/.gitignore
@@ -110,7 +110,6 @@ build
config
crash-reports
gradle
-libs
local
logs
modpack
@@ -143,3 +142,6 @@ wip
*.bat
GT++.ipr
GT++.iws
+
+
+out \ No newline at end of file
diff --git a/build.gradle b/build.gradle
index f8aa847bf4..4a44ddbddd 100644
--- a/build.gradle
+++ b/build.gradle
@@ -149,15 +149,12 @@ dependencies {
//shade group: 'org.dom4j', name: 'dom4j', version: '2.1.1'
//compile group: 'org.javassist', name: 'javassist', version: '3.26.0-GA'
-
- //compile files('libs/gregtech-5.08.33-dev.jar')
- //compile files('libs/gregtech-5.09.31-dev.jar')
- //compile files('libs/gregtech-5.09.33-dev.jar')
- //compile files('libs/gregtech-5.09.34.17-dev.jar')
+
// compile("com.github.GTNewHorizons:GT5-Unofficial:experimental-SNAPSHOT:dev") {
// setChanging(true)
// }
- compile files('libs/gregtech-5.09.37.00-dev.jar')
+ compile files('libs/gregtech-5.09.37.05-dev.jar')
+ compile ("com.github.GTNewHorizons:StructureLib:${config.structurelib.version}:deobf")
provided "net.industrial-craft:industrialcraft-2:${config.ic2.version}:dev"
//compile "ic2:IC2Classic:1.2.1.8:dev" - Does not mirror internal class structure or visibility of IC2, won't ever compile.
diff --git a/build.properties b/build.properties
index 7281ca982c..eb716afe64 100644
--- a/build.properties
+++ b/build.properties
@@ -3,7 +3,6 @@ forge.version=10.13.4.1614-1.7.10
ic2.version=2.2.817-experimental
gt.version=5.09.37
ae2.version=rv3-beta-22
-
gtpp.version=1.7.07
-
commit.hash=aa9f04218e5298414f900b9fe61131f7ed26b8f1
+structurelib.version=1.0.6
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Fusion_MK4.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Fusion_MK4.java
index e14175ad4a..e1f3767f60 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Fusion_MK4.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Fusion_MK4.java
@@ -1,7 +1,5 @@
package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.advanced;
-import java.lang.reflect.Method;
-
import gregtech.GT_Mod;
import gregtech.api.enums.Dyes;
import gregtech.api.enums.GT_Values;
@@ -16,45 +14,50 @@ import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Energ
import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input;
import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Output;
import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_FusionComputer;
-
import gtPlusPlus.core.block.ModBlocks;
-import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.util.reflect.ReflectionUtils;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
-
import net.minecraft.block.Block;
import net.minecraft.item.ItemStack;
import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.fluids.FluidStack;
+import java.lang.reflect.Method;
+
public class GregtechMetaTileEntity_Adv_Fusion_MK4 extends GT_MetaTileEntity_FusionComputer {
public static final Method mUpdateHatchTexture;
static {
mUpdateHatchTexture = ReflectionUtils.getMethod(GT_MetaTileEntity_Hatch.class, "updateTexture", int.class);
- }
-
- public GregtechMetaTileEntity_Adv_Fusion_MK4(int aID, String aName, String aNameRegional) {
- super(aID, aName, aNameRegional, 6);
- }
+ }
- public GregtechMetaTileEntity_Adv_Fusion_MK4(String aName) {
- super(aName);
- }
+ public GregtechMetaTileEntity_Adv_Fusion_MK4(int aID, String aName, String aNameRegional) {
+ super(aID, aName, aNameRegional, 6);
+ }
- @Override
- public int tier() {
- return 9;
- }
+ public GregtechMetaTileEntity_Adv_Fusion_MK4(String aName) {
+ super(aName);
+ }
- @Override
- public long maxEUStore() {
- return (640010000L*4) * (Math.min(16, this.mEnergyHatches.size())) / 8L;
- }
+ @Override
+ protected GT_Multiblock_Tooltip_Builder createTooltip() {
+ return new GT_Multiblock_Tooltip_Builder().addInfo(GregtechMetaTileEntity_Adv_Fusion_MK4.class.getName() + ": I don't have any info, please fix me");
+ }
- @Override
+ @Override
+ public int tier() {
+ return 9;
+ }
+
+ @Override
+ public long maxEUStore() {
+ return (640010000L * 4) * (Math.min(16, this.mEnergyHatches.size())) / 8L;
+ }
+
+ @Override
public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
return new GregtechMetaTileEntity_Adv_Fusion_MK4(mName);
}
@@ -103,17 +106,17 @@ public class GregtechMetaTileEntity_Adv_Fusion_MK4 extends GT_MetaTileEntity_Fus
ITexture[] sTexture;
if (aSide == aFacing) {
sTexture = new ITexture[]{
- new GT_RenderedTexture((IIconContainer) Textures.BlockIcons.MACHINE_CASING_FUSION_GLASS,
- Dyes.getModulation(-1, Dyes._NULL.mRGBa)),
- new GT_RenderedTexture(this.getIconOverlay())};
+ new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_FUSION_GLASS,
+ Dyes.getModulation(-1, Dyes._NULL.mRGBa)),
+ new GT_RenderedTexture(this.getIconOverlay())};
} else if (!aActive) {
sTexture = new ITexture[]{
- new GT_RenderedTexture((IIconContainer) Textures.BlockIcons.MACHINE_CASING_FUSION_GLASS,
- Dyes.getModulation(-1, Dyes._NULL.mRGBa))};
+ new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_FUSION_GLASS,
+ Dyes.getModulation(-1, Dyes._NULL.mRGBa))};
} else {
sTexture = new ITexture[]{
- new GT_RenderedTexture((IIconContainer) TexturesGtBlock.TEXTURE_CASING_FUSION_CASING_ULTRA,
- Dyes.getModulation(-1, Dyes._NULL.mRGBa))};
+ new GT_RenderedTexture(TexturesGtBlock.TEXTURE_CASING_FUSION_CASING_ULTRA,
+ Dyes.getModulation(-1, Dyes._NULL.mRGBa))};
}
return sTexture;
}
@@ -339,7 +342,7 @@ public class GregtechMetaTileEntity_Adv_Fusion_MK4 extends GT_MetaTileEntity_Fus
mEfficiencyIncrease = 0;
if (mOutputFluids != null && mOutputFluids.length > 0) {
try {
- GT_Mod.instance.achievements.issueAchivementHatchFluid(aBaseMetaTileEntity.getWorld().getPlayerEntityByName(aBaseMetaTileEntity.getOwnerName()), mOutputFluids[0]);
+ GT_Mod.achievements.issueAchivementHatchFluid(aBaseMetaTileEntity.getWorld().getPlayerEntityByName(aBaseMetaTileEntity.getOwnerName()), mOutputFluids[0]);
} catch (Exception e) {
}
}
generated by cgit (git 2.46.0) at 2025-03-09 23:23:34 +0000