many UX and Performance fixes. also fixed issue #50 / 57 / 62 / 63

gradle.properties

@@ -4,7 +4,7 @@ org.gradle.daemon=false
 # Project
 mcVersion=1.12.2
 forgeVersion=14.23.5.2860
-modVersion=2.1.10
+modVersion=2.2.1
 archiveBase=AdvancedRocketry
 startGitRev=8e676bd
 

src/main/java/zmaster587/advancedRocketry/AdvancedRocketry.java

@@ -628,7 +628,7 @@ public void registerBlocks(RegistryEvent.Register<Block> evt) {
         AdvancedRocketryBlocks.blockForceFieldProjector = new BlockForceFieldProjector(Material.IRON).setUnlocalizedName("forceFieldProjector").setCreativeTab(tabAdvRocketry).setHardness(3f);
         AdvancedRocketryBlocks.blockForceField = new BlockForceField(Material.BARRIER).setBlockUnbreakable().setResistance(6000000.0F).setUnlocalizedName("forceField");
         AdvancedRocketryBlocks.blockVacuumLaser = new BlockFullyRotatable(Material.IRON).setUnlocalizedName("vacuumLaser").setCreativeTab(tabAdvRocketry).setHardness(4f);
-        AdvancedRocketryBlocks.blockPump = new BlockTile(TilePump.class, GuiHandler.guiId.MODULAR.ordinal()).setUnlocalizedName("pump").setCreativeTab(tabAdvRocketry).setHardness(3f);
+        AdvancedRocketryBlocks.blockPump = new BlockPump(TilePump.class, GuiHandler.guiId.MODULAR.ordinal()).setUnlocalizedName("pump").setCreativeTab(tabAdvRocketry).setHardness(3f);
         AdvancedRocketryBlocks.blockSuitWorkStation = new BlockSuitWorkstation(TileSuitWorkStation.class, GuiHandler.guiId.MODULAR.ordinal()).setUnlocalizedName("suitWorkStation").setCreativeTab(tabAdvRocketry).setHardness(3f);
         AdvancedRocketryBlocks.blockPressureTank = new BlockPressurizedFluidTank(Material.IRON).setUnlocalizedName("pressurizedTank").setCreativeTab(tabAdvRocketry).setHardness(3f);
         AdvancedRocketryBlocks.blockSolarGenerator = new BlockSolarGenerator(TileSolarPanel.class, GuiHandler.guiId.MODULAR.ordinal()).setCreativeTab(tabAdvRocketry).setHardness(3f).setUnlocalizedName("solarGenerator");

src/main/java/zmaster587/advancedRocketry/api/ARConfiguration.java

@@ -165,6 +165,10 @@ public class ARConfiguration {
     @ConfigProperty(needsSync = true)
     public double gasCollectionMult;
     @ConfigProperty(needsSync = true)
+    public double gasHarvestAmountMultiplier;
+    @ConfigProperty(needsSync = true)
+    public boolean gasHarvestInfinite;
+    @ConfigProperty(needsSync = true)
     public double terraformSpeed;
     @ConfigProperty
     public boolean terraformRequiresFluid;
@@ -412,6 +416,16 @@ public static void loadPreInit() {
         arConfig.gasCollectionMult = config.get(MISSION, "gasMissionMultiplier", 1.0, "Multiplier for the amount of time gas collection missions take").getDouble();
         harvestableGasses = config.getStringList("harvestableGasses", MISSION, new String[]{}, "list of fluid names that can be harvested as Gas from any gas giant");
         spawnableGasses = config.getStringList("spawnableGasses", MISSION, new String[]{"hydrogen;125;1600;1.0", "helium;125;1600;0.9", "helium3;175;1600;0.2", "oxygen;0;124;1.0", "nitrogen;0;124;1.0", "ammonia;0;124;0.75", "methane;0;124;0.25"}, "list of fluid names that can be spawned as a gas giant. Format is fluid;minGravity;maxGravity;chance");
+        arConfig.gasHarvestAmountMultiplier = config.get(
+            MISSION, "gasHarvestAmountMultiplier", 1.0,
+            "Per-mission harvest cap = 64,000 mB × multiplier. Actual yield = min(cap, total free tank space at launch). Ignored if gasHarvestInfinite=true."
+        ).getDouble();
+
+        arConfig.gasHarvestInfinite = config.get(
+            MISSION, "gasHarvestInfinite", false,
+            "Fill all attached tanks up to their total free space at launch, capped at 2,147,483,647 mB per mission."
+        ).getBoolean();
+
 
         //Energy Production
         arConfig.solarGeneratorMult = config.get(ENERGY, "solarGeneratorMultiplier", 1, "Amount of power per tick the solar generator should produce").getInt();

src/main/java/zmaster587/advancedRocketry/api/DataStorage.java

@@ -20,16 +20,25 @@ public DataStorage(DataType data) {
     }
 
     public boolean setData(int data, DataType dataType) {
-        if (this.dataType == DataStorage.DataType.UNDEFINED)
+        // If empty/typeless, allow adopting the provided type (unless locked)
+        if (this.dataType == DataStorage.DataType.UNDEFINED && !this.locked) {
             this.dataType = dataType;
+        }
 
         if (dataType == DataStorage.DataType.UNDEFINED || dataType == this.dataType) {
             this.data = Math.min(data, maxData);
+
+            // If we just became empty and are not locked, clear type
+            if (!this.locked && this.data == 0) {
+                this.dataType = DataType.UNDEFINED;
+            }
             return true;
         }
         return false;
     }
 
+
+
     public int getData() {
         return data;
     }
@@ -78,20 +87,46 @@ public boolean isLocked() {
      * @param dataType type to add
      * @return data amount added
      */
-    public int addData(int data, DataType dataType, boolean commit) {
-        if ((!this.locked && (dataType == DataStorage.DataType.UNDEFINED)) || dataType == this.dataType || this.dataType == DataStorage.DataType.UNDEFINED) {
+    public int addData(int data, DataType incomingType, boolean commit) {
+        // Snapshot
+        final boolean empty = (this.data == 0);
+        DataType current = this.dataType;
+
+        // Compute effective type without mutating state on simulation
+        DataType effective = current;
+        if (!this.locked && empty) {
+            effective = (incomingType != DataType.UNDEFINED) ? incomingType : DataType.UNDEFINED;
+        }
+
+        // Accept if: unlocked+UNDEFINED (wildcard), same type, or typeless
+        boolean accepts =
+            (!this.locked && incomingType == DataType.UNDEFINED) ||
+            (incomingType == effective) ||
+            (!this.locked && effective == DataType.UNDEFINED);
+
+
+        if (!accepts) return 0;
 
-            if (this.dataType == DataStorage.DataType.UNDEFINED)
-                this.dataType = dataType;
+        int amountToAdd = Math.min(data, this.maxData - this.data);
+        if (amountToAdd <= 0) return 0;
 
-            int amountToAdd = Math.min(data, this.maxData - this.data);
-            if (commit)
-                this.data += amountToAdd;
-            return amountToAdd;
+        if (commit) {
+            // Finalize adoption only on real add
+            if (!this.locked && this.data == 0) {
+                this.dataType = (incomingType != DataType.UNDEFINED) ? incomingType : DataType.UNDEFINED;
+            }
+            this.data += amountToAdd;
+
+            // If still UNDEFINED but we added concrete data (edge case), solidify
+            if (this.dataType == DataType.UNDEFINED && incomingType != DataType.UNDEFINED) {
+                this.dataType = incomingType;
+            }
         }
-        return 0;
+        return amountToAdd;
     }
 
+
+
     /**
      * @param data max amount of data to remove
      * @return amount of data removed
@@ -122,12 +157,15 @@ public void readFromNBT(NBTTagCompound nbt) {
             dataType = DataType.UNDEFINED;
         }
 
-
-        ///TODO: dev compat
         if (nbt.hasKey("locked"))
             locked = nbt.getBoolean("locked");
         else
             locked = false;
+
+        // >>> ADD: heal stale type on empty <<<
+        if (!locked && data == 0) {
+            dataType = DataType.UNDEFINED;
+        }
     }
 
     public enum DataType {

src/main/java/zmaster587/advancedRocketry/api/RocketEvent.java

@@ -35,6 +35,13 @@ public RocketPreLaunchEvent(Entity entity) {
             super(entity);
         }
     }
+    public static class RocketAbortEvent extends RocketEvent {
+        public final String reason;   // optional, for GUIs/logs
+        public RocketAbortEvent(Entity entity, String reason) {
+            super(entity);
+            this.reason = reason;
+        }
+    }
 
     /**
      * Fired before the rocket is finished teleporting to the destination world on the Minecraft Forge EVENT_BUS

src/main/java/zmaster587/advancedRocketry/api/StatsRocket.java

@@ -145,6 +145,10 @@ public float getWeight() {
                 Fluid f = FluidRegistry.getFluid(getOxidizerFluid());
                 fluidWeight += WeightEngine.INSTANCE.getWeight(f, getFuelAmount(FuelType.LIQUID_OXIDIZER));
             }
+            if (FluidRegistry.isFluidRegistered(getWorkingFluid())) {
+                Fluid f = FluidRegistry.getFluid(getWorkingFluid());
+                fluidWeight += WeightEngine.INSTANCE.getWeight(f, getFuelAmount(FuelType.NUCLEAR_WORKING_FLUID));
+            }            
         }
         return weight + fluidWeight;
     }
@@ -554,6 +558,7 @@ public void reset() {
         weight = 0;
         fuelFluid = "null";
         oxidizerFluid = "null";
+        workingFluid = "null";
         drillingPower = 0f;
 
         for (FuelType type : FuelType.values()) {
@@ -720,12 +725,12 @@ public void readFromNBT(NBTTagCompound nbt) {
             this.fuelRateNuclearWorkingFluid = stats.getInteger("fuelRateNuclearWorkingFluid");
             this.fuelRateWarp = stats.getInteger("fuelRateWarp");
 
-            this.fuelBaseRateMonopropellant = stats.getInteger("fuelBaseRateMonopropellant");
-            this.fuelBaseRateBipropellant = stats.getInteger("fuelBaseRateBipropellant");
-            this.fuelBaseRateOxidizer = stats.getInteger("fuelBaseRateOxidizer");
+            this.fuelBaseRateMonopropellant = (int)stats.getFloat("fuelBaseRateMonopropellant");
+            this.fuelBaseRateBipropellant = (int)stats.getFloat("fuelBaseRateBipropellant");
+            this.fuelBaseRateOxidizer = (int)stats.getFloat("fuelBaseRateOxidizer");
             this.fuelBaseRateImpulse = stats.getInteger("fuelBaseRateImpulse");
             this.fuelBaseRateIon = stats.getInteger("fuelBaseRateIon");
-            this.fuelBaseRateNuclearWorkingFluid = stats.getInteger("fuelBaseRateNuclearWorkingFluid");
+            this.fuelBaseRateNuclearWorkingFluid = (int)stats.getFloat("fuelBaseRateNuclearWorkingFluid");
             this.fuelBaseRateWarp = stats.getInteger("fuelBaseRateWarp");
 
 
@@ -766,4 +771,4 @@ else if (obj instanceof NBTTagInt)
             }
         }
     }
-}
+}

src/main/java/zmaster587/advancedRocketry/block/BlockBipropellantRocketMotor.java

@@ -2,6 +2,9 @@
 
 import net.minecraft.block.material.Material;
 import net.minecraft.block.state.IBlockState;
+import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.client.resources.I18n;
+import net.minecraft.client.util.ITooltipFlag;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.item.EntityItem;
 import net.minecraft.entity.player.EntityPlayer;
@@ -11,14 +14,20 @@
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.NonNullList;
 import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.text.TextFormatting;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
 import zmaster587.advancedRocketry.api.ARConfiguration;
 import zmaster587.advancedRocketry.api.IRocketEngine;
+import zmaster587.advancedRocketry.client.TooltipInjector;
 import zmaster587.advancedRocketry.tile.TileBrokenPart;
 import zmaster587.advancedRocketry.util.IBrokenPartBlock;
 import zmaster587.libVulpes.block.BlockFullyRotatable;
 
+import java.util.List;
+
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
@@ -39,6 +48,23 @@ public int getThrust(World world, BlockPos pos) {
         return 10;
     }
 
+    @Override
+    public IBlockState getActualState(@Nonnull IBlockState state, IBlockAccess world, BlockPos pos) {
+        if (world.getBlockState(pos.up()).getBlock() instanceof BlockFuelTank)
+            return state.withProperty(FACING, EnumFacing.DOWN);
+        if (world.getBlockState(pos.down()).getBlock() instanceof BlockFuelTank)
+            return state.withProperty(FACING, EnumFacing.UP);
+        if (world.getBlockState(pos.east()).getBlock() instanceof BlockFuelTank)
+            return state.withProperty(FACING, EnumFacing.EAST);
+        if (world.getBlockState(pos.west()).getBlock() instanceof BlockFuelTank)
+            return state.withProperty(FACING, EnumFacing.WEST);
+        if (world.getBlockState(pos.south()).getBlock() instanceof BlockFuelTank)
+            return state.withProperty(FACING, EnumFacing.SOUTH);
+        if (world.getBlockState(pos.north()).getBlock() instanceof BlockFuelTank)
+            return state.withProperty(FACING, EnumFacing.NORTH);
+        return super.getActualState(state, world, pos);
+    }
+
     @Override
     public int getFuelConsumptionRate(World world, int x, int y, int z) {
         return 1;
@@ -102,6 +128,13 @@ public TileEntity createTileEntity(final World worldIn, final IBlockState state)
         return new TileBrokenPart(10, (float) ARConfiguration.getCurrentConfig().increaseWearIntensityProb);
     }
 
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void addInformation(ItemStack stack, @Nullable World world, List<String> tooltip, ITooltipFlag flag) {
+        int insertAt = TooltipInjector.computeInsertIndex(tooltip, flag.isAdvanced());
+        TooltipInjector.renderShiftAlt(stack, tooltip, "tooltip.advancedrocketry.bipropmotor", insertAt);
+    }
+
     @Override
     public ItemStack getDropItem(final IBlockState state, final World world, final @Nullable TileBrokenPart te) {
         ItemStack drop = new ItemStack(this.getItemDropped(state, world.rand, 0));

src/main/java/zmaster587/advancedRocketry/block/BlockDoor2.java

@@ -3,6 +3,7 @@
 import net.minecraft.block.BlockDoor;
 import net.minecraft.block.material.Material;
 import net.minecraft.block.state.IBlockState;
+import net.minecraft.client.util.ITooltipFlag;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.Items;
 import net.minecraft.item.Item;
@@ -14,9 +15,13 @@
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 import zmaster587.advancedRocketry.api.AdvancedRocketryItems;
+import zmaster587.advancedRocketry.client.TooltipInjector;
 
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import javax.annotation.ParametersAreNullableByDefault;
+
+import java.util.List;
 import java.util.Random;
 
 public class BlockDoor2 extends BlockDoor {
@@ -32,7 +37,6 @@ public ItemStack getItem(World worldIn, BlockPos pos, IBlockState state) {
         return new ItemStack(AdvancedRocketryItems.itemSmallAirlockDoor);
     }
 
-
     @Override
     @Nonnull
     public Item getItemDropped(IBlockState state, Random rand, int fortune) {
@@ -45,5 +49,5 @@ public boolean onBlockActivated(World worldIn, BlockPos pos,
                                     IBlockState state, EntityPlayer playerIn, EnumHand hand, EnumFacing side, float hitX, float hitY,
                                     float hitZ) {
         return false;
-    }
+    } 
 }

src/main/java/zmaster587/advancedRocketry/block/BlockForceFieldProjector.java

@@ -1,10 +1,18 @@
 package zmaster587.advancedRocketry.block;
 
+import java.util.List;
+import javax.annotation.Nullable;
+
 import net.minecraft.block.material.Material;
 import net.minecraft.block.state.IBlockState;
+import net.minecraft.client.util.ITooltipFlag;
+import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
+import zmaster587.advancedRocketry.client.TooltipInjector;
 import zmaster587.advancedRocketry.tile.TileForceFieldProjector;
 import zmaster587.libVulpes.block.BlockFullyRotatable;
 
@@ -33,5 +41,10 @@ public void breakBlock(World worldIn, BlockPos pos, IBlockState state) {
     public TileEntity createTileEntity(World world, IBlockState state) {
         return new TileForceFieldProjector();
     }
-
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void addInformation(ItemStack stack, @Nullable World world, List<String> tooltip, ITooltipFlag flag) {
+        int insertAt = TooltipInjector.computeInsertIndex(tooltip, flag.isAdvanced());
+        TooltipInjector.renderShiftAlt(stack, tooltip, "tooltip.advancedrocketry.forcefieldprojector", insertAt);
+    }
 }

src/main/java/zmaster587/advancedRocketry/block/BlockIntake.java

@@ -1,19 +1,35 @@
 package zmaster587.advancedRocketry.block;
 
+import java.util.List;
+
+import javax.annotation.Nullable;
+
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.block.state.IBlockState;
+import net.minecraft.client.util.ITooltipFlag;
+import net.minecraft.item.ItemStack;
+import net.minecraft.world.World;
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
 import zmaster587.advancedRocketry.api.IIntake;
+import zmaster587.advancedRocketry.client.TooltipInjector;
 
 public class BlockIntake extends Block implements IIntake {
 
     public BlockIntake(Material material) {
         super(material);
     }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void addInformation(ItemStack stack, @Nullable World world, List<String> tooltip, ITooltipFlag flag) {
+        int insertAt = TooltipInjector.computeInsertIndex(tooltip, flag.isAdvanced());
+        TooltipInjector.renderShiftAlt(stack, tooltip, "tooltip.advancedrocketry.intake", insertAt);
+    }
 
     @Override
     public int getIntakeAmt(IBlockState state) {
-        return 10;
+        return 1;
     }
-
 }