* 20w08a

* update REI and libCD
This commit is contained in:
Milan 2020-02-25 19:00:15 +01:00 committed by GitHub
parent dffec285b2
commit 1de7b3afd2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 13 additions and 15 deletions

View file

@ -65,15 +65,15 @@ license {
group = 'TechReborn' group = 'TechReborn'
dependencies { dependencies {
minecraft "com.mojang:minecraft:20w06a" minecraft "com.mojang:minecraft:20w08a"
mappings "net.fabricmc:yarn:20w06a+build.15:v2" mappings "net.fabricmc:yarn:20w08a+build.6:v2"
modImplementation "net.fabricmc:fabric-loader:0.7.8+build.184" modImplementation "net.fabricmc:fabric-loader:0.7.8+build.184"
//Fabric api //Fabric api
modImplementation "net.fabricmc.fabric-api:fabric-api:0.4.32+build.296-1.16" modImplementation "net.fabricmc.fabric-api:fabric-api:0.4.33+build.299-1.16"
optionalDependency ("me.shedaniel:RoughlyEnoughItems:3.2.31") optionalDependency ("me.shedaniel:RoughlyEnoughItems:4.0.4-unstable.202002230746")
optionalDependency ('io.github.cottonmc:LibCD:2.0.1+1.15') optionalDependency ('io.github.cottonmc:LibCD:2.3.0+1.15.2')
def rcVersion = 'RebornCore:RebornCore-1.16:+' def rcVersion = 'RebornCore:RebornCore-1.16:+'
modApi (rcVersion) { modApi (rcVersion) {

View file

@ -86,7 +86,7 @@ public class BlockRubberLog extends LogBlock {
} }
@Override @Override
public boolean matches(Tag<Block> tagIn) { public boolean isIn(Tag<Block> tagIn) {
return tagIn == BlockTags.LOGS; return tagIn == BlockTags.LOGS;
} }

View file

@ -97,7 +97,7 @@ public class MachineRecipeCategory<R extends RebornRecipe> implements RecipeCate
Text energyPerTick = new TranslatableText("techreborn.jei.recipe.running.cost", "E", machineRecipe.getEnergy()); Text energyPerTick = new TranslatableText("techreborn.jei.recipe.running.cost", "E", machineRecipe.getEnergy());
LabelWidget costLabel; LabelWidget costLabel;
widgets.add(costLabel = new LabelWidget(startPoint.x + 1, startPoint.y + 1 + (i++ * 20), energyPerTick.asFormattedString())); widgets.add(costLabel = new LabelWidget(new Point(startPoint.x + 1, startPoint.y + 1 + (i++ * 20)), energyPerTick.asFormattedString()));
costLabel.setHasShadows(false); costLabel.setHasShadows(false);
costLabel.setDefaultColor(ScreenHelper.isDarkModeEnabled() ? 0xFFBBBBBB : 0xFF404040); costLabel.setDefaultColor(ScreenHelper.isDarkModeEnabled() ? 0xFFBBBBBB : 0xFF404040);
@ -110,7 +110,7 @@ public class MachineRecipeCategory<R extends RebornRecipe> implements RecipeCate
if (heat > 0) { if (heat > 0) {
String neededHeat = heat + " " + StringUtils.t("techreborn.jei.recipe.heat"); String neededHeat = heat + " " + StringUtils.t("techreborn.jei.recipe.heat");
LabelWidget heatLabel; LabelWidget heatLabel;
widgets.add(heatLabel = new LabelWidget(startPoint.x + 61, startPoint.y + 1 + (i++ * 20), neededHeat)); widgets.add(heatLabel = new LabelWidget(new Point(startPoint.x + 61, startPoint.y + 1 + (i++ * 20)), neededHeat));
heatLabel.setHasShadows(false); heatLabel.setHasShadows(false);
heatLabel.setDefaultColor(ScreenHelper.isDarkModeEnabled() ? 0xFFBBBBBB : 0xFF404040); heatLabel.setDefaultColor(ScreenHelper.isDarkModeEnabled() ? 0xFFBBBBBB : 0xFF404040);
} }

View file

@ -83,7 +83,7 @@ public class FluidGeneratorRecipeCategory implements RecipeCategory<FluidGenerat
Text energyPerTick = new TranslatableText("techreborn.jei.recipe.generator.total", machineRecipe.getTotalEnergy()); Text energyPerTick = new TranslatableText("techreborn.jei.recipe.generator.total", machineRecipe.getTotalEnergy());
LabelWidget costLabel; LabelWidget costLabel;
widgets.add(costLabel = new LabelWidget(bounds.getCenterX(), startPoint.y + 20, energyPerTick.asFormattedString())); widgets.add(costLabel = new LabelWidget(new Point(bounds.getCenterX(), startPoint.y + 20), energyPerTick.asFormattedString()));
costLabel.setHasShadows(false); costLabel.setHasShadows(false);
costLabel.setDefaultColor(ScreenHelper.isDarkModeEnabled() ? 0xFFBBBBBB : 0xFF404040); costLabel.setDefaultColor(ScreenHelper.isDarkModeEnabled() ? 0xFFBBBBBB : 0xFF404040);

View file

@ -85,7 +85,7 @@ public class FluidReplicatorRecipeCategory implements RecipeCategory<FluidReplic
Text energyPerTick = new TranslatableText("techreborn.jei.recipe.running.cost", "E", machineRecipe.getEnergy()); Text energyPerTick = new TranslatableText("techreborn.jei.recipe.running.cost", "E", machineRecipe.getEnergy());
LabelWidget costLabel; LabelWidget costLabel;
widgets.add(costLabel = new LabelWidget(startPoint.x + 1, startPoint.y + 1 + (i++ * 20), energyPerTick.asFormattedString())); widgets.add(costLabel = new LabelWidget(new Point(startPoint.x + 1, startPoint.y + 1 + (i++ * 20)), energyPerTick.asFormattedString()));
costLabel.setHasShadows(false); costLabel.setHasShadows(false);
costLabel.setDefaultColor(ScreenHelper.isDarkModeEnabled() ? 0xFFBBBBBB : 0xFF404040); costLabel.setDefaultColor(ScreenHelper.isDarkModeEnabled() ? 0xFFBBBBBB : 0xFF404040);

View file

@ -108,7 +108,5 @@ public enum TRArmorMaterials implements ArmorMaterial {
} }
@Override @Override
public float method_24355() { public float getKnockbackResistance() { return 0; }
return 0; //Knockback resitance
}
} }

View file

@ -77,7 +77,7 @@ public class DynamicCellItem extends Item implements ItemFluidInfo {
// Thanks vanilla :) // Thanks vanilla :)
private void playEmptyingSound(@Nullable PlayerEntity playerEntity, IWorld world, BlockPos blockPos, Fluid fluid) { private void playEmptyingSound(@Nullable PlayerEntity playerEntity, IWorld world, BlockPos blockPos, Fluid fluid) {
SoundEvent soundEvent = fluid.matches(FluidTags.LAVA) ? SoundEvents.ITEM_BUCKET_EMPTY_LAVA : SoundEvents.ITEM_BUCKET_EMPTY; SoundEvent soundEvent = fluid.isIn(FluidTags.LAVA) ? SoundEvents.ITEM_BUCKET_EMPTY_LAVA : SoundEvents.ITEM_BUCKET_EMPTY;
world.playSound(playerEntity, blockPos, soundEvent, SoundCategory.BLOCKS, 1.0F, 1.0F); world.playSound(playerEntity, blockPos, soundEvent, SoundCategory.BLOCKS, 1.0F, 1.0F);
} }
@ -116,7 +116,7 @@ public class DynamicCellItem extends Item implements ItemFluidInfo {
if (!blockState.isAir() && !canPlace && (!(blockState.getBlock() instanceof FluidFillable) || !((FluidFillable)blockState.getBlock()).canFillWithFluid(world, pos, blockState, fluid))) { if (!blockState.isAir() && !canPlace && (!(blockState.getBlock() instanceof FluidFillable) || !((FluidFillable)blockState.getBlock()).canFillWithFluid(world, pos, blockState, fluid))) {
return hitResult != null && this.placeFluid(player, world, hitResult.getBlockPos().offset(hitResult.getSide()), null, filledCell); return hitResult != null && this.placeFluid(player, world, hitResult.getBlockPos().offset(hitResult.getSide()), null, filledCell);
} else { } else {
if (world.dimension.doesWaterVaporize() && fluid.matches(FluidTags.WATER)) { if (world.dimension.doesWaterVaporize() && fluid.isIn(FluidTags.WATER)) {
int i = pos.getX(); int i = pos.getX();
int j = pos.getY(); int j = pos.getY();
int k = pos.getZ(); int k = pos.getZ();