Fix/motor render

.gitignore

@@ -21,6 +21,7 @@ output
 # other
 eclipse
 run
+run-server
 refresh.bat
 AdvancedRocketry.txt
 changelog.html

build.gradle.kts

@@ -63,7 +63,7 @@ tasks.compileJava {
 
 
 minecraft {
-    mappings("snapshot", "20170624-1.12")
+    mappings("snapshot", "20171003-1.12")
 
     accessTransformer(file("src/main/resources/META-INF/accessTransformer.cfg"))
 
@@ -131,10 +131,10 @@ repositories {
         name = "ModMaven"
         url = uri("https://modmaven.k-4u.nl")
     }
-    maven {
-        name = "Galacticraft"
-        url = uri("https://maven.galacticraft.dev/repository/legacy-releases/")
-    }
+    //maven {
+    //    name = "Galacticraft"
+    //    url = uri("https://maven.galacticraft.dev/repository/legacy-releases/")
+    //}
 //    maven {
 //        name = "LibVulpes"
 //        url = uri("http://maven.dmodoomsirius.me/")
@@ -152,15 +152,15 @@ dependencies {
     //compileOnly("net.industrial-craft:industrialcraft-2:$icVersion:dev")
     //implementation("zmaster587.libVulpes:LibVulpes:$mcVersion-$libVulpesVersion-$libVulpesBuildNum-deobf")
 
-    compileOnly(fg.deobf("dev.galacticraft:galacticraft-legacy:$gcVersion"))
-
+    //compileOnly(fg.deobf("dev.galacticraft:galacticraft-legacy:$gcVersion"))
+    compileOnly(fg.deobf("curse.maven:galacticraft-legacy-564236:4671122"))
     compileOnly(fg.deobf("mezz.jei:jei_${mcVersion}:${jeiVersion}:api"))
-    runtimeOnly(fg.deobf("mezz.jei:jei_${mcVersion}:${jeiVersion}"))
+    implementation(fg.deobf("mezz.jei:jei_${mcVersion}:${jeiVersion}")) // Sorry but it won't start wihout jei...
+    //runtimeOnly(fg.deobf("mezz.jei:jei_${mcVersion}:${jeiVersion}")) // I think this crashes the game for me when running from IntelliJ
 
     implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar"))))
 
     implementation ("net.minecraftforge:mergetool:0.2.3.3")
-    // implementation ("zmaster587.libVulpes:libVulpes:1.12.2-0.4.2+:deobf")
 }
 
 tasks.processResources {

gradle.properties

@@ -4,12 +4,10 @@ org.gradle.daemon=false
 # Project
 mcVersion=1.12.2
 forgeVersion=14.23.5.2860
-modVersion=2.0.11
+modVersion=2.1.3
 archiveBase=AdvancedRocketry
 startGitRev=8e676bd
 
 # Dependencies
-libVulpesVersion=0.4.3
+libVulpesVersion=0.5.0
 jeiVersion=4.16.1.301
-icVersion=2.7.39-ex111
-gcVersion=4.0.6

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
+#Sun Jul 07 14:46:24 CEST 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
-networkTimeout=10000
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

settings.gradle.kts

@@ -1,6 +1,7 @@
 pluginManagement {
     repositories {
         gradlePluginPortal()
+        mavenCentral()
         maven {
             name = "MinecraftForge"
             url = uri("https://maven.minecraftforge.net/")
@@ -9,6 +10,10 @@ pluginManagement {
             name = "FancyGradle"
             url = uri("https://maven.gofancy.wtf/releases")
         }
+        maven { url = uri("https://plugins.gradle.org/m2/") }
+        maven {
+            url = uri("https://oss.sonatype.org/content/repositories/snapshots/")
+        }
     }
 }
 

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

@@ -351,6 +351,7 @@ public void preInit(FMLPreInitializationEvent event) {
 
         //TileEntity Registration ---------------------------------------------------------------------------------------------
         GameRegistry.registerTileEntity(TileBrokenPart.class, "ARbrokenPart");
+        GameRegistry.registerTileEntity(TileRocketServiceStation.class, "ARserviceStation");
         GameRegistry.registerTileEntity(TileRocketAssemblingMachine.class, "ARrocketBuilder");
         GameRegistry.registerTileEntity(TileWarpCore.class, "ARwarpCore");
         //GameRegistry.registerTileEntity(TileModelRender.class, "ARmodelRenderer");
@@ -590,6 +591,12 @@ public void registerItems(RegistryEvent.Register<Item> evt) {
         OreDictionary.registerOre("slab", new ItemStack(Blocks.STONE_SLAB));
         OreDictionary.registerOre("blockWarpCoreCore", new ItemStack(Blocks.GOLD_BLOCK));
         OreDictionary.registerOre("blockWarpCoreRim", MaterialRegistry.getMaterialFromName("Titanium").getProduct(AllowedProducts.getProductByName("BLOCK")));
+
+        Item.getItemFromBlock(AdvancedRocketryBlocks.blockEngine).setMaxDamage(10);
+        Item.getItemFromBlock(AdvancedRocketryBlocks.blockAdvEngine).setMaxDamage(10);
+        Item.getItemFromBlock(AdvancedRocketryBlocks.blockBipropellantEngine).setMaxDamage(10);
+        Item.getItemFromBlock(AdvancedRocketryBlocks.blockAdvBipropellantEngine).setMaxDamage(10);
+        Item.getItemFromBlock(AdvancedRocketryBlocks.blockNuclearEngine).setMaxDamage(10);
     }
 
     @SubscribeEvent(priority = EventPriority.HIGH)
@@ -668,6 +675,7 @@ public void registerBlocks(RegistryEvent.Register<Block> evt) {
         AdvancedRocketryBlocks.blockIntake = new BlockIntake(Material.IRON).setUnlocalizedName("gasIntake").setCreativeTab(tabAdvRocketry).setHardness(3f);
         AdvancedRocketryBlocks.blockDrill = new BlockMiningDrill().setUnlocalizedName("drill").setCreativeTab(tabAdvRocketry).setHardness(3f);
         AdvancedRocketryBlocks.blockLandingFloat = new Block(Material.IRON).setUnlocalizedName("landingfloat").setCreativeTab(tabAdvRocketry).setHardness(1).setResistance(1f);
+        AdvancedRocketryBlocks.blockServiceMonitor = new Block(Material.IRON).setUnlocalizedName("servicemonitor").setCreativeTab(tabAdvRocketry).setHardness(1).setResistance(1f);
         //Assembly machines
         AdvancedRocketryBlocks.blockRocketBuilder = new BlockTileWithMultitooltip(TileRocketAssemblingMachine.class, GuiHandler.guiId.MODULARNOINV.ordinal()).setUnlocalizedName("rocketAssembler").setCreativeTab(tabAdvRocketry).setHardness(3f);
         AdvancedRocketryBlocks.blockStationBuilder = new BlockTileWithMultitooltip(TileStationAssembler.class, GuiHandler.guiId.MODULAR.ordinal()).setUnlocalizedName("stationAssembler").setCreativeTab(tabAdvRocketry).setHardness(3f);
@@ -678,6 +686,7 @@ public void registerBlocks(RegistryEvent.Register<Block> evt) {
         AdvancedRocketryBlocks.blockMonitoringStation = new BlockTileNeighborUpdate(TileRocketMonitoringStation.class, GuiHandler.guiId.MODULARNOINV.ordinal()).setCreativeTab(tabAdvRocketry).setHardness(3f).setUnlocalizedName("monitoringstation");
         AdvancedRocketryBlocks.blockSatelliteControlCenter = new BlockTile(TileSatelliteTerminal.class, GuiHandler.guiId.MODULAR.ordinal()).setCreativeTab(tabAdvRocketry).setHardness(3f).setUnlocalizedName("satelliteMonitor");
         AdvancedRocketryBlocks.blockTerraformingTerminal = new BlockTileTerraformer(TileTerraformingTerminal.class, GuiHandler.guiId.MODULAR.ordinal()).setCreativeTab(tabAdvRocketry).setHardness(3f).setUnlocalizedName("terraformingTerminal");
+        AdvancedRocketryBlocks.blockServiceStation = new BlockTile(TileRocketServiceStation.class, GuiHandler.guiId.MODULARNOINV.ordinal()).setCreativeTab(tabAdvRocketry).setHardness(3f).setUnlocalizedName("serviceStation");
 
         //Station machines
         AdvancedRocketryBlocks.blockWarpShipMonitor = new BlockWarpController(TileWarpController.class, GuiHandler.guiId.MODULARNOINV.ordinal()).setCreativeTab(tabAdvRocketry).setHardness(3f).setUnlocalizedName("stationmonitor");
@@ -838,12 +847,14 @@ public void registerBlocks(RegistryEvent.Register<Block> evt) {
         LibVulpesBlocks.registerBlock(AdvancedRocketryBlocks.blockIntake.setRegistryName("intake"));
         LibVulpesBlocks.registerBlock(AdvancedRocketryBlocks.blockDrill.setRegistryName("drill"));
         LibVulpesBlocks.registerBlock(AdvancedRocketryBlocks.blockLandingFloat.setRegistryName("landingfloat"));
+        LibVulpesBlocks.registerBlock(AdvancedRocketryBlocks.blockServiceMonitor.setRegistryName("servicemonitor"));
         //Assembly machines
         LibVulpesBlocks.registerBlock(AdvancedRocketryBlocks.blockRocketBuilder.setRegistryName("rocketBuilder"));
         LibVulpesBlocks.registerBlock(AdvancedRocketryBlocks.blockStationBuilder.setRegistryName("stationBuilder"));
         LibVulpesBlocks.registerBlock(AdvancedRocketryBlocks.blockDeployableRocketBuilder.setRegistryName("deployableRocketBuilder"));
         //Infrastructure machines
         LibVulpesBlocks.registerBlock(AdvancedRocketryBlocks.blockLoader.setRegistryName("loader"), ItemBlockMeta.class, false);
+        LibVulpesBlocks.registerBlock(AdvancedRocketryBlocks.blockServiceStation.setRegistryName("serviceStation"));
         LibVulpesBlocks.registerBlock(AdvancedRocketryBlocks.blockFuelingStation.setRegistryName("fuelingStation"));
         LibVulpesBlocks.registerBlock(AdvancedRocketryBlocks.blockMonitoringStation.setRegistryName("monitoringStation"));
         LibVulpesBlocks.registerBlock(AdvancedRocketryBlocks.blockSatelliteControlCenter.setRegistryName("satelliteControlCenter"));

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

@@ -236,6 +236,8 @@ public class ARConfiguration {
     @ConfigProperty
     public int planetDiscoveryChance;
     @ConfigProperty
+    public boolean allowNonArBiomesInTerraforming;
+    @ConfigProperty
     public double oxygenVentPowerMultiplier;
     @ConfigProperty
     public boolean skyOverride;
@@ -272,15 +274,21 @@ public class ARConfiguration {
     @ConfigProperty(needsSync = true)
     public boolean experimentalSpaceFlight;
 
-    public ARConfiguration() {
+    @ConfigProperty
+    public boolean advancedWeightSystem;
 
-    }
+    @ConfigProperty
+    public boolean partsWearSystem;
+
+    @ConfigProperty
+    public double increaseWearIntensityProb;
+
+    public ARConfiguration() {}
 
     public ARConfiguration(ARConfiguration config) {
         Field[] fields = ARConfiguration.class.getDeclaredFields();
         List<Field> fieldList = new ArrayList<>(fields.length);
 
-
         // getDeclaredFields returns an unordered list, so we need to sort them
         for (Field field : fields) {
             if (field.isAnnotationPresent(ConfigProperty.class))
@@ -355,7 +363,7 @@ public static void loadPreInit() {
         arConfig.crystalliserMaximumGravity = (float) config.get(Configuration.CATEGORY_GENERAL, "crystalliserMaximumGravity", 0f, "Maximum gravity the crystalliser will function at. Use 0.0 to disable!").getDouble();
         arConfig.enableLaserDrill = config.get(Configuration.CATEGORY_GENERAL, "EnableLaserDrill", true, "Enables the laser drill machine").getBoolean();
         arConfig.spaceLaserPowerMult = (float) config.get(Configuration.CATEGORY_GENERAL, "LaserDrillPowerMultiplier", 1d, "Power multiplier for the laser drill machine").getDouble();
-        arConfig.laserDrillPlanet = config.get(Configuration.CATEGORY_GENERAL, "laserDrillPlanet", false, "If true the orbital laser will actually mine blocks on the planet below (currently not working)").getBoolean();
+        arConfig.laserDrillPlanet = config.get(Configuration.CATEGORY_GENERAL, "laserDrillPlanet", false, "If true the orbital laser will actually mine blocks on the planet below").getBoolean();
         String[] str = config.getStringList("spaceLaserDimIdBlackList", Configuration.CATEGORY_GENERAL, new String[]{}, "Laser drill will not mine these dimension");
         arConfig.enableTerraforming = config.get(Configuration.CATEGORY_GENERAL, "EnableTerraforming", true, "Enables terraforming items and blocks").getBoolean();
         arConfig.terraformSpeed = config.get(Configuration.CATEGORY_GENERAL, "terraformMult", 1f, "Multplier for atmosphere change speed").getDouble();
@@ -364,6 +372,7 @@ public static void loadPreInit() {
         arConfig.terraformliquidRate = config.get(Configuration.CATEGORY_GENERAL, "TerraformerFluidConsumeRate", 40, "how many millibuckets/t are required to keep the terraformer running").getInt();
         arConfig.allowTerraformNonAR = config.get(Configuration.CATEGORY_GENERAL, "allowTerraformingNonARWorlds", false, "If true dimensions not added by AR can be terraformed, including the overworld").getBoolean();
         arConfig.enableGravityController = config.get(Configuration.CATEGORY_GENERAL, "enableGravityMachine", true, "If false the gravity controller cannot be built or used").getBoolean();
+        arConfig.allowNonArBiomesInTerraforming = config.get(Configuration.CATEGORY_GENERAL, "allowNonArBiomesInTerraforming", false, "non-ar biomes from mods with custom world gen can not be decorated in terraforming. If you want fully decorated terraforming with only default biomes, set this to false").getBoolean();
 
         //Oxygen
         arConfig.enableOxygen = config.get(OXYGEN, "EnableAtmosphericEffects", true, "If true, allows players being hurt due to lack of oxygen and allows effects from non-standard atmosphere types").getBoolean();
@@ -446,6 +455,9 @@ public static void loadPreInit() {
         arConfig.gravityAffectsFuel = config.get(ROCKET, "gravityAffectsFuels", true, "If true planets with higher gravity require more fuel and lower gravity would require less").getBoolean();
         arConfig.launchingDestroysBlocks = config.get(ROCKET, "launchBlockDestruction", false, "If true rocket launches will kill plants, glass soil, turn rock into lava, and more").getBoolean();
         blackListRocketBlocksStr = config.getStringList("rocketBlockBlackList", ROCKET, new String[]{"minecraft:portal", "minecraft:bedrock", "minecraft:snow_layer", "minecraft:water", "minecraft:flowing_water", "minecraft:lava", "minecraft:flowing_lava", "minecraft:fire", "advancedrocketry:rocketfire"}, "Mod:Blockname  for example \"minecraft:chest\"");
+        arConfig.advancedWeightSystem = config.get(ROCKET, "advancedWeightSystem", true, "Enables advanced weight system which computes rocket weight, including the handled inventories. Block weights are stores in weights.json").getBoolean();
+        arConfig.partsWearSystem = config.get(ROCKET, "partsWearSystem", true, "Enables rocket parts wear subsystem. Every rocket start it has probability to explode based on parts' wear intensities").getBoolean();
+        arConfig.increaseWearIntensityProb = config.get(ROCKET, "increaseWearIntensityProb", 0.025, "Every rocket usage every part has this probability to increase wear intensity").getDouble();
 
         //Ore and worldgen configuration
         //Ore configuration

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

@@ -28,6 +28,7 @@ public class AdvancedRocketryBlocks {
     public static Block blockBipropellantFuelTank;
     public static Block blockOxidizerFuelTank;
     public static Block blockFuelingStation;
+    public static Block blockServiceStation;
     public static Block blockMonitoringStation, blockSatelliteBuilder, blockSatelliteControlCenter;
     public static Block blockNuclearFuelTank;
     public static Block blockMoonTurf, blockHotTurf;
@@ -106,4 +107,5 @@ public class AdvancedRocketryBlocks {
     public static Block blockSolarArray;
     public static Block blockSolarArrayPanel;
     public static Block blockRocketFire;
+    public static Block blockServiceMonitor;
 }

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

@@ -137,7 +137,7 @@ public static SatelliteProperties getSatelliteProperties(@Nonnull ItemStack stac
 
             if (nbt != null) {
                 if (stack.getItem() instanceof ItemSatellite) {
-                    SatelliteProperties properties = new SatelliteProperties(nbt.getInteger("powerGeneration"), nbt.getInteger("powerStorage"), nbt.getString("dataType"), nbt.getInteger("maxData"));
+                    SatelliteProperties properties = new SatelliteProperties(nbt.getInteger("powerGeneration"), nbt.getInteger("powerStorage"), nbt.getString("dataType"), nbt.getInteger("maxData"), nbt.getFloat("weight"));
                     properties.setId(SatelliteRegistry.getSatelliteId(stack));
                     return properties;
                 }

src/main/java/zmaster587/advancedRocketry/api/satellite/SatelliteProperties.java

@@ -9,17 +9,20 @@ public class SatelliteProperties implements IWeighted {
     private int powerGeneration, powerStorage, maxData;
     private long id;
     private String satType;
+    private float weight;
+
     public SatelliteProperties() {
         satType = null;
         id = -1;
     }
 
-    public SatelliteProperties(int powerGeneration, int powerStorage, String satType, int maxData) {
+    public SatelliteProperties(int powerGeneration, int powerStorage, String satType, int maxData, float weight) {
         this();
         this.powerGeneration = powerGeneration;
         this.powerStorage = powerStorage;
         this.satType = satType;
         this.maxData = maxData;
+        this.weight = weight;
     }
 
     /**
@@ -79,7 +82,7 @@ public SatelliteProperties setPowerGeneration(int powerGeneration) {
     }
 
     public float getWeight() {
-        return 50 + getPowerStorage() * 0.1F + getPowerGeneration() * 0.2F + getMaxDataStorage() * 0.01F;
+        return this.weight;
     }
 
     /**
@@ -136,6 +139,7 @@ public void writeToNBT(NBTTagCompound nbt) {
         nbt.setString("dataType", satType);
         nbt.setLong("satId", id);
         nbt.setInteger("maxData", maxData);
+        nbt.setFloat("weight", weight);
     }
 
     public void readFromNBT(NBTTagCompound nbt) {
@@ -144,6 +148,7 @@ public void readFromNBT(NBTTagCompound nbt) {
         satType = nbt.getString("dataType");
         id = nbt.getLong("satId");
         maxData = nbt.getInteger("maxData");
+        weight = nbt.getFloat("weight");
     }
 
     public enum Property {

src/main/java/zmaster587/advancedRocketry/atmosphere/AtmosphereHandler.java

@@ -135,6 +135,8 @@ public static void onBlockChange(@Nonnull World world, @Nonnull BlockPos bpos) {
             }
 
 
+            // sure.. causes stackoverflow left right center
+            /*
             else if (!handler.getAtmosphereType(bpos).allowsCombustion()) {
                 if (world.getBlockState(bpos).getBlock().isLeaves(world.getBlockState(bpos), world, bpos)) {
                     if (!(Boolean)world.getBlockState(bpos).getValue(BlockLeaves.CHECK_DECAY)) {
@@ -152,6 +154,7 @@ else if (!handler.getAtmosphereType(bpos).allowsCombustion()) {
                     world.setBlockState(bpos, Blocks.DIRT.getDefaultState());
                 }
             }
+             */
 
             //Gasses should automatically vaporize and dissipate
             if (handler.getAtmosphereType(bpos) == AtmosphereType.VACUUM) {

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

@@ -1,8 +1,14 @@
 package zmaster587.advancedRocketry.block;
 
 import net.minecraft.block.material.Material;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
+import zmaster587.advancedRocketry.api.ARConfiguration;
+import zmaster587.advancedRocketry.tile.TileBrokenPart;
+
+import javax.annotation.Nullable;
 
 public class BlockAdvancedBipropellantRocketMotor extends BlockBipropellantRocketMotor {
 
@@ -19,4 +25,10 @@ public int getThrust(World world, BlockPos pos) {
     public int getFuelConsumptionRate(World world, int x, int y, int z) {
         return 3;
     }
+
+    @Nullable
+    @Override
+    public TileEntity createTileEntity(final World worldIn, final IBlockState state) {
+        return new TileBrokenPart(10, (float) ARConfiguration.getCurrentConfig().increaseWearIntensityProb);
+    }
 }

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

@@ -1,8 +1,14 @@
 package zmaster587.advancedRocketry.block;
 
 import net.minecraft.block.material.Material;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
+import zmaster587.advancedRocketry.api.ARConfiguration;
+import zmaster587.advancedRocketry.tile.TileBrokenPart;
+
+import javax.annotation.Nullable;
 
 public class BlockAdvancedRocketMotor extends BlockRocketMotor {
 
@@ -19,4 +25,10 @@ public int getThrust(World world, BlockPos pos) {
     public int getFuelConsumptionRate(World world, int x, int y, int z) {
         return 3;
     }
+
+    @Nullable
+    @Override
+    public TileEntity createTileEntity(final World worldIn, final IBlockState state) {
+        return new TileBrokenPart(10, (float) ARConfiguration.getCurrentConfig().increaseWearIntensityProb);
+    }
 }