sen/tcr
sen/tcr
1
0
Fork 0
Code Issues Pull requests Activity

update textures #1

Browse source
This commit is contained in:
Sen 2025-07-19 15:46:25 +02:00
parent 4b313dd869
commit a3ceadd0ff
Signed by: sen
GPG key ID: 3AC50A6F47D1B722
100 changed files with 217 additions and 787 deletions
Download patch file Download diff file Expand all files Collapse all files

3
server/src/main/java/server/clipboard/ReorderRegistry.java
View file

@ -81,7 +81,6 @@ public abstract class ReorderRegistry {
PLACE_LAST.add(Blocks.soul_wart);
PLACE_LAST.add(Blocks.piston);
PLACE_LAST.add(Blocks.sticky_piston);
PLACE_LAST.add(Blocks.cocoa);
PLACE_LAST.add(Blocks.tripwire_hook);
PLACE_LAST.add(Blocks.string);
for(BlockFlowerPot block : BlockFlowerPot.POTS) {
@ -102,8 +101,6 @@ public abstract class ReorderRegistry {
for(BlockDoublePlant block : BlockDoublePlant.PLANTS) {
PLACE_LAST.add(block);
}
PLACE_LAST.add(Blocks.daylight_detector_inverted);
// shouldPlaceLast.add(Blocks.daylight_detector);
PLACE_LAST.add(Blocks.blue_mushroom);
PLACE_LAST.add(Blocks.red_button);
}

59
server/src/main/java/server/world/Converter.java
View file

@ -38,7 +38,6 @@ import common.block.artificial.BlockTrapDoor.DoorHalf;
import common.block.artificial.BlockWool;
import common.block.foliage.BlockCactus;
import common.block.foliage.BlockCarrot;
import common.block.foliage.BlockCocoa;
import common.block.foliage.BlockCrops;
import common.block.foliage.BlockDoublePlant;
import common.block.foliage.BlockFarmland;
@ -62,7 +61,6 @@ import common.block.tech.BlockBrewingStand;
import common.block.tech.BlockButton;
import common.block.tech.BlockCauldron;
import common.block.tech.BlockChest;
import common.block.tech.BlockDaylightDetector;
import common.block.tech.BlockDispenser;
import common.block.tech.BlockDropper;
import common.block.tech.BlockFurnace;
@ -104,10 +102,7 @@ import common.log.Log;
import common.rng.Random;
import common.tags.TagObject;
import common.tileentity.TileEntity;
import common.tileentity.DeviceEffectGenerator;
import common.tileentity.TileEntityChest;
import common.tileentity.TileEntityComparator;
import common.tileentity.TileEntityDaylightDetector;
import common.tileentity.TileEntityDispenser;
import common.tileentity.TileEntityDropper;
import common.tileentity.TileEntityFurnace;
@ -364,10 +359,7 @@ public abstract class Converter {
mapTile(TileEntityDispenser.class, "Trap", "dispenser");
mapTile(TileEntityDropper.class, "Dropper", "dropper");
mapTile(TileEntitySign.class, "Sign", "sign");
mapTile(DeviceEffectGenerator.class, "Beacon", "beacon");
mapTile(TileEntityDaylightDetector.class, "DLDetector", "daylight_detector");
mapTile(TileEntityHopper.class, "Hopper", "hopper");
mapTile(TileEntityComparator.class, "Comparator", "comparator");
Arrays.fill(BLOCK_MAP, Blocks.air.getState());
@ -1032,18 +1024,6 @@ public abstract class Converter {
126, 12);
mapBlock(Blocks.dark_oak_slab.getState().withProperty(BlockSlab.FACING, Facing.UP),
126, 13);
mapBlock(Blocks.cocoa.getState().withProperty(BlockCocoa.AGE, 0).withProperty(BlockCocoa.FACING, Facing.SOUTH), 127, 0, 12);
mapBlock(Blocks.cocoa.getState().withProperty(BlockCocoa.AGE, 0).withProperty(BlockCocoa.FACING, Facing.WEST), 127, 1, 13);
mapBlock(Blocks.cocoa.getState().withProperty(BlockCocoa.AGE, 0).withProperty(BlockCocoa.FACING, Facing.NORTH), 127, 2, 14);
mapBlock(Blocks.cocoa.getState().withProperty(BlockCocoa.AGE, 0).withProperty(BlockCocoa.FACING, Facing.EAST), 127, 3, 15);
mapBlock(Blocks.cocoa.getState().withProperty(BlockCocoa.AGE, 1).withProperty(BlockCocoa.FACING, Facing.SOUTH), 127, 4);
mapBlock(Blocks.cocoa.getState().withProperty(BlockCocoa.AGE, 1).withProperty(BlockCocoa.FACING, Facing.WEST), 127, 5);
mapBlock(Blocks.cocoa.getState().withProperty(BlockCocoa.AGE, 1).withProperty(BlockCocoa.FACING, Facing.NORTH), 127, 6);
mapBlock(Blocks.cocoa.getState().withProperty(BlockCocoa.AGE, 1).withProperty(BlockCocoa.FACING, Facing.EAST), 127, 7);
mapBlock(Blocks.cocoa.getState().withProperty(BlockCocoa.AGE, 2).withProperty(BlockCocoa.FACING, Facing.SOUTH), 127, 8);
mapBlock(Blocks.cocoa.getState().withProperty(BlockCocoa.AGE, 2).withProperty(BlockCocoa.FACING, Facing.WEST), 127, 9);
mapBlock(Blocks.cocoa.getState().withProperty(BlockCocoa.AGE, 2).withProperty(BlockCocoa.FACING, Facing.NORTH), 127, 10);
mapBlock(Blocks.cocoa.getState().withProperty(BlockCocoa.AGE, 2).withProperty(BlockCocoa.FACING, Facing.EAST), 127, 11);
mapBlock(Blocks.sandstone_stairs.getState().withProperty(BlockStairs.FACING, Facing.EAST).withProperty(BlockStairs.HALF, EnumHalf.BOTTOM), 128, 0, 8);
mapBlock(Blocks.sandstone_stairs.getState().withProperty(BlockStairs.FACING, Facing.WEST).withProperty(BlockStairs.HALF, EnumHalf.BOTTOM), 128, 1, 9);
mapBlock(Blocks.sandstone_stairs.getState().withProperty(BlockStairs.FACING, Facing.SOUTH).withProperty(BlockStairs.HALF, EnumHalf.BOTTOM), 128, 2, 10);
@ -1115,7 +1095,7 @@ public abstract class Converter {
mapBlock(Blocks.spruce_stairs.getState().withProperty(BlockStairs.FACING, Facing.SOUTH).withProperty(BlockStairs.HALF, EnumHalf.TOP), 136, 6, 14);
mapBlock(Blocks.spruce_stairs.getState().withProperty(BlockStairs.FACING, Facing.NORTH).withProperty(BlockStairs.HALF, EnumHalf.TOP), 136, 7, 15);
mapBlock(Blocks.obsidian, 137);
mapBlock(Blocks.effect_generator, 138);
mapBlock(Blocks.glass, 138);
mapBlock(Blocks.cobblestone_wall, 139);
mapBlock(Blocks.mossy_cobblestone_wall, 139, 1);
mapBlock(Blocks.flowerpot, 140);
@ -1191,23 +1171,7 @@ public abstract class Converter {
mapBlock(Blocks.heavy_weighted_pressure_plate.getState().withProperty(BlockPressurePlateWeighted.POWER, 13), 148, 13);
mapBlock(Blocks.heavy_weighted_pressure_plate.getState().withProperty(BlockPressurePlateWeighted.POWER, 14), 148, 14);
mapBlock(Blocks.heavy_weighted_pressure_plate.getState().withProperty(BlockPressurePlateWeighted.POWER, 15), 148, 15);
mapBlock(Blocks.daylight_detector.getState().withProperty(BlockDaylightDetector.POWER, 0), 151, 0);
mapBlock(Blocks.daylight_detector.getState().withProperty(BlockDaylightDetector.POWER, 1), 151, 1);
mapBlock(Blocks.daylight_detector.getState().withProperty(BlockDaylightDetector.POWER, 2), 151, 2);
mapBlock(Blocks.daylight_detector.getState().withProperty(BlockDaylightDetector.POWER, 3), 151, 3);
mapBlock(Blocks.daylight_detector.getState().withProperty(BlockDaylightDetector.POWER, 4), 151, 4);
mapBlock(Blocks.daylight_detector.getState().withProperty(BlockDaylightDetector.POWER, 5), 151, 5);
mapBlock(Blocks.daylight_detector.getState().withProperty(BlockDaylightDetector.POWER, 6), 151, 6);
mapBlock(Blocks.daylight_detector.getState().withProperty(BlockDaylightDetector.POWER, 7), 151, 7);
mapBlock(Blocks.daylight_detector.getState().withProperty(BlockDaylightDetector.POWER, 8), 151, 8);
mapBlock(Blocks.daylight_detector.getState().withProperty(BlockDaylightDetector.POWER, 9), 151, 9);
mapBlock(Blocks.daylight_detector.getState().withProperty(BlockDaylightDetector.POWER, 10), 151, 10);
mapBlock(Blocks.daylight_detector.getState().withProperty(BlockDaylightDetector.POWER, 11), 151, 11);
mapBlock(Blocks.daylight_detector.getState().withProperty(BlockDaylightDetector.POWER, 12), 151, 12);
mapBlock(Blocks.daylight_detector.getState().withProperty(BlockDaylightDetector.POWER, 13), 151, 13);
mapBlock(Blocks.daylight_detector.getState().withProperty(BlockDaylightDetector.POWER, 14), 151, 14);
mapBlock(Blocks.daylight_detector.getState().withProperty(BlockDaylightDetector.POWER, 15), 151, 15);
mapBlock(Blocks.charged_block, 152);
mapBlock(Blocks.cobblestone, 152);
mapBlock(Blocks.quartz_ore, 153);
mapBlock(Blocks.hopper.getState().withProperty(BlockHopper.FACING, Facing.DOWN), 154, 0, 1, 6, 7);
mapBlock(Blocks.hopper.getState().withProperty(BlockHopper.FACING, Facing.NORTH), 154, 2);
@ -1343,22 +1307,6 @@ public abstract class Converter {
mapBlock(Blocks.large_fern, 175, 3);
mapBlock(Blocks.rose_bush, 175, 4);
mapBlock(Blocks.paeonia, 175, 5);
mapBlock(Blocks.daylight_detector_inverted.getState().withProperty(BlockDaylightDetector.POWER, 0), 178, 0);
mapBlock(Blocks.daylight_detector_inverted.getState().withProperty(BlockDaylightDetector.POWER, 1), 178, 1);
mapBlock(Blocks.daylight_detector_inverted.getState().withProperty(BlockDaylightDetector.POWER, 2), 178, 2);
mapBlock(Blocks.daylight_detector_inverted.getState().withProperty(BlockDaylightDetector.POWER, 3), 178, 3);
mapBlock(Blocks.daylight_detector_inverted.getState().withProperty(BlockDaylightDetector.POWER, 4), 178, 4);
mapBlock(Blocks.daylight_detector_inverted.getState().withProperty(BlockDaylightDetector.POWER, 5), 178, 5);
mapBlock(Blocks.daylight_detector_inverted.getState().withProperty(BlockDaylightDetector.POWER, 6), 178, 6);
mapBlock(Blocks.daylight_detector_inverted.getState().withProperty(BlockDaylightDetector.POWER, 7), 178, 7);
mapBlock(Blocks.daylight_detector_inverted.getState().withProperty(BlockDaylightDetector.POWER, 8), 178, 8);
mapBlock(Blocks.daylight_detector_inverted.getState().withProperty(BlockDaylightDetector.POWER, 9), 178, 9);
mapBlock(Blocks.daylight_detector_inverted.getState().withProperty(BlockDaylightDetector.POWER, 10), 178, 10);
mapBlock(Blocks.daylight_detector_inverted.getState().withProperty(BlockDaylightDetector.POWER, 11), 178, 11);
mapBlock(Blocks.daylight_detector_inverted.getState().withProperty(BlockDaylightDetector.POWER, 12), 178, 12);
mapBlock(Blocks.daylight_detector_inverted.getState().withProperty(BlockDaylightDetector.POWER, 13), 178, 13);
mapBlock(Blocks.daylight_detector_inverted.getState().withProperty(BlockDaylightDetector.POWER, 14), 178, 14);
mapBlock(Blocks.daylight_detector_inverted.getState().withProperty(BlockDaylightDetector.POWER, 15), 178, 15);
mapBlock(Blocks.sandstone, 179);
mapBlock(Blocks.carved_sandstone, 179, 1);
mapBlock(Blocks.smooth_sandstone, 179, 2);
@ -1636,9 +1584,6 @@ public abstract class Converter {
nent.setString("Text" + (i + 1), signText[i]);
}
}
else if(clazz == TileEntityComparator.class) {
nent.setInt("OutputSignal", ent.getInt("OutputSignal"));
}
return nent;
}

2
server/src/main/java/server/worldgen/LootConstants.java
View file

@ -44,7 +44,7 @@ public abstract class LootConstants {
new RngLoot(Items.pumpkin_stem, 2, 4, 10), new RngLoot(Items.saddle, 1, 1, 3), new RngLoot(Items.iron_horse_armor, 1, 1, 1));
public static final WeightedList<RngLoot> HELL_FORTRESS = new WeightedList(new RngLoot(Items.diamond, 1, 3, 5),
new RngLoot(Items.iron_ingot, 1, 5, 5), new RngLoot(Items.gold_ingot, 1, 3, 15), new RngLoot(Items.gold_sword, 1, 1, 5),
new RngLoot(Items.gold_chestplate, 1, 1, 5), new RngLoot(Items.flint_and_steel, 1, 1, 5),
new RngLoot(Items.gold_chestplate, 1, 1, 5), new RngLoot(Items.lighter, 1, 1, 5),
new RngLoot(Items.soul_wart, 3, 7, 5), new RngLoot(Items.saddle, 1, 1, 10), new RngLoot(Items.gold_horse_armor, 1, 1, 8),
new RngLoot(Items.iron_horse_armor, 1, 1, 5), new RngLoot(Items.diamond_horse_armor, 1, 1, 3),
new RngLoot(Items.obsidian, 2, 4, 2));

21
server/src/main/java/server/worldgen/tree/WorldGenBaseTree.java
View file

@ -2,7 +2,6 @@ package server.worldgen.tree;
import common.block.Block;
import common.block.Material;
import common.block.foliage.BlockCocoa;
import common.block.foliage.BlockLeaves;
import common.block.foliage.BlockVine;
import common.init.Blocks;
@ -203,21 +202,6 @@ public class WorldGenBaseTree extends WorldGenTree
}
}
}
if (rand.zrange(5) == 0 && i > 5)
{
for (int l3 = 0; l3 < 2; ++l3)
{
for (Facing enumfacing : Facing.Plane.HORIZONTAL)
{
if (rand.zrange(4 - l3) == 0)
{
Facing enumfacing1 = enumfacing.getOpposite();
this.func_181652_a(worldIn, rand.zrange(3), position.add(enumfacing1.getFrontOffsetX(), i - 5 + l3, enumfacing1.getFrontOffsetZ()), enumfacing);
}
}
}
}
}
return true;
@ -234,11 +218,6 @@ public class WorldGenBaseTree extends WorldGenTree
}
}
private void func_181652_a(WorldServer p_181652_1_, int p_181652_2_, BlockPos p_181652_3_, Facing p_181652_4_)
{
this.setBlockAndNotifyAdequately(p_181652_1_, p_181652_3_, Blocks.cocoa.getState().withProperty(BlockCocoa.AGE, p_181652_2_).withProperty(BlockCocoa.FACING, p_181652_4_));
}
private void func_181651_a(WorldServer p_181651_1_, BlockPos p_181651_2_, PropertyBool p_181651_3_)
{
this.setBlockAndNotifyAdequately(p_181651_1_, p_181651_2_, Blocks.vine.getState().withProperty(p_181651_3_, Boolean.valueOf(true)));