Improved Climatologist texture

Glitchfiend · Feb 11, 2024 · 23fb37f · 23fb37f
1 parent 878574b
commit 23fb37f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 8 deletions.
diff --git a/common/src/main/java/toughasnails/block/TemperatureGaugeBlock.java b/common/src/main/java/toughasnails/block/TemperatureGaugeBlock.java
@@ -13,15 +13,12 @@
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.Level;
-import net.minecraft.world.level.LightLayer;
 import net.minecraft.world.level.block.BaseEntityBlock;
 import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.DaylightDetectorBlock;
 import net.minecraft.world.level.block.RenderShape;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.entity.BlockEntityTicker;
 import net.minecraft.world.level.block.entity.BlockEntityType;
-import net.minecraft.world.level.block.entity.DaylightDetectorBlockEntity;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.state.StateDefinition;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
@@ -32,7 +29,6 @@
 import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.world.phys.shapes.VoxelShape;
 import toughasnails.api.blockentity.TANBlockEntityTypes;
-import toughasnails.api.temperature.TemperatureHelper;
 import toughasnails.api.temperature.TemperatureLevel;
 import toughasnails.block.entity.TemperatureGaugeBlockEntity;
 import toughasnails.temperature.TemperatureHelperImpl;

diff --git a/common/src/main/java/toughasnails/temperature/TemperatureHelperImpl.java b/common/src/main/java/toughasnails/temperature/TemperatureHelperImpl.java
@@ -16,9 +16,9 @@
 import net.minecraft.world.item.enchantment.EnchantmentHelper;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.biome.Biome;
-import net.minecraft.world.level.block.CampfireBlock;
-import net.minecraft.world.level.block.CopperBulbBlock;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.properties.BlockStateProperties;
+import net.minecraft.world.level.block.state.properties.BooleanProperty;
 import net.minecraft.world.level.levelgen.Heightmap;
 import toughasnails.api.enchantment.TANEnchantments;
 import toughasnails.api.player.ITANPlayer;
@@ -113,13 +113,13 @@ public int getTicksHyperthermic(Player player)
     @Override
     public boolean isHeating(BlockState state)
     {
-        return state.is(ModTags.Blocks.HEATING_BLOCKS) && ((state.hasProperty(CampfireBlock.LIT) ? state.getValue(CampfireBlock.LIT) : (state.hasProperty(CopperBulbBlock.POWERED) ? state.getValue(CopperBulbBlock.POWERED) : true)));
+        return state.is(ModTags.Blocks.HEATING_BLOCKS) && ((state.hasProperty(BlockStateProperties.LIT) ? state.getValue(BlockStateProperties.LIT) : (state.hasProperty(BlockStateProperties.POWERED) ? state.getValue(BlockStateProperties.POWERED) : (state.hasProperty(BlockStateProperties.ENABLED) ? state.getValue(BlockStateProperties.ENABLED) : (state.hasProperty(BooleanProperty.create("active")) ? state.getValue(BooleanProperty.create("active")) : (state.hasProperty(BooleanProperty.create("on")) ? state.getValue(BooleanProperty.create("on")) : true))))));
     }
 
     @Override
     public boolean isCooling(BlockState state)
     {
-        return state.is(ModTags.Blocks.COOLING_BLOCKS) && ((state.hasProperty(CampfireBlock.LIT) ? state.getValue(CampfireBlock.LIT) : (state.hasProperty(CopperBulbBlock.POWERED) ? state.getValue(CopperBulbBlock.POWERED) : true)));
+        return state.is(ModTags.Blocks.COOLING_BLOCKS) && ((state.hasProperty(BlockStateProperties.LIT) ? state.getValue(BlockStateProperties.LIT) : (state.hasProperty(BlockStateProperties.POWERED) ? state.getValue(BlockStateProperties.POWERED) : (state.hasProperty(BlockStateProperties.ENABLED) ? state.getValue(BlockStateProperties.ENABLED) : (state.hasProperty(BooleanProperty.create("active")) ? state.getValue(BooleanProperty.create("active")) : (state.hasProperty(BooleanProperty.create("on")) ? state.getValue(BooleanProperty.create("on")) : true))))));
     }
 
     @Override

diff --git a/...urces/assets/toughasnails/textures/entity/villager/profession/climatologist.png b/...urces/assets/toughasnails/textures/entity/villager/profession/climatologist.png