minecraft/quickiefabric
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

terrestria leaves added to speedpowder axe blocks

Browse Source
This commit is contained in:
Jörg Henke 2021-01-06 20:53:01 +01:00
parent d0e63ca87a
commit a7311b9da0
4 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@ -8,7 +8,7 @@ org.gradle.jvmargs=-Xmx1G
loader_version=0.10.6+build.214 loader_version=0.10.6+build.214
# Mod Properties # Mod Properties
mod_version = 1.16.4.4 mod_version = 1.16.4.5
maven_group = de.jottyfan.minecraft maven_group = de.jottyfan.minecraft
archives_base_name = quickiefabric archives_base_name = quickiefabric

15
src/main/java/de/jottyfan/minecraft/quickiefabric/tools/ToolRangeable.java
View File

@ -10,7 +10,6 @@ import com.google.common.collect.Sets;
import de.jottyfan.minecraft.quickiefabric.tools.externalmods.Byg; import de.jottyfan.minecraft.quickiefabric.tools.externalmods.Byg;
import de.jottyfan.minecraft.quickiefabric.tools.externalmods.IdentifierGroup; import de.jottyfan.minecraft.quickiefabric.tools.externalmods.IdentifierGroup;
import de.jottyfan.minecraft.quickiefabric.tools.externalmods.IdentifierGroups;
import de.jottyfan.minecraft.quickiefabric.tools.externalmods.Terrestria; import de.jottyfan.minecraft.quickiefabric.tools.externalmods.Terrestria;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.BlockState; import net.minecraft.block.BlockState;
@ -51,15 +50,11 @@ public interface ToolRangeable {
Arrays.asList(Blocks.POTTED_RED_MUSHROOM, Blocks.RED_MUSHROOM_BLOCK, Blocks.RED_MUSHROOM, Blocks.MUSHROOM_STEM)); Arrays.asList(Blocks.POTTED_RED_MUSHROOM, Blocks.RED_MUSHROOM_BLOCK, Blocks.RED_MUSHROOM, Blocks.MUSHROOM_STEM));
public static final Set<IdentifierGroup> AXE_EFFECTIVE_ON_EXTERNAL = mergeGroupSets( public static final Set<IdentifierGroup> AXE_EFFECTIVE_ON_EXTERNAL = mergeGroupSets(
Terrestria.createFromSet( Terrestria.createFromSet(Terrestria.WOOD.getGroups("log", "quarter_log", "log_bare", "log_top", "wood", "")),
new IdentifierGroups("cypress", "hemlock", "japanese_maple", "rainbow_eucalyptus", "redwood", "rubber", // only because terrestria leaves are not instanceof LeavesBlock
"sakura", "willow", "yucca_palm").getGroups("log", "quarter_log", "log_bare", "log_top", "wood")), Terrestria.createFromSet(Terrestria.WOOD.getGroups("leaves")),
Byg.createFromSet(new IdentifierGroups("aspen", "baobab", "blue_enchanted", "cherry", "cika", "cypress", "ebony", Byg.createFromSet(Byg.WOOD.getGroups("log", "wood")),
"fir", "green_enchanted", "holly", "jacaranda", "mahogany", "mangrove", "pine", "rainbow_eucalyptus", Byg.createFromSet(Byg.MUSHROOM.getGroups("block", "stem")));
"redwood", "skyris", "willow", "witch_hazel", "zelkova").getGroups("log", "wood")),
Byg.createFromSet(
new IdentifierGroups("blue_glowshroom", "purple_glowshroom", "red_glowshroom", "yellow_glowshroom")
.getGroups("block", "stem")));
public static final Set<Block> PICKAXE_EFFECTIVE_ON = Sets.newHashSet(new Block[] { Blocks.GLOWSTONE }); public static final Set<Block> PICKAXE_EFFECTIVE_ON = Sets.newHashSet(new Block[] { Blocks.GLOWSTONE });

11
src/main/java/de/jottyfan/minecraft/quickiefabric/tools/externalmods/Byg.java
View File

@ -12,6 +12,12 @@ import net.minecraft.util.Identifier;
*/ */
public class Byg extends Identifier { public class Byg extends Identifier {
public static final IdentifierGroups WOOD = new IdentifierGroups("aspen", "baobab", "blue_enchanted", "cherry",
"cika", "cypress", "ebony", "fir", "green_enchanted", "holly", "jacaranda", "mahogany", "mangrove", "pine",
"rainbow_eucalyptus", "redwood", "skyris", "willow", "witch_hazel", "zelkova");
public static final IdentifierGroups MUSHROOM = new IdentifierGroups("blue_glowshroom", "purple_glowshroom",
"red_glowshroom", "yellow_glowshroom");
/** /**
* create identifier preluded by byg (for biomes you'll go) * create identifier preluded by byg (for biomes you'll go)
* *
@ -56,9 +62,8 @@ public class Byg extends Identifier {
* @param set the set * @param set the set
* @return the set of idenfifier groups * @return the set of idenfifier groups
*/ */
public static final Set<IdentifierGroup> createFromSet(Set<IdentifierGroup> set){ public static final Set<IdentifierGroup> createFromSet(Set<IdentifierGroup> set) {
for (IdentifierGroup group : set) for (IdentifierGroup group : set) {
{
group.setModId("byg"); group.setModId("byg");
} }
return set; return set;

9
src/main/java/de/jottyfan/minecraft/quickiefabric/tools/externalmods/Terrestria.java
View File

@ -12,6 +12,9 @@ import net.minecraft.util.Identifier;
*/ */
public class Terrestria extends Identifier { public class Terrestria extends Identifier {
public static final IdentifierGroups WOOD = new IdentifierGroups("cypress", "hemlock", "japanese_maple",
"rainbow_eucalyptus", "redwood", "rubber", "sakura", "willow", "yucca_palm");
/** /**
* create identifier preluded by terrestria * create identifier preluded by terrestria
* *
@ -50,16 +53,14 @@ public class Terrestria extends Identifier {
return set; return set;
} }
/** /**
* create from set * create from set
* *
* @param set the set * @param set the set
* @return the set of idenfifier groups * @return the set of idenfifier groups
*/ */
public static final Set<IdentifierGroup> createFromSet(Set<IdentifierGroup> set){ public static final Set<IdentifierGroup> createFromSet(Set<IdentifierGroup> set) {
for (IdentifierGroup group : set) for (IdentifierGroup group : set) {
{
group.setModId("terrestria"); group.setModId("terrestria");
} }
return set; return set;