BitHeaven
/
create-air-fabric
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 6 Wiki Activity

Compare commits

base: BitHeaven:b749efbbac0c2544edfa7b455099d1c45848fbac
Branches Tags
BitHeaven:main
BitHeaven:createairfabric-1.0+1.20.1-18
BitHeaven:createairfabric-1.0+1.20.1-15
BitHeaven:createairfabric-1.0+1.20.1-11
BitHeaven:createairfabric-1.0+1.20.1-7
BitHeaven:createairfabric-1.0+1.20.1-6
BitHeaven:createairfabric-1.0+1.20.1-4
..
compare: BitHeaven:2889f710fb76faa224bfb5046c4a46f9d67e89ce
Branches Tags
BitHeaven:main
BitHeaven:createairfabric-1.0+1.20.1-18
BitHeaven:createairfabric-1.0+1.20.1-15
BitHeaven:createairfabric-1.0+1.20.1-11
BitHeaven:createairfabric-1.0+1.20.1-7
BitHeaven:createairfabric-1.0+1.20.1-6
BitHeaven:createairfabric-1.0+1.20.1-4

No commits in common. "b749efbbac0c2544edfa7b455099d1c45848fbac" and "2889f710fb76faa224bfb5046c4a46f9d67e89ce" have entirely different histories.
b749efbbac ... 2889f710fb

6 changed files with 35 additions and 53 deletions
Show Stats Expand all files Collapse all files

9
build.gradle
View File

@ -1,5 +1,5 @@
plugins { plugins {
id 'fabric-loom' version '1.5-SNAPSHOT' id 'fabric-loom' version '1.2-SNAPSHOT'
id "io.github.p03w.machete" version "1.+" // automatic jar compressing on build id "io.github.p03w.machete" version "1.+" // automatic jar compressing on build
id 'maven-publish' id 'maven-publish'
} }
@ -61,11 +61,10 @@ dependencies {
modImplementation("com.simibubi.create:create-fabric-${minecraft_version}:${create_version}") modImplementation("com.simibubi.create:create-fabric-${minecraft_version}:${create_version}")
// Thin Air // Thin Air
modImplementation("maven.modrinth:thin-air:${thinair_version}") modImplementation("maven.modrinth:thin-air:v8.1.3-1.20.1-Fabric")
// Ad Astra // Ad Astra
modImplementation("maven.modrinth:ad-astra:${adastra_version}") modImplementation("curse.maven:ad-astra-635042:4774341")
modImplementation("maven.modrinth:botarium:${botarium_version}")
// Development QOL // Development QOL
modLocalRuntime("maven.modrinth:lazydfu:${lazydfu_version}") modLocalRuntime("maven.modrinth:lazydfu:${lazydfu_version}")
@ -88,7 +87,7 @@ processResources {
properties.put("version", version) properties.put("version", version)
properties.put("fabric_loader_version", fabric_loader_version) properties.put("fabric_loader_version", fabric_loader_version)
properties.put("fabric_api_version", fabric_api_version) properties.put("fabric_api_version", fabric_api_version)
properties.put("create_version", "~" + create_version.split("-")[0] + "-" + create_version.split("-")[1]) properties.put("create_version", create_version)
properties.put("minecraft_version", minecraft_version) properties.put("minecraft_version", minecraft_version)
properties.forEach((k, v) -> inputs.property(k, v)) properties.forEach((k, v) -> inputs.property(k, v))

7
gradle.properties
View File

@ -22,12 +22,7 @@ org.gradle.jvmargs=-Xmx1G
# Dependencies # Dependencies
# https://modrinth.com/mod/create-fabric/versions # https://modrinth.com/mod/create-fabric/versions
create_version = 0.5.1-f-build.1329+mc1.20.1 create_version = 0.5.1-d-build.1161+mc1.20.1
# https://modrinth.com/mod/thin-air/versions
thinair_version = v8.1.5-1.20.1-Fabric
# https://modrinth.com/mod/ad-astra/versions
adastra_version = MxqFxL9C
botarium_version = 5a8eybLl
# set to disabled to have none of them. # set to disabled to have none of them.
recipe_viewer = disabled recipe_viewer = disabled
# Mod Menu - https://modrinth.com/mod/modmenu/versions # Mod Menu - https://modrinth.com/mod/modmenu/versions

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
networkTimeout=10000 networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

9
src/main/java/ru/bitheaven/createairfabric/CreateAirFabric.java
View File

@ -1,8 +1,9 @@
package ru.bitheaven.createairfabric; package ru.bitheaven.createairfabric;
import com.simibubi.create.Create; import com.simibubi.create.Create;
import earth.terrarium.adastra.api.systems.OxygenApi; import earth.terrarium.ad_astra.common.util.OxygenUtils;
import fuzs.thinair.helper.AirQualityHelperImpl; import fuzs.thinair.helper.AirQualityHelperImpl;
import io.github.fabricators_of_create.porting_lib.util.EnvExecutor;
import net.fabricmc.api.ModInitializer; import net.fabricmc.api.ModInitializer;
import net.fabricmc.loader.api.FabricLoader; import net.fabricmc.loader.api.FabricLoader;
import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.Entity;
@ -17,6 +18,10 @@ public class CreateAirFabric implements ModInitializer {
@Override @Override
public void onInitialize() { public void onInitialize() {
LOGGER.info("Create addon mod [{}] is loading alongside Create [{}]!", NAME, Create.VERSION); LOGGER.info("Create addon mod [{}] is loading alongside Create [{}]!", NAME, Create.VERSION);
LOGGER.info(EnvExecutor.unsafeRunForDist(
() -> () -> "{} is accessing Porting Lib from the client!",
() -> () -> "{} is accessing Porting Lib from the server!"
), NAME);
} }
public static boolean isOxygen(Entity entity) { public static boolean isOxygen(Entity entity) {
@ -26,7 +31,7 @@ public class CreateAirFabric implements ModInitializer {
.getAirQualityAtLocation(entity.level(), entity.getEyePosition()).canBreathe; .getAirQualityAtLocation(entity.level(), entity.getEyePosition()).canBreathe;
} }
if (FabricLoader.getInstance().isModLoaded("ad_astra")) { if (FabricLoader.getInstance().isModLoaded("ad_astra")) {
oxygen &= OxygenApi.API.hasOxygen(entity.level()); oxygen &= OxygenUtils.levelHasOxygen(entity.level());
} }
return oxygen; return oxygen;
} }

36
src/main/java/ru/bitheaven/createairfabric/mixin/EntityOxygenSystemMixin.java
View File

@ -1,43 +1,25 @@
package ru.bitheaven.createairfabric.mixin; package ru.bitheaven.createairfabric.mixin;
import com.simibubi.create.content.equipment.armor.BacktankItem;
import com.simibubi.create.content.equipment.armor.BacktankUtil; import com.simibubi.create.content.equipment.armor.BacktankUtil;
import com.simibubi.create.content.equipment.armor.DivingHelmetItem; import com.simibubi.create.content.equipment.armor.DivingHelmetItem;
import earth.terrarium.ad_astra.common.entity.system.EntityOxygenSystem;
import earth.terrarium.adastra.common.items.armor.SpaceSuitItem; import earth.terrarium.ad_astra.common.util.ModUtils;
import earth.terrarium.adastra.common.systems.OxygenApiImpl;
import earth.terrarium.adastra.common.tags.ModItemTags;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.EquipmentSlot;
import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.LivingEntity;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Redirect; import org.spongepowered.asm.mixin.injection.Redirect;
@Mixin(OxygenApiImpl.class) @Mixin(EntityOxygenSystem.class)
public abstract class EntityOxygenSystemMixin { public abstract class EntityOxygenSystemMixin {
/** /**
* Make air exists if Create Air * Make air exists if Create Air
*/ */
@Redirect(at = @At(value = "INVOKE", target = "Learth/terrarium/adastra/common/items/armor/SpaceSuitItem;hasOxygen(Lnet/minecraft/world/entity/Entity;)Z"), @Redirect(at = @At(value = "INVOKE", target = "Learth/terrarium/ad_astra/common/util/ModUtils;armourIsOxygenated(Lnet/minecraft/world/entity/LivingEntity;)Z"),
method = "entityTick(Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/LivingEntity;)V") method = "oxygenTick(Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/server/level/ServerLevel;)V")
private boolean redirectHasOxygen(Entity entity) { private static boolean redirectOxygenTick(LivingEntity entity) {
if (!(entity instanceof LivingEntity livingEntity)) return SpaceSuitItem.hasOxygen(entity);
boolean createOxygen = true; boolean createOxygen = true;
createOxygen &= !DivingHelmetItem.getWornItem(livingEntity).isEmpty(); createOxygen &= !DivingHelmetItem.getWornItem(entity).isEmpty();
createOxygen &= !BacktankUtil.getAllWithAir(livingEntity).isEmpty(); createOxygen &= !BacktankUtil.getAllWithAir(entity).isEmpty();
return SpaceSuitItem.hasOxygen(livingEntity) || createOxygen; return ModUtils.armourIsOxygenated(entity) || createOxygen;
}
@Redirect(at = @At(value = "INVOKE", target = "Learth/terrarium/adastra/common/items/armor/SpaceSuitItem;hasFullSet(Lnet/minecraft/world/entity/LivingEntity;)Z"),
method = "entityTick(Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/LivingEntity;)V")
private boolean redirectHasFullSet(LivingEntity entity) {
boolean createArmor = true;
createArmor &= entity.getItemBySlot(EquipmentSlot.HEAD).getItem() instanceof DivingHelmetItem;
createArmor &= entity.getItemBySlot(EquipmentSlot.CHEST).getItem() instanceof BacktankItem;
createArmor &= entity.getItemBySlot(EquipmentSlot.LEGS).is(ModItemTags.SPACE_SUITS);
createArmor &= entity.getItemBySlot(EquipmentSlot.FEET).is(ModItemTags.SPACE_SUITS);
return SpaceSuitItem.hasFullSet(entity) || createArmor;
} }
} }

25
src/main/java/ru/bitheaven/createairfabric/mixin/EntityTemperatureSystemMixin.java
View File

@ -1,31 +1,32 @@
package ru.bitheaven.createairfabric.mixin; package ru.bitheaven.createairfabric.mixin;
import earth.terrarium.adastra.common.items.armor.NetheriteSpaceSuitItem; import earth.terrarium.ad_astra.common.config.AdAstraConfig;
import earth.terrarium.adastra.common.tags.ModItemTags; import earth.terrarium.ad_astra.common.entity.system.EntityTemperatureSystem;
import earth.terrarium.adastra.common.systems.TemperatureApiImpl; import earth.terrarium.ad_astra.common.item.armor.NetheriteSpaceSuit;
import earth.terrarium.ad_astra.common.registry.ModTags;
import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.entity.EquipmentSlot;
import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.LivingEntity;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Redirect; import org.spongepowered.asm.mixin.injection.Redirect;
@Mixin(TemperatureApiImpl.class) @Mixin(EntityTemperatureSystem.class)
public abstract class EntityTemperatureSystemMixin { public abstract class EntityTemperatureSystemMixin {
@Redirect(at = @At(value = "INVOKE", target = "Learth/terrarium/adastra/common/systems/TemperatureApiImpl;burnEntity(Lnet/minecraft/world/entity/LivingEntity;)V"), @Redirect(at = @At(value = "INVOKE", target = "Learth/terrarium/ad_astra/common/entity/system/EntityTemperatureSystem;burnEntity(Lnet/minecraft/world/entity/LivingEntity;)V"),
method = "entityTick(Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/LivingEntity;)V") method = "temperatureTick(Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/server/level/ServerLevel;)V")
private void redirectTemperatureTick(TemperatureApiImpl instance, LivingEntity entity) { private static void redirectTemperatureTick(LivingEntity entity) {
boolean createNetherite = true; boolean createNetherite = true;
createNetherite &= entity.getItemBySlot(EquipmentSlot.HEAD).getItem().isFireResistant(); createNetherite &= entity.getItemBySlot(EquipmentSlot.HEAD).getItem().isFireResistant();
createNetherite &= entity.getItemBySlot(EquipmentSlot.CHEST).getItem().isFireResistant(); createNetherite &= entity.getItemBySlot(EquipmentSlot.CHEST).getItem().isFireResistant();
createNetherite &= entity.getItemBySlot(EquipmentSlot.LEGS).is(ModItemTags.HEAT_RESISTANT_ARMOR) createNetherite &= entity.getItemBySlot(EquipmentSlot.LEGS).is(ModTags.HEAT_RESISTANT)
|| entity.getItemBySlot(EquipmentSlot.LEGS).getItem() instanceof NetheriteSpaceSuitItem || entity.getItemBySlot(EquipmentSlot.LEGS).getItem() instanceof NetheriteSpaceSuit
|| entity.getItemBySlot(EquipmentSlot.LEGS).getItem().isFireResistant(); || entity.getItemBySlot(EquipmentSlot.LEGS).getItem().isFireResistant();
createNetherite &= entity.getItemBySlot(EquipmentSlot.FEET).is(ModItemTags.HEAT_RESISTANT_ARMOR) createNetherite &= entity.getItemBySlot(EquipmentSlot.FEET).is(ModTags.HEAT_RESISTANT)
|| entity.getItemBySlot(EquipmentSlot.FEET).getItem() instanceof NetheriteSpaceSuitItem || entity.getItemBySlot(EquipmentSlot.FEET).getItem() instanceof NetheriteSpaceSuit
|| entity.getItemBySlot(EquipmentSlot.FEET).getItem().isFireResistant(); || entity.getItemBySlot(EquipmentSlot.FEET).getItem().isFireResistant();
if(!createNetherite) { if(!createNetherite) {
entity.hurt(entity.damageSources().onFire(), 6); entity.hurt(entity.damageSources().onFire(), (float) AdAstraConfig.heatDamage);
entity.setSecondsOnFire(10); entity.setSecondsOnFire(10);
} }
} }