mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2025-09-09 05:45:58 +00:00
Code Issues Releases Wiki Activity

Fix #68, #69. Pre-setup auto releasing (#72)

Browse Source 
* Fix #68, #69. Pre-setup auto releasing
This commit is contained in:
Patbox
2022-03-19 17:10:53 +01:00
committed by GitHub
parent f8fe161b70
commit eface1495e
7 changed files with 126 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/dan200/computercraft/fabric/mixin/MixinLanguage.java
View File

@@ -15,8 +15,8 @@ import net.fabricmc.loader.api.FabricLoader;
import net.fabricmc.loader.api.ModContainer;
import com.google.common.collect.ImmutableMap;
import com.google.gson.JsonParseException;
import org.apache.logging.log4j.Logger;
import org.jetbrains.annotations.NotNull;
import org.slf4j.Logger;
import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;

5
src/main/java/dan200/computercraft/shared/Registry.java
View File

@@ -62,7 +62,6 @@ import net.minecraft.world.inventory.MenuType;
import net.minecraft.world.item.*;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.Blocks;
import net.minecraft.world.level.block.SoundType;
import net.minecraft.world.level.block.entity.BlockEntity;
import net.minecraft.world.level.block.entity.BlockEntityType;
import net.minecraft.world.level.block.state.BlockBehaviour;
@@ -148,12 +147,12 @@ public final class Registry
private static BlockBehaviour.Properties properties()
{
return BlockBehaviour.Properties.of( Material.GLASS ).strength( 2F ).sound( SoundType.STONE ).noOcclusion();
return BlockBehaviour.Properties.of( Material.STONE ).strength( 2F ).noOcclusion();
}
private static BlockBehaviour.Properties turtleProperties()
{
return FabricBlockSettings.copyOf( Blocks.STONE ).strength( 2.5f );
return BlockBehaviour.Properties.of( Material.STONE ).strength( 2.5f );
}
private static BlockBehaviour.Properties modemProperties()

19
src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json Normal file
View File

@@ -0,0 +1,19 @@
{
"replace": false,
"values": [
"computercraft:monitor_normal",
"computercraft:monitor_advanced",
"computercraft:computer_normal",
"computercraft:computer_advanced",
"computercraft:computer_command",
"computercraft:turtle_normal",
"computercraft:turtle_advanced",
"computercraft:speaker",
"computercraft:disk_drive",
"computercraft:printer",
"computercraft:wireless_modem_normal",
"computercraft:wireless_modem_advanced",
"computercraft:wired_modem_full",
"computercraft:cable"
]
}