MinecraftMods/BetterEnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
paulevsGitch 2021-11-21 07:09:28 +03:00
commit 2afb62d6c8
2 changed files with 21 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
gradle.properties
View file

@ -6,7 +6,7 @@ minecraft_version=1.17.1
yarn_mappings=6 yarn_mappings=6
loader_version=0.12.4 loader_version=0.12.4
# Mod Properties # Mod Properties
mod_version=0.12.2 mod_version=0.12.3
maven_group=ru.betterend maven_group=ru.betterend
archives_base_name=better-end archives_base_name=better-end

25
src/main/java/ru/betterend/registry/EndTags.java
View file

@ -1,6 +1,9 @@
package ru.betterend.registry; package ru.betterend.registry;
import java.util.List;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import net.fabricmc.fabric.impl.tool.attribute.ToolManagerImpl; import net.fabricmc.fabric.impl.tool.attribute.ToolManagerImpl;
import net.fabricmc.fabric.impl.tool.attribute.handlers.ModdedToolsVanillaBlocksToolHandler; import net.fabricmc.fabric.impl.tool.attribute.handlers.ModdedToolsVanillaBlocksToolHandler;
import net.fabricmc.fabric.mixin.object.builder.AbstractBlockAccessor; import net.fabricmc.fabric.mixin.object.builder.AbstractBlockAccessor;
@ -30,8 +33,6 @@ import ru.betterend.blocks.basis.EndTerrainBlock;
import ru.betterend.blocks.basis.PedestalBlock; import ru.betterend.blocks.basis.PedestalBlock;
import ru.betterend.item.tool.EndHammerItem; import ru.betterend.item.tool.EndHammerItem;
import java.util.List;
public class EndTags { public class EndTags {
// Table with common (c) tags: // Table with common (c) tags:
// https://fabricmc.net/wiki/tutorial:tags // https://fabricmc.net/wiki/tutorial:tags
@ -43,6 +44,12 @@ public class EndTags {
public static final Tag.Named<Item> ALLOYING_IRON = TagAPI.makeItemTag(BetterEnd.MOD_ID, "alloying_iron"); public static final Tag.Named<Item> ALLOYING_IRON = TagAPI.makeItemTag(BetterEnd.MOD_ID, "alloying_iron");
public static final Tag.Named<Item> ALLOYING_GOLD = TagAPI.makeItemTag(BetterEnd.MOD_ID, "alloying_gold"); public static final Tag.Named<Item> ALLOYING_GOLD = TagAPI.makeItemTag(BetterEnd.MOD_ID, "alloying_gold");
public static final Tag.Named<Item> ALLOYING_COPPER = TagAPI.makeItemTag(BetterEnd.MOD_ID, "alloying_copper"); public static final Tag.Named<Item> ALLOYING_COPPER = TagAPI.makeItemTag(BetterEnd.MOD_ID, "alloying_copper");
private static void allowCompost(float chance, Item item){
if (item!=null && item != Items.AIR) {
ComposterBlockAccessor.callAdd(chance, item);
}
}
public static void register() { public static void register() {
TagAPI.addEndGround(EndBlocks.THALLASIUM.ore); TagAPI.addEndGround(EndBlocks.THALLASIUM.ore);
@ -52,6 +59,7 @@ public class EndTags {
EndBlocks.getModBlocks().forEach(block -> { EndBlocks.getModBlocks().forEach(block -> {
Properties properties = ((AbstractBlockAccessor) block).getSettings(); Properties properties = ((AbstractBlockAccessor) block).getSettings();
Material material = ((AbstractBlockSettingsAccessor) properties).getMaterial(); Material material = ((AbstractBlockSettingsAccessor) properties).getMaterial();
final Item item = block.asItem();
if (material.equals(Material.STONE) || material.equals(Material.METAL) || material.equals(Material.HEAVY_METAL)) { if (material.equals(Material.STONE) || material.equals(Material.METAL) || material.equals(Material.HEAVY_METAL)) {
TagAPI.addTag(TagAPI.MINEABLE_PICKAXE, block); TagAPI.addTag(TagAPI.MINEABLE_PICKAXE, block);
@ -73,7 +81,10 @@ public class EndTags {
} }
else if (block instanceof LeavesBlock || block instanceof SimpleLeavesBlock) { else if (block instanceof LeavesBlock || block instanceof SimpleLeavesBlock) {
TagAPI.addTag(BlockTags.LEAVES, block); TagAPI.addTag(BlockTags.LEAVES, block);
ComposterBlockAccessor.callAdd(0.3F, block);
//TODO: for BCLib 0.5.3
//ComposterAPI.allowCompost(0.3f, item);
allowCompost(0.3F, item);
} }
else if (block instanceof BaseVineBlock) { else if (block instanceof BaseVineBlock) {
TagAPI.addTag(BlockTags.CLIMBABLE, block); TagAPI.addTag(BlockTags.CLIMBABLE, block);
@ -84,7 +95,9 @@ public class EndTags {
Material mat = block.defaultBlockState().getMaterial(); Material mat = block.defaultBlockState().getMaterial();
if (mat.equals(Material.PLANT) || mat.equals(Material.REPLACEABLE_PLANT)) { if (mat.equals(Material.PLANT) || mat.equals(Material.REPLACEABLE_PLANT)) {
ComposterBlockAccessor.callAdd(0.1F, block); //TODO: for BCLib 0.5.3
//ComposterAPI.allowCompost(0.3f, item);
allowCompost(0.1F, item);
} }
}); });
TagAPI.addEndGround(EndBlocks.CAVE_MOSS); TagAPI.addEndGround(EndBlocks.CAVE_MOSS);
@ -99,7 +112,9 @@ public class EndTags {
FoodProperties food = item.getFoodProperties(); FoodProperties food = item.getFoodProperties();
if (food != null) { if (food != null) {
float compost = food.getNutrition() * food.getSaturationModifier() * 0.18F; float compost = food.getNutrition() * food.getSaturationModifier() * 0.18F;
ComposterBlockAccessor.callAdd(compost, item); //TODO: for BCLib 0.5.3
//ComposterAPI.allowCompost(0.3f, item);
allowCompost(compost, item);
} }
} }
if (item instanceof EndHammerItem) { if (item instanceof EndHammerItem) {