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

Compare commits

base: 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
..
compare: BitHeaven:46a668339c63db721ffc46de14cc34134b950f9a
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. "2889f710fb76faa224bfb5046c4a46f9d67e89ce" and "46a668339c63db721ffc46de14cc34134b950f9a" have entirely different histories.
2889f710fb ... 46a668339c

10 changed files with 22 additions and 158 deletions
Show Stats Expand all files Collapse all files

3
build.gradle
View File

@ -63,9 +63,6 @@ dependencies {
// Thin Air
modImplementation("maven.modrinth:thin-air:v8.1.3-1.20.1-Fabric")
// Ad Astra
modImplementation("curse.maven:ad-astra-635042:4774341")
// Development QOL
modLocalRuntime("maven.modrinth:lazydfu:${lazydfu_version}")
modLocalRuntime("com.terraformersmc:modmenu:${modmenu_version}")

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

@ -1,12 +1,11 @@
package ru.bitheaven.createairfabric;
import com.simibubi.create.Create;
import earth.terrarium.ad_astra.common.util.OxygenUtils;
import fuzs.thinair.helper.AirQualityHelperImpl;
import io.github.fabricators_of_create.porting_lib.util.EnvExecutor;
import net.fabricmc.api.ModInitializer;
import net.fabricmc.loader.api.FabricLoader;
import net.minecraft.world.entity.Entity;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.entity.LivingEntity;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -24,15 +23,12 @@ public class CreateAirFabric implements ModInitializer {
), NAME);
}
public static boolean isOxygen(Entity entity) {
boolean oxygen = true;
if (FabricLoader.getInstance().isModLoaded("thinair")) {
oxygen &= new AirQualityHelperImpl()
.getAirQualityAtLocation(entity.level(), entity.getEyePosition()).canBreathe;
}
if (FabricLoader.getInstance().isModLoaded("ad_astra")) {
oxygen &= OxygenUtils.levelHasOxygen(entity.level());
}
return oxygen;
public static boolean airQualityActivatesHelmet(LivingEntity entity) {
AirQualityHelperImpl air = new AirQualityHelperImpl();
return !air.getAirQualityAtLocation(entity.level(), entity.getEyePosition()).canBreathe;
}
public static ResourceLocation id(String path) {
return new ResourceLocation(ID, path);
}
}

69
src/main/java/ru/bitheaven/createairfabric/CreateAirFabricMixinPlugin.java
View File

@ -1,69 +0,0 @@
package ru.bitheaven.createairfabric;
import com.google.common.collect.ImmutableMap;
import net.fabricmc.loader.api.FabricLoader;
import org.objectweb.asm.tree.ClassNode;
import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin;
import org.spongepowered.asm.mixin.extensibility.IMixinInfo;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.function.Supplier;
public class CreateAirFabricMixinPlugin implements IMixinConfigPlugin {
private static final Supplier<Boolean> TRUE = () -> true;
private static final Map<String, Supplier<Boolean>> CONDITIONS = ImmutableMap.of(
"ru.bitheaven.createairfabric.mixin.DivingHelmetItemMixin",
() -> FabricLoader.getInstance().isModLoaded("thinair")
|| FabricLoader.getInstance().isModLoaded("ad_astra"),
"ru.bitheaven.createairfabric.mixin.RemainingAirOverlayMixin",
() -> FabricLoader.getInstance().isModLoaded("thinair")
|| FabricLoader.getInstance().isModLoaded("ad_astra"),
"ru.bitheaven.createairfabric.mixin.EntityOxygenSystemMixin",
() -> FabricLoader.getInstance().isModLoaded("ad_astra"),
"ru.bitheaven.createairfabric.mixin.EntityTemperatureSystemMixin",
() -> FabricLoader.getInstance().isModLoaded("ad_astra")
);
@Override
public boolean shouldApplyMixin(String targetClassName, String mixinClassName) {
return CONDITIONS.getOrDefault(mixinClassName, TRUE).get();
}
// Boilerplate
@Override
public void onLoad(String mixinPackage) {
}
@Override
public String getRefMapperConfig() {
return null;
}
@Override
public void acceptTargets(Set<String> myTargets, Set<String> otherTargets) {
}
@Override
public List<String> getMixins() {
return null;
}
@Override
public void preApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) {
}
@Override
public void postApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) {
}
}

9
src/main/java/ru/bitheaven/createairfabric/mixin/DivingHelmetItemMixin.java
View File

@ -6,8 +6,8 @@ import net.minecraft.world.level.material.Fluid;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Redirect;
import com.simibubi.create.content.equipment.armor.DivingHelmetItem;
import ru.bitheaven.createairfabric.CreateAirFabric;
import com.simibubi.create.content.equipment.armor.DivingHelmetItem;
@Mixin(DivingHelmetItem.class)
public abstract class DivingHelmetItemMixin {
@ -17,11 +17,6 @@ public abstract class DivingHelmetItemMixin {
@Redirect(at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/LivingEntity;isEyeInFluid(Lnet/minecraft/tags/TagKey;)Z"),
method = "breatheUnderwater(Lnet/minecraft/world/entity/LivingEntity;)V")
private static boolean redirectBreatheUnderwater(LivingEntity entity, TagKey<Fluid> fluidTagKey) {
boolean oxygen = true;
oxygen &= !entity.isEyeInFluid(fluidTagKey);
oxygen &= !entity.isUnderWater();
oxygen &= CreateAirFabric.isOxygen(entity);
return !oxygen;
return entity.isEyeInFluid(fluidTagKey) || CreateAirFabric.airQualityActivatesHelmet(entity);
}
}

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

@ -1,25 +0,0 @@
package ru.bitheaven.createairfabric.mixin;
import com.simibubi.create.content.equipment.armor.BacktankUtil;
import com.simibubi.create.content.equipment.armor.DivingHelmetItem;
import earth.terrarium.ad_astra.common.entity.system.EntityOxygenSystem;
import earth.terrarium.ad_astra.common.util.ModUtils;
import net.minecraft.world.entity.LivingEntity;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Redirect;
@Mixin(EntityOxygenSystem.class)
public abstract class EntityOxygenSystemMixin {
/**
* Make air exists if Create Air
*/
@Redirect(at = @At(value = "INVOKE", target = "Learth/terrarium/ad_astra/common/util/ModUtils;armourIsOxygenated(Lnet/minecraft/world/entity/LivingEntity;)Z"),
method = "oxygenTick(Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/server/level/ServerLevel;)V")
private static boolean redirectOxygenTick(LivingEntity entity) {
boolean createOxygen = true;
createOxygen &= !DivingHelmetItem.getWornItem(entity).isEmpty();
createOxygen &= !BacktankUtil.getAllWithAir(entity).isEmpty();
return ModUtils.armourIsOxygenated(entity) || createOxygen;
}
}

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

@ -1,33 +0,0 @@
package ru.bitheaven.createairfabric.mixin;
import earth.terrarium.ad_astra.common.config.AdAstraConfig;
import earth.terrarium.ad_astra.common.entity.system.EntityTemperatureSystem;
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.LivingEntity;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Redirect;
@Mixin(EntityTemperatureSystem.class)
public abstract class EntityTemperatureSystemMixin {
@Redirect(at = @At(value = "INVOKE", target = "Learth/terrarium/ad_astra/common/entity/system/EntityTemperatureSystem;burnEntity(Lnet/minecraft/world/entity/LivingEntity;)V"),
method = "temperatureTick(Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/server/level/ServerLevel;)V")
private static void redirectTemperatureTick(LivingEntity entity) {
boolean createNetherite = true;
createNetherite &= entity.getItemBySlot(EquipmentSlot.HEAD).getItem().isFireResistant();
createNetherite &= entity.getItemBySlot(EquipmentSlot.CHEST).getItem().isFireResistant();
createNetherite &= entity.getItemBySlot(EquipmentSlot.LEGS).is(ModTags.HEAT_RESISTANT)
|| entity.getItemBySlot(EquipmentSlot.LEGS).getItem() instanceof NetheriteSpaceSuit
|| entity.getItemBySlot(EquipmentSlot.LEGS).getItem().isFireResistant();
createNetherite &= entity.getItemBySlot(EquipmentSlot.FEET).is(ModTags.HEAT_RESISTANT)
|| entity.getItemBySlot(EquipmentSlot.FEET).getItem() instanceof NetheriteSpaceSuit
|| entity.getItemBySlot(EquipmentSlot.FEET).getItem().isFireResistant();
if(!createNetherite) {
entity.hurt(entity.damageSources().onFire(), (float) AdAstraConfig.heatDamage);
entity.setSecondsOnFire(10);
}
}
}

3
src/main/java/ru/bitheaven/createairfabric/mixin/MinecraftMixin.java
View File

@ -1,8 +1,11 @@
package ru.bitheaven.createairfabric.mixin;
import ru.bitheaven.createairfabric.CreateAirFabric;
import net.minecraft.client.Minecraft;
import net.minecraft.client.main.GameConfig;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;

6
src/main/java/ru/bitheaven/createairfabric/mixin/RemainingAirOverlayMixin.java
View File

@ -1,7 +1,7 @@
package ru.bitheaven.createairfabric.mixin;
import com.simibubi.create.content.equipment.armor.RemainingAirOverlay;
import net.minecraft.client.player.LocalPlayer;
import net.minecraft.tags.TagKey;
import net.minecraft.world.level.material.Fluid;
import org.spongepowered.asm.mixin.Mixin;
@ -9,6 +9,8 @@ import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Redirect;
import ru.bitheaven.createairfabric.CreateAirFabric;
import net.minecraft.client.player.LocalPlayer;
@Mixin(RemainingAirOverlay.class)
public class RemainingAirOverlayMixin {
/**
@ -17,6 +19,6 @@ public class RemainingAirOverlayMixin {
@Redirect(at = @At(value = "INVOKE", target = "Lnet/minecraft/client/player/LocalPlayer;isEyeInFluid(Lnet/minecraft/tags/TagKey;)Z"),
method = "render(Lnet/minecraft/client/gui/GuiGraphics;II)V")
private static boolean redirectRender(LocalPlayer player, TagKey<Fluid> fluidTagKey) {
return player.isEyeInFluid(fluidTagKey) || !CreateAirFabric.isOxygen(player);
return player.isEyeInFluid(fluidTagKey) || CreateAirFabric.airQualityActivatesHelmet(player);
}
}

5
src/main/resources/createairfabric.mixins.json
View File

@ -3,11 +3,8 @@
"minVersion": "0.8",
"package": "ru.bitheaven.createairfabric.mixin",
"compatibilityLevel": "JAVA_17",
"plugin": "ru.bitheaven.createairfabric.CreateAirFabricMixinPlugin",
"mixins": [
"DivingHelmetItemMixin",
"EntityOxygenSystemMixin",
"EntityTemperatureSystemMixin"
"DivingHelmetItemMixin"
],
"client": [
"MinecraftMixin",

5
src/main/resources/fabric.mod.json
View File

@ -3,7 +3,7 @@
"id": "createairfabric",
"version": "${version}",
"name": "Create Air Fabric",
"description": "Addon for Create that add compatibility with Thin Air, Ad Astra",
"description": "Addon for compatibility Create and Thin Air",
"authors": [
"BitHeaven"
],
@ -26,6 +26,7 @@
"fabricloader": ">=${fabric_loader_version}",
"fabric": "*",
"minecraft": "${minecraft_version}",
"create": "${create_version}"
"create": "${create_version}",
"thinair": "*"
}
}