diff --git a/src/main/java/xyz/illuc/neuralgiacore/NeuralgiaCoreMod.java b/src/main/java/xyz/illuc/neuralgiacore/NeuralgiaCoreMod.java index 9f57a07..e6c700b 100644 --- a/src/main/java/xyz/illuc/neuralgiacore/NeuralgiaCoreMod.java +++ b/src/main/java/xyz/illuc/neuralgiacore/NeuralgiaCoreMod.java @@ -8,7 +8,6 @@ import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.MobCategory; import net.minecraft.world.entity.ai.attributes.AttributeSupplier; import net.minecraft.world.entity.ai.attributes.Attributes; -import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; @@ -28,7 +27,6 @@ import org.slf4j.Logger; import xyz.illuc.neuralgiacore.entities.OfflinePlayerEntity; import xyz.illuc.neuralgiacore.entities.OfflinePlayerRenderer; import xyz.illuc.neuralgiacore.peripherals.BearingPeripheral; -//import xyz.illuc.neuralgiacore.peripherals.GunPeripheral; import xyz.illuc.neuralgiacore.registers.RegisterItems; import xyz.illuc.neuralgiacore.registers.RegisterMedicalFluids; @@ -76,15 +74,12 @@ public class NeuralgiaCoreMod { event.enqueueWork(this::registerPeripherals); } - //TODO move peripheral stuff in a different file private void registerPeripherals() { registerBearingPeripheral("mechanical_bearing"); registerBearingPeripheral("clockwork_bearing"); registerBearingPeripheral("windmill_bearing"); - - registerGunPeripheral("machine_gun"); } private void registerBearingPeripheral(String blockEntityName) { @@ -114,30 +109,6 @@ public class NeuralgiaCoreMod { } } - private void registerGunPeripheral(String blockEntityName) { - BlockEntityType type = ForgeRegistries.BLOCK_ENTITY_TYPES.getValue( - new ResourceLocation("crusty_chunks", blockEntityName) - ); - - if (type != null) { - ForgeComputerCraftAPI.registerPeripheralProvider((level, pos, direction) -> { - var blockEntity = level.getBlockEntity(pos); - if (blockEntity != null && blockEntity.getType() == type) { - try { - //TODO gun peripheral - } catch (ClassCastException e) { - LOGGER.error("Failed to create peripheral at {}", pos); - return null; - } - } - return null; - }); - LOGGER.debug("Registered peripheral for {}", blockEntityName); - } else { - LOGGER.warn("Could not find block entity type: crusty_chunks:{}", blockEntityName); - } - } - diff --git a/src/main/java/xyz/illuc/neuralgiacore/mixin/Tfc/MixinDisableHealthModifier.java b/src/main/java/xyz/illuc/neuralgiacore/mixin/Tfc/MixinDisableHealthModifier.java deleted file mode 100644 index c9e9301..0000000 --- a/src/main/java/xyz/illuc/neuralgiacore/mixin/Tfc/MixinDisableHealthModifier.java +++ /dev/null @@ -1,15 +0,0 @@ -package xyz.illuc.neuralgiacore.mixin.Tfc; - -import net.dries007.tfc.common.capabilities.food.TFCFoodData; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; - -@Mixin(TFCFoodData.class) -public class MixinDisableHealthModifier { - @Inject(method = "getHealthModifier", at = @At("HEAD"), cancellable = true, remap = false) - private void disableHealthModifier(CallbackInfoReturnable cir) { - cir.setReturnValue(1f); - } -} diff --git a/src/main/java/xyz/illuc/neuralgiacore/mixin/Tfc/MixinFoodData.java b/src/main/java/xyz/illuc/neuralgiacore/mixin/Tfc/MixinFoodData.java index 5a29c5e..bf0ed5a 100644 --- a/src/main/java/xyz/illuc/neuralgiacore/mixin/Tfc/MixinFoodData.java +++ b/src/main/java/xyz/illuc/neuralgiacore/mixin/Tfc/MixinFoodData.java @@ -106,7 +106,7 @@ public class MixinFoodData { if (totalSicknessToAdd > 0) { totalSicknessToAdd = Math.min(totalSicknessToAdd, 10.0f); - float finalSicknessToAdd = totalSicknessToAdd * 0.8f; + float finalSicknessToAdd = totalSicknessToAdd; this.sourcePlayer.getCapability(PlayerHealthProvider.PLAYER_HEALTH_DATA).ifPresent(h -> { IPlayerHealthDataAccessor accessor = (IPlayerHealthDataAccessor) h; float currentSickness = accessor.getSickness(); diff --git a/src/main/resources/assets/neuralgiacore/lang/en_us.json b/src/main/resources/assets/neuralgiacore/lang/en_us.json index da80ccb..e29a216 100644 --- a/src/main/resources/assets/neuralgiacore/lang/en_us.json +++ b/src/main/resources/assets/neuralgiacore/lang/en_us.json @@ -18,19 +18,6 @@ "neuralgiacore.gui.moodle.sepsis.description3": "Critically low blood pressure and multiple organ dysfunction syndrome caused by sepsis. Death is fast approaching.", - "neuralgiacore.gui.moodle.sickness.title1": "Queasy", - "neuralgiacore.gui.moodle.sickness.description1": "Feeling discomfort. Minorly sick.", - - "neuralgiacore.gui.moodle.sickness.title2": "Nauseous", - "neuralgiacore.gui.moodle.sickness.description2": "Confused, uncomfortable around the stomach. Prone to vomiting.", - - "neuralgiacore.gui.moodle.sickness.title3": "Sick", - "neuralgiacore.gui.moodle.sickness.description3": "Lethargic, tired and in major discomfort. Very prone to vomiting.", - - "neuralgiacore.gui.moodle.sickness.title4": "Grossly sick", - "neuralgiacore.gui.moodle.sickness.description4": "Dangerously sick. Something is VERY wrong on the inside. Weak, confused and in a world of pain.", - - "medical_fluid.neuralgiacore.blood": "Blood", "medical_fluid.neuralgiacore.blood.description": "Blood, used in blood transfusions.", diff --git a/src/main/resources/assets/neuralgiacore/textures/item/towelette.png b/src/main/resources/assets/neuralgiacore/textures/item/towelette.png index acacd6f..5499218 100644 Binary files a/src/main/resources/assets/neuralgiacore/textures/item/towelette.png and b/src/main/resources/assets/neuralgiacore/textures/item/towelette.png differ diff --git a/src/main/resources/neuralgiacore.mixins.json b/src/main/resources/neuralgiacore.mixins.json index 6ba9988..7ac77f8 100644 --- a/src/main/resources/neuralgiacore.mixins.json +++ b/src/main/resources/neuralgiacore.mixins.json @@ -15,7 +15,6 @@ "PrototypePain.MixinSepsis", "PrototypePain.MixinSickness", "PrototypePain.MixinSicknessOverlay", - "Tfc.MixinDisableHealthModifier", "Tfc.MixinFoodData", "Tfc.MixinHealthBar", "Tfc.MixinOptimizeClimateUpdate",