diff --git a/src/main/java/ru/betterend/blocks/entities/EndStoneSmelterBlockEntity.java b/src/main/java/ru/betterend/blocks/entities/EndStoneSmelterBlockEntity.java index 54b3fcc1..05020b72 100644 --- a/src/main/java/ru/betterend/blocks/entities/EndStoneSmelterBlockEntity.java +++ b/src/main/java/ru/betterend/blocks/entities/EndStoneSmelterBlockEntity.java @@ -1,7 +1,12 @@ package ru.betterend.blocks.entities; +import java.util.Iterator; +import java.util.List; +import java.util.Map; + import com.google.common.collect.Lists; import com.google.common.collect.Maps; + import it.unimi.dsi.fastutil.objects.Object2IntMap.Entry; import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap; import net.minecraft.block.BlockState; @@ -17,7 +22,12 @@ import net.minecraft.item.ItemConvertible; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; import net.minecraft.nbt.CompoundTag; -import net.minecraft.recipe.*; +import net.minecraft.recipe.BlastingRecipe; +import net.minecraft.recipe.Recipe; +import net.minecraft.recipe.RecipeFinder; +import net.minecraft.recipe.RecipeInputProvider; +import net.minecraft.recipe.RecipeType; +import net.minecraft.recipe.RecipeUnlocker; import net.minecraft.screen.PropertyDelegate; import net.minecraft.screen.ScreenHandler; import net.minecraft.text.Text; @@ -35,10 +45,6 @@ import ru.betterend.client.gui.EndStoneSmelterScreenHandler; import ru.betterend.recipe.builders.AlloyingRecipe; import ru.betterend.registry.EndBlockEntities; -import java.util.Iterator; -import java.util.List; -import java.util.Map; - public class EndStoneSmelterBlockEntity extends LockableContainerBlockEntity implements SidedInventory, RecipeUnlocker, RecipeInputProvider, Tickable { private static final int[] TOP_SLOTS = new int[] { 0, 1 }; diff --git a/src/main/java/ru/betterend/mixin/common/ServerPlayNetworkHandlerMixin.java b/src/main/java/ru/betterend/mixin/common/ServerPlayNetworkHandlerMixin.java index d0644012..471ed720 100644 --- a/src/main/java/ru/betterend/mixin/common/ServerPlayNetworkHandlerMixin.java +++ b/src/main/java/ru/betterend/mixin/common/ServerPlayNetworkHandlerMixin.java @@ -1,5 +1,13 @@ package ru.betterend.mixin.common; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + import net.minecraft.block.BlockState; import net.minecraft.block.entity.BlockEntity; import net.minecraft.network.NetworkThreadUtils; @@ -10,13 +18,6 @@ import net.minecraft.server.world.ServerWorld; import net.minecraft.text.LiteralText; import net.minecraft.util.Formatting; import net.minecraft.util.math.BlockPos; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Shadow; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import ru.betterend.blocks.entities.ESignBlockEntity; @Mixin(ServerPlayNetworkHandler.class) diff --git a/src/main/java/ru/betterend/mixin/common/ServerPlayerEntityMixin.java b/src/main/java/ru/betterend/mixin/common/ServerPlayerEntityMixin.java index ed57ad0a..ae19c112 100644 --- a/src/main/java/ru/betterend/mixin/common/ServerPlayerEntityMixin.java +++ b/src/main/java/ru/betterend/mixin/common/ServerPlayerEntityMixin.java @@ -1,30 +1,35 @@ package ru.betterend.mixin.common; -import com.mojang.authlib.GameProfile; -import net.minecraft.entity.Entity; -import net.minecraft.entity.effect.StatusEffectInstance; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.network.packet.s2c.play.*; -import net.minecraft.server.MinecraftServer; -import net.minecraft.server.PlayerManager; -import net.minecraft.server.network.ServerPlayNetworkHandler; -import net.minecraft.server.network.ServerPlayerInteractionManager; -import net.minecraft.util.math.Vec3d; -import net.minecraft.world.TeleportTarget; -import net.minecraft.world.World; -import net.minecraft.world.WorldProperties; -import net.minecraft.world.biome.source.BiomeAccess; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; +import com.mojang.authlib.GameProfile; + +import net.minecraft.entity.Entity; +import net.minecraft.entity.effect.StatusEffectInstance; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.network.packet.s2c.play.DifficultyS2CPacket; +import net.minecraft.network.packet.s2c.play.EntityStatusEffectS2CPacket; +import net.minecraft.network.packet.s2c.play.PlayerAbilitiesS2CPacket; +import net.minecraft.network.packet.s2c.play.PlayerRespawnS2CPacket; +import net.minecraft.network.packet.s2c.play.WorldEventS2CPacket; +import net.minecraft.server.MinecraftServer; +import net.minecraft.server.PlayerManager; +import net.minecraft.server.network.ServerPlayNetworkHandler; import net.minecraft.server.network.ServerPlayerEntity; +import net.minecraft.server.network.ServerPlayerInteractionManager; import net.minecraft.server.world.ServerWorld; import net.minecraft.util.math.BlockPos; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; +import net.minecraft.util.math.Vec3d; +import net.minecraft.world.TeleportTarget; +import net.minecraft.world.World; +import net.minecraft.world.WorldProperties; +import net.minecraft.world.biome.source.BiomeAccess; import ru.betterend.interfaces.TeleportingEntity; @Mixin(ServerPlayerEntity.class) diff --git a/src/main/java/ru/betterend/registry/EndBiomes.java b/src/main/java/ru/betterend/registry/EndBiomes.java index dc20d7ac..90fe5c39 100644 --- a/src/main/java/ru/betterend/registry/EndBiomes.java +++ b/src/main/java/ru/betterend/registry/EndBiomes.java @@ -43,7 +43,6 @@ import ru.betterend.world.biome.BiomePaintedMountains; import ru.betterend.world.biome.BiomeShadowForest; import ru.betterend.world.biome.BiomeSulphurSprings; import ru.betterend.world.biome.BiomeUmbrellaJungle; -import ru.betterend.world.biome.CapsacisForestBiome; import ru.betterend.world.biome.EndBiome; import ru.betterend.world.generator.BELayerRandomSource; import ru.betterend.world.generator.BiomePicker; @@ -84,8 +83,6 @@ public class EndBiomes { public static final EndBiome BLOSSOMING_SPIRES = registerBiome(new BiomeBlossomingSpires(), BiomeType.LAND); public static final EndBiome SULPHUR_SPRINGS = registerBiome(new BiomeSulphurSprings(), BiomeType.LAND); public static final EndBiome UMBRELLA_JUNGLE = registerBiome(new BiomeUmbrellaJungle(), BiomeType.LAND); - public static final EndBiome CAPSACIS_FOREST = registerSubBiome(new CapsacisForestBiome(), CHORUS_FOREST); - //public static final EndBiome HANGING_GARDENS = registerBiome(new HangingGardensBiome(), BiomeType.LAND); // Better End Void public static final EndBiome ICE_STARFIELD = registerBiome(new BiomeIceStarfield(), BiomeType.VOID); diff --git a/src/main/java/ru/betterend/registry/EndBlocks.java b/src/main/java/ru/betterend/registry/EndBlocks.java index 50dfbff9..44050d9e 100644 --- a/src/main/java/ru/betterend/registry/EndBlocks.java +++ b/src/main/java/ru/betterend/registry/EndBlocks.java @@ -20,7 +20,6 @@ import ru.betterend.blocks.BulbVineBlock; import ru.betterend.blocks.BulbVineLanternBlock; import ru.betterend.blocks.BulbVineLanternColoredBlock; import ru.betterend.blocks.BulbVineSeedBlock; -import ru.betterend.blocks.CapsacisCapBlock; import ru.betterend.blocks.CharniaBlock; import ru.betterend.blocks.ChorusGrassBlock; import ru.betterend.blocks.DenseEmeraldIceBlock; @@ -193,22 +192,6 @@ public class EndBlocks { public static final Block JELLYSHROOM_CAP_PURPLE = registerBlock("jellyshroom_cap_purple", new JellyshroomCapBlock(217, 142, 255, 164, 0, 255)); public static final WoodenMaterial JELLYSHROOM = new WoodenMaterial("jellyshroom", MaterialColor.PURPLE, MaterialColor.LIGHT_BLUE); - // Tree from original concept (+ modifications) - public static final Block CAPSACIS_SAPLING = registerBlock("capsacis_sapling", new UmbrellaTreeSaplingBlock()); - public static final Block CAPSACIS_CAP = registerBlock("capsacis_cap", new CapsacisCapBlock()); - public static final WoodenMaterial CAPSACIS = new WoodenMaterial("capsacis", MaterialColor.PURPLE, MaterialColor.LIGHT_BLUE); - - // Small ecosystem tree - //public static final WoodenMaterial INANIS = new WoodenMaterial("inanis", MaterialColor.PURPLE, MaterialColor.LIGHT_BLUE); - - // Tree from Yuki's ide - //public static final Block CEMINUS_SAPLING = registerBlock("ceminus_sapling", new UmbrellaTreeSaplingBlock()); - //public static final Block CEMINUS_GRID = registerBlock("ceminus_grid", new UmbrellaTreeMembraneBlock()); - //public static final WoodenMaterial CEMINUS = new WoodenMaterial("ceminus", MaterialColor.PURPLE, MaterialColor.LIGHT_BLUE); - - // For megacolonies - //public static final Block VOID_COLONY_MEMBRANE = registerBlock("void_colony_membrane", new UmbrellaTreeMembraneBlock()); - // Small Plants // public static final Block UMBRELLA_MOSS = registerBlock("umbrella_moss", new UmbrellaMossBlock()); public static final Block UMBRELLA_MOSS_TALL = registerBlock("umbrella_moss_tall", new UmbrellaMossTallBlock()); diff --git a/src/main/java/ru/betterend/registry/EndFeatures.java b/src/main/java/ru/betterend/registry/EndFeatures.java index de96bdbc..da3e61c1 100644 --- a/src/main/java/ru/betterend/registry/EndFeatures.java +++ b/src/main/java/ru/betterend/registry/EndFeatures.java @@ -43,7 +43,6 @@ import ru.betterend.world.features.terrain.SulphurHillFeature; import ru.betterend.world.features.terrain.SulphuricCaveFeature; import ru.betterend.world.features.terrain.SulphuricLakeFeature; import ru.betterend.world.features.terrain.SurfaceVentFeature; -import ru.betterend.world.features.trees.CapsacisTreeFeature; import ru.betterend.world.features.trees.DragonTreeFeature; import ru.betterend.world.features.trees.HelixTreeFeature; import ru.betterend.world.features.trees.JellyshroomFeature; @@ -64,7 +63,6 @@ public class EndFeatures { public static final EndFeature HELIX_TREE = new EndFeature("helix_tree", new HelixTreeFeature(), 2); public static final EndFeature UMBRELLA_TREE = new EndFeature("umbrella_tree", new UmbrellaTreeFeature(), 4); public static final EndFeature JELLYSHROOM = new EndFeature("jellyshroom", new JellyshroomFeature(), 3); - public static final EndFeature CAPSACIS = new EndFeature("capsacis", new CapsacisTreeFeature(), 3); // Bushes // public static final EndFeature PYTHADENDRON_BUSH = new EndFeature("pythadendron_bush", new BushFeature(EndBlocks.PYTHADENDRON_LEAVES, EndBlocks.PYTHADENDRON.bark), 4); diff --git a/src/main/java/ru/betterend/world/biome/CapsacisForestBiome.java b/src/main/java/ru/betterend/world/biome/CapsacisForestBiome.java deleted file mode 100644 index eaefb4ef..00000000 --- a/src/main/java/ru/betterend/world/biome/CapsacisForestBiome.java +++ /dev/null @@ -1,24 +0,0 @@ -package ru.betterend.world.biome; - -import net.minecraft.entity.EntityType; -import ru.betterend.registry.EndBlocks; -import ru.betterend.registry.EndFeatures; -import ru.betterend.registry.EndSounds; - -public class CapsacisForestBiome extends EndBiome { - public CapsacisForestBiome() { - super(new BiomeDefinition("capsacis_forest") - .setSurface(EndBlocks.CHORUS_NYLIUM) - .setMusic(EndSounds.MUSIC_FOREST) - .setWaterAndFogColor(84, 61, 127) - .setFoliageColor(71, 45, 120) - .setFogColor(78, 71, 92) - .setFogDensity(1.5F) - .addFeature(EndFeatures.CAPSACIS) - .addFeature(EndFeatures.PURPLE_POLYPORE) - .addFeature(EndFeatures.TAIL_MOSS_WOOD) - .addFeature(EndFeatures.TAIL_MOSS) - .addFeature(EndFeatures.CHORUS_GRASS) - .addMobSpawn(EntityType.ENDERMAN, 50, 1, 4)); - } -} diff --git a/src/main/java/ru/betterend/world/biome/HangingGardensBiome.java b/src/main/java/ru/betterend/world/biome/HangingGardensBiome.java deleted file mode 100644 index 3a6e2161..00000000 --- a/src/main/java/ru/betterend/world/biome/HangingGardensBiome.java +++ /dev/null @@ -1,18 +0,0 @@ -package ru.betterend.world.biome; - -import net.minecraft.entity.EntityType; -import ru.betterend.registry.EndBlocks; -import ru.betterend.registry.EndSounds; - -public class HangingGardensBiome extends EndBiome { - public HangingGardensBiome() { - super(new BiomeDefinition("hanging_gardens") - .setSurface(EndBlocks.SHADOW_GRASS, EndBlocks.CHORUS_NYLIUM) - .setMusic(EndSounds.MUSIC_FOREST) - .setWaterAndFogColor(84, 61, 127) - .setFoliageColor(71, 45, 120) - .setFogColor(78, 71, 92) - .setFogDensity(1.5F) - .addMobSpawn(EntityType.ENDERMAN, 50, 1, 4)); - } -} \ No newline at end of file diff --git a/src/main/java/ru/betterend/world/features/trees/CapsacisTreeFeature.java b/src/main/java/ru/betterend/world/features/trees/CapsacisTreeFeature.java deleted file mode 100644 index 12eae23b..00000000 --- a/src/main/java/ru/betterend/world/features/trees/CapsacisTreeFeature.java +++ /dev/null @@ -1,146 +0,0 @@ -package ru.betterend.world.features.trees; - -import java.util.List; -import java.util.Random; - -import com.google.common.base.Function; -import com.google.common.collect.Lists; - -import net.minecraft.block.BlockState; -import net.minecraft.client.util.math.Vector3f; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.MathHelper; -import net.minecraft.world.StructureWorldAccess; -import net.minecraft.world.gen.chunk.ChunkGenerator; -import net.minecraft.world.gen.feature.DefaultFeatureConfig; -import ru.betterend.blocks.BlockProperties; -import ru.betterend.registry.EndBlocks; -import ru.betterend.registry.EndTags; -import ru.betterend.util.MHelper; -import ru.betterend.util.SplineHelper; -import ru.betterend.util.sdf.SDF; -import ru.betterend.util.sdf.operator.SDFFlatWave; -import ru.betterend.util.sdf.operator.SDFScale; -import ru.betterend.util.sdf.operator.SDFSmoothUnion; -import ru.betterend.util.sdf.operator.SDFTranslate; -import ru.betterend.util.sdf.operator.SDFUnion; -import ru.betterend.util.sdf.primitive.SDFCappedCone; -import ru.betterend.util.sdf.primitive.SDFSphere; -import ru.betterend.world.features.DefaultFeature; - -public class CapsacisTreeFeature extends DefaultFeature { - private static final Function REPLACE; - private static final List ROOT; - - @Override - public boolean generate(StructureWorldAccess world, ChunkGenerator chunkGenerator, Random random, BlockPos pos, DefaultFeatureConfig config) { - if (!world.getBlockState(pos.down()).getBlock().isIn(EndTags.END_GROUND)) return false; - - int height = MHelper.randRange(20, 30, random); - List spline = SplineHelper.makeSpline(0, 0, 0, 0, height * 0.2F, 0, 5); - - BlockPos center = pos.up(9); - if (!SplineHelper.canGenerate(spline, center, world, REPLACE)) { - return false; - } - - BlockState woodState = EndBlocks.CAPSACIS.bark.getDefaultState(); - BlockState logState = EndBlocks.CAPSACIS.log.getDefaultState(); - BlockState capState = EndBlocks.CAPSACIS_CAP.getDefaultState(); - - SplineHelper.offsetParts(spline, random, 0.5F, 0, 0.5F); - SDF sdf = SplineHelper.buildSDF(spline, 2.5F, 0.8F, (bpos) -> { - return woodState; - }); - - final float scale = config == null ? 1 : MHelper.randRange(1, 1.5F, random); - final float offset = height * 0.2F; - final float radius = height * 0.25F; - final float heightScale = radius * 2 * scale; - final int count = MHelper.randRange(5, 7, random); - final float angle = random.nextFloat() * MHelper.PI2; - SDF cap = makeCap(offset, radius, count, angle, capState); - - sdf = new SDFUnion().setSourceA(sdf).setSourceB(cap); - SDF roots = makeRoots(world, center, height * 0.4F, random, woodState); - if (roots != null) { - sdf = new SDFUnion().setSourceA(sdf).setSourceB(roots); - } - sdf = new SDFScale().setScale(scale).setSource(sdf); - - sdf.addPostProcess((info) -> { - if (EndBlocks.CAPSACIS.isTreeLog(info.getStateUp()) && EndBlocks.CAPSACIS.isTreeLog(info.getStateDown())) { - return logState; - } - else if (info.getState().equals(capState)) { - double off = Math.cos(Math.atan2(info.getPos().getX() - pos.getX(), info.getPos().getZ() - pos.getZ()) * count + angle) * 2; - int color = (int) ((info.getPos().getY() - pos.getY() - radius) / heightScale * 7 + off); - color = 7 - MathHelper.clamp(color, 0, 7); - return info.getState().with(BlockProperties.COLOR, color); - } - return info.getState(); - }).fillRecursive(world, center); - - return true; - } - - private SDF makeCap(float offset, float radius, int count, float angle, BlockState capState) { - SDF cap = new SDFSphere().setRadius(radius).setBlock(capState); - SDF cone = new SDFCappedCone().setRadius1(radius).setRadius2(radius * 0.4F).setHeight(radius * 0.3F).setBlock(capState); - cone = new SDFTranslate().setTranslate(0, radius * 0.3F, 0).setSource(cone); - cap = new SDFSmoothUnion().setRadius(5).setSourceA(cap).setSourceB(cone); - SDF upperSphere = new SDFSphere().setRadius(radius * 0.4F).setBlock(capState); - upperSphere = new SDFTranslate().setTranslate(0, radius * 0.6F, 0).setSource(upperSphere); - cap = new SDFSmoothUnion().setRadius(5).setSourceA(cap).setSourceB(upperSphere); - cap = new SDFFlatWave().setAngle(angle).setRaysCount(count).setIntensity(1F).setSource(cap); - - cap = new SDFTranslate().setTranslate(0, offset, 0).setSource(cap); - - return cap; - } - - private SDF makeRoots(StructureWorldAccess world, BlockPos pos, float radius, Random random, BlockState state) { - int count = (int) (radius * 0.7F); - SDF roots = null; - for (int i = 0; i < count; i++) { - float angle = (float) i / (float) count * MHelper.PI2; - float scale = radius * MHelper.randRange(0.85F, 1.15F, random); - - List branch = SplineHelper.copySpline(ROOT); - SplineHelper.rotateSpline(branch, angle); - SplineHelper.scale(branch, scale); - SplineHelper.offsetParts(branch, random, 0.5F, 0.7F, 0.5F); - SDF sdf = SplineHelper.buildSDF(branch, 2F, 1F, (p) -> { return state; }); - roots = roots == null ? sdf : new SDFUnion().setSourceA(sdf).setSourceB(roots); - } - return roots; - /*for (int i = 0; i < count; i++) { - float angle = (float) i / (float) count * MHelper.PI2; - float scale = radius * MHelper.randRange(0.85F, 1.15F, random); - - List branch = SplineHelper.copySpline(ROOT); - SplineHelper.rotateSpline(branch, angle); - SplineHelper.scale(branch, scale); - SplineHelper.offsetParts(branch, random, 0.5F, 0.7F, 0.5F); - Vector3f last = branch.get(branch.size() - 1); - if (world.getBlockState(pos.add(last.getX(), last.getY(), last.getZ())).isIn(EndTags.GEN_TERRAIN)) { - SplineHelper.fillSpline(branch, world, state, pos, REPLACE); - } - }*/ - } - - static { - REPLACE = (state) -> { - return EndBlocks.CAPSACIS.isTreeLog(state) || state.getMaterial().isReplaceable(); - }; - - ROOT = Lists.newArrayList( - new Vector3f(0F, 1F, 0), - new Vector3f(0.1F, 0.7F, 0), - new Vector3f(0.3F, 0.3F, 0), - new Vector3f(0.7F, 0.05F, 0), - new Vector3f(0.8F, -0.2F, 0) - ); - SplineHelper.offset(ROOT, Vector3f.NEGATIVE_Y); - } -} diff --git a/src/main/resources/assets/betterend/textures/block/capsacis_cap.png b/src/main/resources/assets/betterend/textures/block/capsacis_cap.png deleted file mode 100644 index ba60d339..00000000 Binary files a/src/main/resources/assets/betterend/textures/block/capsacis_cap.png and /dev/null differ diff --git a/src/main/resources/assets/betterend/textures/block/capsacis_cap_0.png b/src/main/resources/assets/betterend/textures/block/capsacis_cap_0.png deleted file mode 100644 index 198a8eee..00000000 Binary files a/src/main/resources/assets/betterend/textures/block/capsacis_cap_0.png and /dev/null differ diff --git a/src/main/resources/assets/betterend/textures/block/capsacis_cap_1.png b/src/main/resources/assets/betterend/textures/block/capsacis_cap_1.png deleted file mode 100644 index 59df594a..00000000 Binary files a/src/main/resources/assets/betterend/textures/block/capsacis_cap_1.png and /dev/null differ diff --git a/src/main/resources/assets/betterend/textures/block/capsacis_cap_2.png b/src/main/resources/assets/betterend/textures/block/capsacis_cap_2.png deleted file mode 100644 index 90826dd3..00000000 Binary files a/src/main/resources/assets/betterend/textures/block/capsacis_cap_2.png and /dev/null differ diff --git a/src/main/resources/assets/betterend/textures/block/capsacis_cap_3.png b/src/main/resources/assets/betterend/textures/block/capsacis_cap_3.png deleted file mode 100644 index e71f7d35..00000000 Binary files a/src/main/resources/assets/betterend/textures/block/capsacis_cap_3.png and /dev/null differ diff --git a/src/main/resources/assets/betterend/textures/block/capsacis_cap_4.png b/src/main/resources/assets/betterend/textures/block/capsacis_cap_4.png deleted file mode 100644 index 68f561d3..00000000 Binary files a/src/main/resources/assets/betterend/textures/block/capsacis_cap_4.png and /dev/null differ diff --git a/src/main/resources/assets/betterend/textures/block/capsacis_cap_5.png b/src/main/resources/assets/betterend/textures/block/capsacis_cap_5.png deleted file mode 100644 index d479ebac..00000000 Binary files a/src/main/resources/assets/betterend/textures/block/capsacis_cap_5.png and /dev/null differ diff --git a/src/main/resources/assets/betterend/textures/block/capsacis_cap_6.png b/src/main/resources/assets/betterend/textures/block/capsacis_cap_6.png deleted file mode 100644 index 98247538..00000000 Binary files a/src/main/resources/assets/betterend/textures/block/capsacis_cap_6.png and /dev/null differ diff --git a/src/main/resources/assets/betterend/textures/block/capsacis_cap_7.png b/src/main/resources/assets/betterend/textures/block/capsacis_cap_7.png deleted file mode 100644 index 6bb18653..00000000 Binary files a/src/main/resources/assets/betterend/textures/block/capsacis_cap_7.png and /dev/null differ diff --git a/src/main/resources/assets/betterend/textures/block/capsacis_cap__22.png b/src/main/resources/assets/betterend/textures/block/capsacis_cap__22.png deleted file mode 100644 index a54a1a07..00000000 Binary files a/src/main/resources/assets/betterend/textures/block/capsacis_cap__22.png and /dev/null differ diff --git a/src/main/resources/assets/betterend/textures/block/capsacis_log_side.png b/src/main/resources/assets/betterend/textures/block/capsacis_log_side.png deleted file mode 100644 index 535ddb16..00000000 Binary files a/src/main/resources/assets/betterend/textures/block/capsacis_log_side.png and /dev/null differ diff --git a/src/main/resources/assets/betterend/textures/block/capsacis_log_side_2.png b/src/main/resources/assets/betterend/textures/block/capsacis_log_side_2.png deleted file mode 100644 index 3c77aec4..00000000 Binary files a/src/main/resources/assets/betterend/textures/block/capsacis_log_side_2.png and /dev/null differ diff --git a/src/main/resources/assets/betterend/textures/block/capsacis_log_side_3.png b/src/main/resources/assets/betterend/textures/block/capsacis_log_side_3.png deleted file mode 100644 index 3253c959..00000000 Binary files a/src/main/resources/assets/betterend/textures/block/capsacis_log_side_3.png and /dev/null differ diff --git a/src/main/resources/assets/betterend/textures/block/capsacis_log_top.png b/src/main/resources/assets/betterend/textures/block/capsacis_log_top.png deleted file mode 100644 index b45ac036..00000000 Binary files a/src/main/resources/assets/betterend/textures/block/capsacis_log_top.png and /dev/null differ diff --git a/src/main/resources/assets/betterend/textures/block/capsacis_planks.png b/src/main/resources/assets/betterend/textures/block/capsacis_planks.png deleted file mode 100644 index 6d6aef00..00000000 Binary files a/src/main/resources/assets/betterend/textures/block/capsacis_planks.png and /dev/null differ diff --git a/src/main/resources/assets/betterend/textures/block/capsacis_stripped_log_side.png b/src/main/resources/assets/betterend/textures/block/capsacis_stripped_log_side.png deleted file mode 100644 index 7432af62..00000000 Binary files a/src/main/resources/assets/betterend/textures/block/capsacis_stripped_log_side.png and /dev/null differ diff --git a/src/main/resources/assets/betterend/textures/block/capsacis_stripped_log_top.png b/src/main/resources/assets/betterend/textures/block/capsacis_stripped_log_top.png deleted file mode 100644 index 468781cb..00000000 Binary files a/src/main/resources/assets/betterend/textures/block/capsacis_stripped_log_top.png and /dev/null differ