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

Complex material package move

Browse source
This commit is contained in:
paulevsGitch 2021-07-24 12:19:58 +03:00
parent a151132478
commit da8237c359
9 changed files with 918 additions and 918 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/ru/betterend/blocks/basis/EndAnvilBlock.java
View file

@ -2,7 +2,7 @@ package ru.betterend.blocks.basis;
import net.minecraft.world.level.material.MaterialColor; import net.minecraft.world.level.material.MaterialColor;
import ru.bclib.blocks.BaseAnvilBlock; import ru.bclib.blocks.BaseAnvilBlock;
import ru.betterend.blocks.complex.MetalMaterial; import ru.betterend.complexmaterials.MetalMaterial;
public class EndAnvilBlock extends BaseAnvilBlock { public class EndAnvilBlock extends BaseAnvilBlock {
protected MetalMaterial metalMaterial; protected MetalMaterial metalMaterial;

2
src/main/java/ru/betterend/blocks/complex/ColoredMaterial.java → src/main/java/ru/betterend/complexmaterials/ColoredMaterial.java
View file

@ -1,4 +1,4 @@
package ru.betterend.blocks.complex; package ru.betterend.complexmaterials;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;

2
src/main/java/ru/betterend/blocks/complex/CrystalSubblocksMaterial.java → src/main/java/ru/betterend/complexmaterials/CrystalSubblocksMaterial.java
View file

@ -1,4 +1,4 @@
package ru.betterend.blocks.complex; package ru.betterend.complexmaterials;
import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
import net.minecraft.tags.BlockTags; import net.minecraft.tags.BlockTags;

12
src/main/java/ru/betterend/blocks/complex/EndWoodenMaterial.java → src/main/java/ru/betterend/complexmaterials/EndWoodenComplexMaterial.java
View file

@ -1,24 +1,24 @@
package ru.betterend.blocks.complex; package ru.betterend.complexmaterials;
import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.material.MaterialColor; import net.minecraft.world.level.material.MaterialColor;
import ru.bclib.complexmaterials.WoodenMaterial; import ru.bclib.complexmaterials.WoodenComplexMaterial;
import ru.betterend.BetterEnd; import ru.betterend.BetterEnd;
import ru.betterend.config.Configs; import ru.betterend.config.Configs;
import ru.betterend.registry.EndBlocks; import ru.betterend.registry.EndBlocks;
import ru.betterend.registry.EndItems; import ru.betterend.registry.EndItems;
public class EndWoodenMaterial extends WoodenMaterial { public class EndWoodenComplexMaterial extends WoodenComplexMaterial {
private Block bark; private Block bark;
private Block log; private Block log;
public EndWoodenMaterial(String name, MaterialColor woodColor, MaterialColor planksColor) { public EndWoodenComplexMaterial(String name, MaterialColor woodColor, MaterialColor planksColor) {
super(BetterEnd.MOD_ID, name, woodColor, planksColor); super(BetterEnd.MOD_ID, name, woodColor, planksColor);
} }
public EndWoodenMaterial init() { public EndWoodenComplexMaterial init() {
return (EndWoodenMaterial) super.init(EndBlocks.getBlockRegistry(), EndItems.getItemRegistry(), Configs.RECIPE_CONFIG); return (EndWoodenComplexMaterial) super.init(EndBlocks.getBlockRegistry(), EndItems.getItemRegistry(), Configs.RECIPE_CONFIG);
} }
public boolean isTreeLog(Block block) { public boolean isTreeLog(Block block) {

2
src/main/java/ru/betterend/blocks/complex/MetalMaterial.java → src/main/java/ru/betterend/complexmaterials/MetalMaterial.java
View file

@ -1,4 +1,4 @@
package ru.betterend.blocks.complex; package ru.betterend.complexmaterials;
import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
import net.minecraft.tags.BlockTags; import net.minecraft.tags.BlockTags;

2
src/main/java/ru/betterend/blocks/complex/StoneMaterial.java → src/main/java/ru/betterend/complexmaterials/StoneMaterial.java
View file

@ -1,4 +1,4 @@
package ru.betterend.blocks.complex; package ru.betterend.complexmaterials;
import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
import net.minecraft.tags.BlockTags; import net.minecraft.tags.BlockTags;

2
src/main/java/ru/betterend/integration/FlamboyantRefabricatedIntegration.java
View file

@ -5,7 +5,7 @@ import net.minecraft.world.level.ItemLike;
import ru.bclib.integration.ModIntegration; import ru.bclib.integration.ModIntegration;
import ru.bclib.util.ColorUtil; import ru.bclib.util.ColorUtil;
import ru.betterend.blocks.HydraluxPetalColoredBlock; import ru.betterend.blocks.HydraluxPetalColoredBlock;
import ru.betterend.blocks.complex.ColoredMaterial; import ru.betterend.complexmaterials.ColoredMaterial;
import ru.betterend.registry.EndBlocks; import ru.betterend.registry.EndBlocks;
import java.awt.Color; import java.awt.Color;

30
src/main/java/ru/betterend/registry/EndBlocks.java
View file

@ -134,11 +134,11 @@ import ru.betterend.blocks.basis.FurBlock;
import ru.betterend.blocks.basis.PottableCropBlock; import ru.betterend.blocks.basis.PottableCropBlock;
import ru.betterend.blocks.basis.PottableLeavesBlock; import ru.betterend.blocks.basis.PottableLeavesBlock;
import ru.betterend.blocks.basis.StoneLanternBlock; import ru.betterend.blocks.basis.StoneLanternBlock;
import ru.betterend.blocks.complex.ColoredMaterial; import ru.betterend.complexmaterials.ColoredMaterial;
import ru.betterend.blocks.complex.CrystalSubblocksMaterial; import ru.betterend.complexmaterials.CrystalSubblocksMaterial;
import ru.betterend.blocks.complex.MetalMaterial; import ru.betterend.complexmaterials.EndWoodenComplexMaterial;
import ru.betterend.blocks.complex.StoneMaterial; import ru.betterend.complexmaterials.MetalMaterial;
import ru.betterend.blocks.complex.EndWoodenMaterial; import ru.betterend.complexmaterials.StoneMaterial;
import ru.betterend.config.Configs; import ru.betterend.config.Configs;
import ru.betterend.item.material.EndArmorMaterial; import ru.betterend.item.material.EndArmorMaterial;
import ru.betterend.item.material.EndToolMaterial; import ru.betterend.item.material.EndToolMaterial;
@ -289,7 +289,7 @@ public class EndBlocks extends BlockRegistry {
"mossy_glowshroom_fur", "mossy_glowshroom_fur",
new FurBlock(MOSSY_GLOWSHROOM_SAPLING, 15, 16, true) new FurBlock(MOSSY_GLOWSHROOM_SAPLING, 15, 16, true)
); );
public static final EndWoodenMaterial MOSSY_GLOWSHROOM = new EndWoodenMaterial( public static final EndWoodenComplexMaterial MOSSY_GLOWSHROOM = new EndWoodenComplexMaterial(
"mossy_glowshroom", "mossy_glowshroom",
MaterialColor.COLOR_GRAY, MaterialColor.COLOR_GRAY,
MaterialColor.WOOD MaterialColor.WOOD
@ -303,7 +303,7 @@ public class EndBlocks extends BlockRegistry {
"pythadendron_leaves", "pythadendron_leaves",
new PottableLeavesBlock(PYTHADENDRON_SAPLING, MaterialColor.COLOR_MAGENTA) new PottableLeavesBlock(PYTHADENDRON_SAPLING, MaterialColor.COLOR_MAGENTA)
); );
public static final EndWoodenMaterial PYTHADENDRON = new EndWoodenMaterial( public static final EndWoodenComplexMaterial PYTHADENDRON = new EndWoodenComplexMaterial(
"pythadendron", "pythadendron",
MaterialColor.COLOR_MAGENTA, MaterialColor.COLOR_MAGENTA,
MaterialColor.COLOR_PURPLE MaterialColor.COLOR_PURPLE
@ -313,7 +313,7 @@ public class EndBlocks extends BlockRegistry {
public static final Block END_LOTUS_STEM = registerBlock("end_lotus_stem", new EndLotusStemBlock()); public static final Block END_LOTUS_STEM = registerBlock("end_lotus_stem", new EndLotusStemBlock());
public static final Block END_LOTUS_LEAF = registerEndBlockOnly("end_lotus_leaf", new EndLotusLeafBlock()); public static final Block END_LOTUS_LEAF = registerEndBlockOnly("end_lotus_leaf", new EndLotusLeafBlock());
public static final Block END_LOTUS_FLOWER = registerEndBlockOnly("end_lotus_flower", new EndLotusFlowerBlock()); public static final Block END_LOTUS_FLOWER = registerEndBlockOnly("end_lotus_flower", new EndLotusFlowerBlock());
public static final EndWoodenMaterial END_LOTUS = new EndWoodenMaterial( public static final EndWoodenComplexMaterial END_LOTUS = new EndWoodenComplexMaterial(
"end_lotus", "end_lotus",
MaterialColor.COLOR_LIGHT_BLUE, MaterialColor.COLOR_LIGHT_BLUE,
MaterialColor.COLOR_CYAN MaterialColor.COLOR_CYAN
@ -324,7 +324,7 @@ public class EndBlocks extends BlockRegistry {
"lacugrove_leaves", "lacugrove_leaves",
new PottableLeavesBlock(LACUGROVE_SAPLING, MaterialColor.COLOR_CYAN) new PottableLeavesBlock(LACUGROVE_SAPLING, MaterialColor.COLOR_CYAN)
); );
public static final EndWoodenMaterial LACUGROVE = new EndWoodenMaterial( public static final EndWoodenComplexMaterial LACUGROVE = new EndWoodenComplexMaterial(
"lacugrove", "lacugrove",
MaterialColor.COLOR_BROWN, MaterialColor.COLOR_BROWN,
MaterialColor.COLOR_YELLOW MaterialColor.COLOR_YELLOW
@ -335,7 +335,7 @@ public class EndBlocks extends BlockRegistry {
"dragon_tree_leaves", "dragon_tree_leaves",
new PottableLeavesBlock(DRAGON_TREE_SAPLING, MaterialColor.COLOR_MAGENTA) new PottableLeavesBlock(DRAGON_TREE_SAPLING, MaterialColor.COLOR_MAGENTA)
); );
public static final EndWoodenMaterial DRAGON_TREE = new EndWoodenMaterial( public static final EndWoodenComplexMaterial DRAGON_TREE = new EndWoodenComplexMaterial(
"dragon_tree", "dragon_tree",
MaterialColor.COLOR_BLACK, MaterialColor.COLOR_BLACK,
MaterialColor.COLOR_MAGENTA MaterialColor.COLOR_MAGENTA
@ -351,7 +351,7 @@ public class EndBlocks extends BlockRegistry {
"tenanea_outer_leaves", "tenanea_outer_leaves",
new FurBlock(TENANEA_SAPLING, 32) new FurBlock(TENANEA_SAPLING, 32)
); );
public static final EndWoodenMaterial TENANEA = new EndWoodenMaterial( public static final EndWoodenComplexMaterial TENANEA = new EndWoodenComplexMaterial(
"tenanea", "tenanea",
MaterialColor.COLOR_BROWN, MaterialColor.COLOR_BROWN,
MaterialColor.COLOR_PINK MaterialColor.COLOR_PINK
@ -359,7 +359,7 @@ public class EndBlocks extends BlockRegistry {
public static final Block HELIX_TREE_SAPLING = registerBlock("helix_tree_sapling", new HelixTreeSaplingBlock()); public static final Block HELIX_TREE_SAPLING = registerBlock("helix_tree_sapling", new HelixTreeSaplingBlock());
public static final Block HELIX_TREE_LEAVES = registerBlock("helix_tree_leaves", new HelixTreeLeavesBlock()); public static final Block HELIX_TREE_LEAVES = registerBlock("helix_tree_leaves", new HelixTreeLeavesBlock());
public static final EndWoodenMaterial HELIX_TREE = new EndWoodenMaterial( public static final EndWoodenComplexMaterial HELIX_TREE = new EndWoodenComplexMaterial(
"helix_tree", "helix_tree",
MaterialColor.COLOR_GRAY, MaterialColor.COLOR_GRAY,
MaterialColor.COLOR_ORANGE MaterialColor.COLOR_ORANGE
@ -381,7 +381,7 @@ public class EndBlocks extends BlockRegistry {
"umbrella_tree_cluster_empty", "umbrella_tree_cluster_empty",
new UmbrellaTreeClusterEmptyBlock() new UmbrellaTreeClusterEmptyBlock()
); );
public static final EndWoodenMaterial UMBRELLA_TREE = new EndWoodenMaterial( public static final EndWoodenComplexMaterial UMBRELLA_TREE = new EndWoodenComplexMaterial(
"umbrella_tree", "umbrella_tree",
MaterialColor.COLOR_BLUE, MaterialColor.COLOR_BLUE,
MaterialColor.COLOR_GREEN MaterialColor.COLOR_GREEN
@ -391,7 +391,7 @@ public class EndBlocks extends BlockRegistry {
"jellyshroom_cap_purple", "jellyshroom_cap_purple",
new JellyshroomCapBlock(217, 142, 255, 164, 0, 255) new JellyshroomCapBlock(217, 142, 255, 164, 0, 255)
); );
public static final EndWoodenMaterial JELLYSHROOM = new EndWoodenMaterial( public static final EndWoodenComplexMaterial JELLYSHROOM = new EndWoodenComplexMaterial(
"jellyshroom", "jellyshroom",
MaterialColor.COLOR_PURPLE, MaterialColor.COLOR_PURPLE,
MaterialColor.COLOR_LIGHT_BLUE MaterialColor.COLOR_LIGHT_BLUE
@ -406,7 +406,7 @@ public class EndBlocks extends BlockRegistry {
"lucernia_outer_leaves", "lucernia_outer_leaves",
new FurBlock(LUCERNIA_SAPLING, 32) new FurBlock(LUCERNIA_SAPLING, 32)
); );
public static final EndWoodenMaterial LUCERNIA = new EndWoodenMaterial( public static final EndWoodenComplexMaterial LUCERNIA = new EndWoodenComplexMaterial(
"lucernia", "lucernia",
MaterialColor.COLOR_ORANGE, MaterialColor.COLOR_ORANGE,
MaterialColor.COLOR_ORANGE MaterialColor.COLOR_ORANGE

2
src/main/java/ru/betterend/registry/EndFeatures.java
View file

@ -18,7 +18,7 @@ import ru.bclib.world.biomes.BCLBiomeDef;
import ru.bclib.world.features.BCLFeature; import ru.bclib.world.features.BCLFeature;
import ru.bclib.world.features.DefaultFeature; import ru.bclib.world.features.DefaultFeature;
import ru.betterend.BetterEnd; import ru.betterend.BetterEnd;
import ru.betterend.blocks.complex.StoneMaterial; import ru.betterend.complexmaterials.StoneMaterial;
import ru.betterend.world.features.BiomeIslandFeature; import ru.betterend.world.features.BiomeIslandFeature;
import ru.betterend.world.features.BlueVineFeature; import ru.betterend.world.features.BlueVineFeature;
import ru.betterend.world.features.CavePumpkinFeature; import ru.betterend.world.features.CavePumpkinFeature;