diff --git a/src/main/java/techreborn/blocks/generator/BlockThermalGenerator.java b/src/main/java/techreborn/blocks/generator/BlockThermalGenerator.java index eaf7cb263..36c51eed2 100644 --- a/src/main/java/techreborn/blocks/generator/BlockThermalGenerator.java +++ b/src/main/java/techreborn/blocks/generator/BlockThermalGenerator.java @@ -43,17 +43,17 @@ public class BlockThermalGenerator extends BlockMachineBase implements IAdvanced @Override public String getFront(boolean isActive) { - return isActive ? prefix + "thermal_generator_side_on" : prefix + "matter_fabricator_off"; + return isActive ? prefix + "thermal_generator_side_on" : prefix + "thermal_generator_side_off"; } @Override public String getSide(boolean isActive) { - return isActive ? prefix + "thermal_generator_side_on" : prefix + "matter_fabricator_off"; + return isActive ? prefix + "thermal_generator_side_on" : prefix + "thermal_generator_side_off"; } @Override public String getTop(boolean isActive) { - return isActive ? prefix + "thermal_generator_top_on" : prefix + "matter_fabricator_off"; + return isActive ? prefix + "thermal_generator_top_on" : prefix + "thermal_generator_top_off"; } @Override diff --git a/src/main/java/techreborn/items/tools/ItemNanosaber.java b/src/main/java/techreborn/items/tools/ItemNanosaber.java index 4af3e91e8..ab65e9105 100644 --- a/src/main/java/techreborn/items/tools/ItemNanosaber.java +++ b/src/main/java/techreborn/items/tools/ItemNanosaber.java @@ -54,13 +54,14 @@ public class ItemNanosaber extends ItemSword implements IEnergyItemInfo, ITextur @Override public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { - if(stack.getItemDamage()==0){ - stack.setItemDamage(1); + ItemStack newStack = stack.copy(); + if(newStack.getItemDamage()==0){ + newStack.setItemDamage(1); } - if(stack.getItemDamage()==1){ - stack.setItemDamage(0); + if(newStack.getItemDamage()==1){ + newStack.setItemDamage(0); } - return stack; + return newStack; } @Override diff --git a/src/main/resources/assets/techreborn/textures/items/tool/nanosaber_on.png.mcmeta b/src/main/resources/assets/techreborn/textures/items/tool/nanosaber_on.png.mcmeta index 60af67825..97596ba81 100644 --- a/src/main/resources/assets/techreborn/textures/items/tool/nanosaber_on.png.mcmeta +++ b/src/main/resources/assets/techreborn/textures/items/tool/nanosaber_on.png.mcmeta @@ -1,5 +1,5 @@ { "animation":{ - "frametime":4 + "frametime":2 } } \ No newline at end of file