Altarik/ReFramed
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'fix: more checks on ThemedEntity Class (Always more to fix)' (#21) from dev into master
All checks were successful
deploy / deploy (push) Successful in 5m8s
Details

Browse Source 
Reviewed-on: #21
This commit is contained in:
Adrien1106 2024-06-14 17:17:37 +02:00
commit 73bf27bdda
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@ -9,7 +9,7 @@ loader_version=0.15.11
# Mod Properties # Mod Properties
modrinth_id = jCpoCBpn modrinth_id = jCpoCBpn
mod_version = 1.6.2 mod_version = 1.6.3
maven_group = fr.adrien1106 maven_group = fr.adrien1106
archives_base_name = ReFramed archives_base_name = ReFramed
mod_id = reframed mod_id = reframed

8
src/main/java/fr/adrien1106/reframed/util/mixin/ThemedBlockEntity.java
View File

@ -2,6 +2,7 @@ package fr.adrien1106.reframed.util.mixin;
import fr.adrien1106.reframed.util.blocks.ThemeableBlockEntity; import fr.adrien1106.reframed.util.blocks.ThemeableBlockEntity;
import net.minecraft.block.BlockState; import net.minecraft.block.BlockState;
import net.minecraft.block.Blocks;
import net.minecraft.block.entity.BlockEntity; import net.minecraft.block.entity.BlockEntity;
import net.minecraft.nbt.NbtCompound; import net.minecraft.nbt.NbtCompound;
import net.minecraft.nbt.NbtHelper; import net.minecraft.nbt.NbtHelper;
@ -29,12 +30,17 @@ public class ThemedBlockEntity extends BlockEntity implements ThemeableBlockEnti
@Override @Override
public BlockState getTheme(int i) { public BlockState getTheme(int i) {
if (i > themes.size())
return Blocks.AIR.getDefaultState();
return themes.get(Math.max(0, i-1)); return themes.get(Math.max(0, i-1));
} }
@Override @Override
public void setTheme(BlockState state, int i) { public void setTheme(BlockState state, int i) {
themes.set(Math.max(0, i-1), state); if (i > themes.size())
themes.add(state);
else
themes.set(Math.max(0, i-1), state);
} }
@Override @Override