maciek/TechReborn
maciek/TechReborn
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

1.16

Browse source
This commit is contained in:
modmuss50 2020-02-12 18:36:01 +00:00
parent b0d3b3b77d
commit dffec285b2
11 changed files with 26 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Jenkinsfile vendored
View file

@ -11,7 +11,7 @@ pipeline {
stage ('Build') { stage ('Build') {
when { when {
branch '1.15' branch '1.16'
} }
steps { steps {
sh "./gradlew clean build publish curseTools --refresh-dependencies --stacktrace" sh "./gradlew clean build publish curseTools --refresh-dependencies --stacktrace"

2
README.md
View file

@ -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) [![](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.* *Tech Reborn is a completely standalone tech mod including tools and machines to gather resources, process materials, and progress through the mod.*

4
build.conf
View file

@ -1,5 +1,5 @@
minecraftVersion="1.15.2,1.15.1,1.15,Fabric" minecraftVersion="1.16-Snapshot,Fabric"
name="TechReborn-1.15" name="TechReborn-1.16"
curseID="233564" curseID="233564"
github-repo="TechReborn/TechReborn" github-repo="TechReborn/TechReborn"
child-project="reborncore" child-project="reborncore"

10
build.gradle
View file

@ -65,17 +65,17 @@ license {
group = 'TechReborn' group = 'TechReborn'
dependencies { dependencies {
minecraft "com.mojang:minecraft:1.15.2" minecraft "com.mojang:minecraft:20w06a"
mappings "net.fabricmc:yarn:1.15.2+build.2:v2" mappings "net.fabricmc:yarn:20w06a+build.15:v2"
modImplementation "net.fabricmc:fabric-loader:0.7.5+build.178" modImplementation "net.fabricmc:fabric-loader:0.7.8+build.184"
//Fabric api //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 ("me.shedaniel:RoughlyEnoughItems:3.2.31")
optionalDependency ('io.github.cottonmc:LibCD:2.0.1+1.15') optionalDependency ('io.github.cottonmc:LibCD:2.0.1+1.15')
def rcVersion = 'RebornCore:RebornCore-1.15:+' def rcVersion = 'RebornCore:RebornCore-1.16:+'
modApi (rcVersion) { modApi (rcVersion) {
exclude group: "net.fabricmc" exclude group: "net.fabricmc"
} }

2
settings.gradle
View file

@ -1 +1 @@
rootProject.name = "TechReborn-1.15" rootProject.name = "TechReborn-1.16"

2
src/main/java/techreborn/blockentity/cable/CableBlockEntity.java
View file

@ -31,7 +31,7 @@ import java.util.List;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.BlockState; import net.minecraft.block.BlockState;
import net.minecraft.block.entity.BlockEntity; 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.entity.player.PlayerEntity;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.CompoundTag;

3
src/main/java/techreborn/blocks/misc/BlockRubberLeaves.java
View file

@ -25,6 +25,7 @@
package techreborn.blocks.misc; package techreborn.blocks.misc;
import net.fabricmc.fabric.api.block.FabricBlockSettings; import net.fabricmc.fabric.api.block.FabricBlockSettings;
import net.fabricmc.fabric.api.registry.FlammableBlockRegistry;
import net.minecraft.block.Blocks; import net.minecraft.block.Blocks;
import net.minecraft.block.FireBlock; import net.minecraft.block.FireBlock;
import net.minecraft.block.LeavesBlock; import net.minecraft.block.LeavesBlock;
@ -35,7 +36,7 @@ public class BlockRubberLeaves extends LeavesBlock {
public BlockRubberLeaves() { public BlockRubberLeaves() {
super(FabricBlockSettings.of(Material.LEAVES).hardness(0.2F).ticksRandomly().sounds(BlockSoundGroup.GRASS).build().nonOpaque()); 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);
} }
} }

3
src/main/java/techreborn/blocks/misc/BlockRubberLog.java
View file

@ -25,6 +25,7 @@
package techreborn.blocks.misc; package techreborn.blocks.misc;
import net.fabricmc.fabric.api.block.FabricBlockSettings; import net.fabricmc.fabric.api.block.FabricBlockSettings;
import net.fabricmc.fabric.api.registry.FlammableBlockRegistry;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.BlockState; import net.minecraft.block.BlockState;
import net.minecraft.block.Blocks; import net.minecraft.block.Blocks;
@ -75,7 +76,7 @@ public class BlockRubberLog extends LogBlock {
public BlockRubberLog() { public BlockRubberLog() {
super(MaterialColor.SPRUCE, FabricBlockSettings.of(Material.WOOD, MaterialColor.BROWN).strength(2.0F, 2f).sounds(BlockSoundGroup.WOOD).ticksRandomly().build()); 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)); 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 @Override

3
src/main/java/techreborn/blocks/misc/BlockRubberPlank.java
View file

@ -25,6 +25,7 @@
package techreborn.blocks.misc; package techreborn.blocks.misc;
import net.fabricmc.fabric.api.block.FabricBlockSettings; import net.fabricmc.fabric.api.block.FabricBlockSettings;
import net.fabricmc.fabric.api.registry.FlammableBlockRegistry;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.Blocks; import net.minecraft.block.Blocks;
import net.minecraft.block.FireBlock; import net.minecraft.block.FireBlock;
@ -38,6 +39,6 @@ public class BlockRubberPlank extends Block {
public BlockRubberPlank() { public BlockRubberPlank() {
super(FabricBlockSettings.of(Material.WOOD).strength(2f, 2f).sounds(BlockSoundGroup.WOOD).build()); 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);
} }
} }

5
src/main/java/techreborn/init/TRArmorMaterials.java
View file

@ -106,4 +106,9 @@ public enum TRArmorMaterials implements ArmorMaterial {
public float getToughness() { public float getToughness() {
return toughness; return toughness;
} }
@Override
public float method_24355() {
return 0; //Knockback resitance
}
} }

8
src/main/java/techreborn/world/WorldGenerator.java
View file

@ -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;
import net.minecraft.world.gen.feature.OreFeatureConfig.Target; import net.minecraft.world.gen.feature.OreFeatureConfig.Target;
import net.minecraft.world.gen.foliage.BlobFoliagePlacer; import net.minecraft.world.gen.foliage.BlobFoliagePlacer;
import net.minecraft.world.gen.stateprovider.SimpleStateProvider; import net.minecraft.world.gen.stateprovider.SimpleBlockStateProvider;
import net.minecraft.world.gen.stateprovider.WeightedStateProvider; import net.minecraft.world.gen.stateprovider.WeightedBlockStateProvider;
import reborncore.common.world.CustomOreFeature; import reborncore.common.world.CustomOreFeature;
import reborncore.common.world.CustomOreFeatureConfig; import reborncore.common.world.CustomOreFeatureConfig;
import techreborn.blocks.misc.BlockRubberLog; import techreborn.blocks.misc.BlockRubberLog;
@ -77,7 +77,7 @@ public class WorldGenerator {
private static void setupTrees() { private static void setupTrees() {
RUBBER_TREE = Registry.register(Registry.FEATURE, new Identifier("techreborn:rubber_tree"), new RubberTreeFeature(BranchedTreeFeatureConfig::deserialize)); 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); logProvider.addState(TRContent.RUBBER_LOG.getDefaultState(), 10);
Arrays.stream(Direction.values()) Arrays.stream(Direction.values())
@ -90,7 +90,7 @@ public class WorldGenerator {
RUBBER_TREE_CONFIG = new BranchedTreeFeatureConfig.Builder( RUBBER_TREE_CONFIG = new BranchedTreeFeatureConfig.Builder(
logProvider, logProvider,
new SimpleStateProvider(TRContent.RUBBER_LEAVES.getDefaultState()), new SimpleBlockStateProvider(TRContent.RUBBER_LEAVES.getDefaultState()),
new BlobFoliagePlacer(2, 0)) new BlobFoliagePlacer(2, 0))
.baseHeight(6) .baseHeight(6)
.heightRandA(2) .heightRandA(2)