diff --git a/Jenkinsfile b/Jenkinsfile index 1528fb42d..5d0a17882 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -11,7 +11,7 @@ pipeline { stage ('Build') { when { - branch '1.15' + branch '1.16' } steps { sh "./gradlew clean build publish curseTools --refresh-dependencies --stacktrace" diff --git a/README.md b/README.md index 6f1ef6cb9..90b181967 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![](http://cf.way2muchnoise.eu/full_233564_downloads.svg)](https://minecraft.curseforge.com/projects/techreborn) [![](http://cf.way2muchnoise.eu/packs/233564.svg)](https://minecraft.curseforge.com/projects/techreborn) [![](http://cf.way2muchnoise.eu/versions/233564.svg)](https://minecraft.curseforge.com/projects/techreborn) [![](https://img.shields.io/badge/Discord-TeamReborn-738bd7.svg)](https://discord.gg/teamreborn) [![Crowdin](https://d322cqt584bo4o.cloudfront.net/techreborn/localized.svg)](https://translate.techreborn.ovh/project/techreborn) -# Tech Reborn for 1.15.1 [![Build Status](https://jenkins.modmuss50.me/job/Team%20Reborn/job/TechReborn/job/1.15/badge/icon)](https://jenkins.modmuss50.me/job/Team%20Reborn/job/TechReborn/job/1.15/) +# Tech Reborn for 1.16 [![Build Status](https://jenkins.modmuss50.me/job/Team%20Reborn/job/TechReborn/job/1.16/badge/icon)](https://jenkins.modmuss50.me/job/Team%20Reborn/job/TechReborn/job/1.16/) *Tech Reborn is a completely standalone tech mod including tools and machines to gather resources, process materials, and progress through the mod.* diff --git a/build.conf b/build.conf index e88c1ecf2..09db4fcee 100644 --- a/build.conf +++ b/build.conf @@ -1,5 +1,5 @@ -minecraftVersion="1.15.2,1.15.1,1.15,Fabric" -name="TechReborn-1.15" +minecraftVersion="1.16-Snapshot,Fabric" +name="TechReborn-1.16" curseID="233564" github-repo="TechReborn/TechReborn" child-project="reborncore" diff --git a/build.gradle b/build.gradle index dacc4628a..e60c65856 100644 --- a/build.gradle +++ b/build.gradle @@ -65,17 +65,17 @@ license { group = 'TechReborn' dependencies { - minecraft "com.mojang:minecraft:1.15.2" - mappings "net.fabricmc:yarn:1.15.2+build.2:v2" - modImplementation "net.fabricmc:fabric-loader:0.7.5+build.178" + minecraft "com.mojang:minecraft:20w06a" + mappings "net.fabricmc:yarn:20w06a+build.15:v2" + modImplementation "net.fabricmc:fabric-loader:0.7.8+build.184" //Fabric api - modImplementation "net.fabricmc.fabric-api:fabric-api:0.4.29+build.290-1.15" + modImplementation "net.fabricmc.fabric-api:fabric-api:0.4.32+build.296-1.16" optionalDependency ("me.shedaniel:RoughlyEnoughItems:3.2.31") optionalDependency ('io.github.cottonmc:LibCD:2.0.1+1.15') - def rcVersion = 'RebornCore:RebornCore-1.15:+' + def rcVersion = 'RebornCore:RebornCore-1.16:+' modApi (rcVersion) { exclude group: "net.fabricmc" } diff --git a/settings.gradle b/settings.gradle index b7d11129d..ddb111a67 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1 @@ -rootProject.name = "TechReborn-1.15" \ No newline at end of file +rootProject.name = "TechReborn-1.16" \ No newline at end of file diff --git a/src/main/java/techreborn/blockentity/cable/CableBlockEntity.java b/src/main/java/techreborn/blockentity/cable/CableBlockEntity.java index 115483e1b..9820b775e 100644 --- a/src/main/java/techreborn/blockentity/cable/CableBlockEntity.java +++ b/src/main/java/techreborn/blockentity/cable/CableBlockEntity.java @@ -31,7 +31,7 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.entity.BlockEntity; -import net.minecraft.client.network.packet.BlockEntityUpdateS2CPacket; +import net.minecraft.network.packet.s2c.play.BlockEntityUpdateS2CPacket; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; diff --git a/src/main/java/techreborn/blocks/misc/BlockRubberLeaves.java b/src/main/java/techreborn/blocks/misc/BlockRubberLeaves.java index da4f15f03..c50b9aa4a 100644 --- a/src/main/java/techreborn/blocks/misc/BlockRubberLeaves.java +++ b/src/main/java/techreborn/blocks/misc/BlockRubberLeaves.java @@ -25,6 +25,7 @@ package techreborn.blocks.misc; import net.fabricmc.fabric.api.block.FabricBlockSettings; +import net.fabricmc.fabric.api.registry.FlammableBlockRegistry; import net.minecraft.block.Blocks; import net.minecraft.block.FireBlock; import net.minecraft.block.LeavesBlock; @@ -35,7 +36,7 @@ public class BlockRubberLeaves extends LeavesBlock { public BlockRubberLeaves() { super(FabricBlockSettings.of(Material.LEAVES).hardness(0.2F).ticksRandomly().sounds(BlockSoundGroup.GRASS).build().nonOpaque()); - ((FireBlock) Blocks.FIRE).registerFlammableBlock(this, 30, 60); + FlammableBlockRegistry.getDefaultInstance().add(this, 30, 60); } } diff --git a/src/main/java/techreborn/blocks/misc/BlockRubberLog.java b/src/main/java/techreborn/blocks/misc/BlockRubberLog.java index 5ee2ac74d..5e1e02fc3 100644 --- a/src/main/java/techreborn/blocks/misc/BlockRubberLog.java +++ b/src/main/java/techreborn/blocks/misc/BlockRubberLog.java @@ -25,6 +25,7 @@ package techreborn.blocks.misc; import net.fabricmc.fabric.api.block.FabricBlockSettings; +import net.fabricmc.fabric.api.registry.FlammableBlockRegistry; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; @@ -75,7 +76,7 @@ public class BlockRubberLog extends LogBlock { public BlockRubberLog() { super(MaterialColor.SPRUCE, FabricBlockSettings.of(Material.WOOD, MaterialColor.BROWN).strength(2.0F, 2f).sounds(BlockSoundGroup.WOOD).ticksRandomly().build()); this.setDefaultState(this.getDefaultState().with(SAP_SIDE, Direction.NORTH).with(HAS_SAP, false).with(AXIS, Direction.Axis.Y)); - ((FireBlock) Blocks.FIRE).registerFlammableBlock(this, 5, 5); + FlammableBlockRegistry.getDefaultInstance().add(this, 5, 5); } @Override diff --git a/src/main/java/techreborn/blocks/misc/BlockRubberPlank.java b/src/main/java/techreborn/blocks/misc/BlockRubberPlank.java index 3d6c03edb..bb61ed5d8 100644 --- a/src/main/java/techreborn/blocks/misc/BlockRubberPlank.java +++ b/src/main/java/techreborn/blocks/misc/BlockRubberPlank.java @@ -25,6 +25,7 @@ package techreborn.blocks.misc; import net.fabricmc.fabric.api.block.FabricBlockSettings; +import net.fabricmc.fabric.api.registry.FlammableBlockRegistry; import net.minecraft.block.Block; import net.minecraft.block.Blocks; import net.minecraft.block.FireBlock; @@ -38,6 +39,6 @@ public class BlockRubberPlank extends Block { public BlockRubberPlank() { super(FabricBlockSettings.of(Material.WOOD).strength(2f, 2f).sounds(BlockSoundGroup.WOOD).build()); - ((FireBlock) Blocks.FIRE).registerFlammableBlock(this, 5, 20); + FlammableBlockRegistry.getDefaultInstance().add(this, 5, 20); } } diff --git a/src/main/java/techreborn/init/TRArmorMaterials.java b/src/main/java/techreborn/init/TRArmorMaterials.java index 9163a4208..48915df75 100644 --- a/src/main/java/techreborn/init/TRArmorMaterials.java +++ b/src/main/java/techreborn/init/TRArmorMaterials.java @@ -106,4 +106,9 @@ public enum TRArmorMaterials implements ArmorMaterial { public float getToughness() { return toughness; } + + @Override + public float method_24355() { + return 0; //Knockback resitance + } } diff --git a/src/main/java/techreborn/world/WorldGenerator.java b/src/main/java/techreborn/world/WorldGenerator.java index d4ca926f9..f632f2dfd 100644 --- a/src/main/java/techreborn/world/WorldGenerator.java +++ b/src/main/java/techreborn/world/WorldGenerator.java @@ -40,8 +40,8 @@ import net.minecraft.world.gen.feature.Feature; import net.minecraft.world.gen.feature.OreFeatureConfig; import net.minecraft.world.gen.feature.OreFeatureConfig.Target; import net.minecraft.world.gen.foliage.BlobFoliagePlacer; -import net.minecraft.world.gen.stateprovider.SimpleStateProvider; -import net.minecraft.world.gen.stateprovider.WeightedStateProvider; +import net.minecraft.world.gen.stateprovider.SimpleBlockStateProvider; +import net.minecraft.world.gen.stateprovider.WeightedBlockStateProvider; import reborncore.common.world.CustomOreFeature; import reborncore.common.world.CustomOreFeatureConfig; import techreborn.blocks.misc.BlockRubberLog; @@ -77,7 +77,7 @@ public class WorldGenerator { private static void setupTrees() { RUBBER_TREE = Registry.register(Registry.FEATURE, new Identifier("techreborn:rubber_tree"), new RubberTreeFeature(BranchedTreeFeatureConfig::deserialize)); - WeightedStateProvider logProvider = new WeightedStateProvider(); + WeightedBlockStateProvider logProvider = new WeightedBlockStateProvider(); logProvider.addState(TRContent.RUBBER_LOG.getDefaultState(), 10); Arrays.stream(Direction.values()) @@ -90,7 +90,7 @@ public class WorldGenerator { RUBBER_TREE_CONFIG = new BranchedTreeFeatureConfig.Builder( logProvider, - new SimpleStateProvider(TRContent.RUBBER_LEAVES.getDefaultState()), + new SimpleBlockStateProvider(TRContent.RUBBER_LEAVES.getDefaultState()), new BlobFoliagePlacer(2, 0)) .baseHeight(6) .heightRandA(2)