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

Start altering recipes, and adding a new dye

Browse source
This commit is contained in:
Zontreck 2024-02-21 05:32:53 -07:00
parent c326453a36
commit c629741dab
58 changed files with 647 additions and 157 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/main/java/dev/zontreck/otemod/OTEMod.java
View file

@ -21,10 +21,7 @@ import dev.zontreck.otemod.effects.ModEffects;
import dev.zontreck.otemod.enchantments.FlightEnchantment;
import dev.zontreck.otemod.enchantments.NightVisionEnchantment;
import dev.zontreck.otemod.events.EventHandler;
import dev.zontreck.otemod.implementation.CreativeModeTabs;
import dev.zontreck.otemod.implementation.InventoryBackup;
import dev.zontreck.otemod.implementation.Messages;
import dev.zontreck.otemod.implementation.PlayerFirstJoinTag;
import dev.zontreck.otemod.implementation.*;
import dev.zontreck.otemod.implementation.compressor.CompressionChamberScreen;
import dev.zontreck.otemod.implementation.vault.*;
import dev.zontreck.otemod.integrations.KeyBindings;
@ -152,6 +149,10 @@ public class OTEMod
private void setup(final FMLCommonSetupEvent event)
{
ModMessages.register();
event.enqueueWork(()->{
ModDyes.UpdateBlockEntities();
});
}

30
src/main/java/dev/zontreck/otemod/blocks/ModBlocks.java
View file

@ -2,13 +2,21 @@ package dev.zontreck.otemod.blocks;
import dev.zontreck.otemod.OTEMod;
import dev.zontreck.otemod.implementation.CreativeModeTabs;
import dev.zontreck.otemod.implementation.ModDyes;
import dev.zontreck.otemod.mixins.DyeColorMixin;
import net.minecraft.client.resources.model.Material;
import net.minecraft.core.BlockPos;
import net.minecraft.world.item.BlockItem;
import net.minecraft.world.item.DyeColor;
import net.minecraft.world.item.Item;
import net.minecraft.world.level.BlockGetter;
import net.minecraft.world.level.block.*;
import net.minecraft.world.level.block.entity.BlockEntity;
import net.minecraft.world.level.block.entity.ShulkerBoxBlockEntity;
import net.minecraft.world.level.block.state.BlockBehaviour;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.block.state.properties.BedPart;
import net.minecraft.world.level.material.MapColor;
import net.minecraftforge.eventbus.api.IEventBus;
import net.minecraftforge.registries.DeferredRegister;
import net.minecraftforge.registries.ForgeRegistries;
@ -17,6 +25,18 @@ import net.minecraftforge.registries.RegistryObject;
import java.util.function.Supplier;
public class ModBlocks {
private static BlockBehaviour.StatePredicate shulkerState = (p_152653_, p_152654_, p_152655_) -> {
BlockEntity blockentity = p_152654_.getBlockEntity(p_152655_);
if (!(blockentity instanceof ShulkerBoxBlockEntity)) {
return true;
} else {
ShulkerBoxBlockEntity shulkerboxblockentity = (ShulkerBoxBlockEntity)blockentity;
return shulkerboxblockentity.isClosed();
}
};
public static final DeferredRegister<Block> BLOCKS = DeferredRegister.create(ForgeRegistries.BLOCKS, OTEMod.MOD_ID);
public static final DeferredRegister<Item> ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, OTEMod.MOD_ID);
@ -198,4 +218,14 @@ public class ModBlocks {
public static final RegistryObject<Block> DIRTY_RED_POOL_TILE_SLAB = registerWithItem(BLOCKS.register("dirty_red_pool_tile_slab", ()->new SlabBlock(stone)), new Item.Properties());
public static final RegistryObject<Block> DARK_RED_WOOL = registerWithItem(BLOCKS.register("dark_red_wool", ()->new Block(BlockBehaviour.Properties.copy(Blocks.RED_WOOL))), new Item.Properties());
public static final RegistryObject<Block> DARK_RED_CARPET = registerWithItem(BLOCKS.register("dark_red_carpet", ()->new CarpetBlock(BlockBehaviour.Properties.copy(Blocks.RED_CARPET))), new Item.Properties());
public static final RegistryObject<Block> DARK_RED_BED = registerWithItem(BLOCKS.register("dark_red_bed", ()->new BedBlock(DyeColor.byName("dark_red", DyeColor.RED), BlockBehaviour.Properties.copy(Blocks.RED_BED).mapColor((X)->{
return X.getValue(BedBlock.PART) == BedPart.FOOT ? ModDyes.DARK_RED.getMapColor() : MapColor.WOOL;
}).noOcclusion())), new Item.Properties().stacksTo(1));
public static final RegistryObject<Block> DARK_RED_SHULKER_BOX = registerWithItem((BLOCKS.register("dark_red_shulker_box", ()->new ShulkerBoxBlock(ModDyes.DARK_RED, BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_RED).strength(2.0F).dynamicShape().noOcclusion().isSuffocating(shulkerState).isViewBlocking(shulkerState)))), new Item.Properties().stacksTo(1));
}

20
src/main/java/dev/zontreck/otemod/data/ModBlockStatesProvider.java
View file

@ -6,10 +6,7 @@ import dev.zontreck.otemod.items.DeprecatedModItems;
import net.minecraft.data.PackOutput;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.item.Item;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.Blocks;
import net.minecraft.world.level.block.SlabBlock;
import net.minecraft.world.level.block.StairBlock;
import net.minecraft.world.level.block.*;
import net.minecraft.world.level.block.state.BlockBehaviour;
import net.minecraftforge.client.model.generators.BlockStateProvider;
import net.minecraftforge.client.model.generators.ModelFile;
@ -64,18 +61,30 @@ public class ModBlockStatesProvider extends BlockStateProvider
blockWithItem(ModBlocks.DIRTY_RED_POOL_TILE);
stairBlock(ModBlocks.DIRTY_RED_POOL_TILE_STAIRS, ModBlocks.DIRTY_RED_POOL_TILE);
slabBlock(ModBlocks.DIRTY_RED_POOL_TILE_SLAB, ModBlocks.DIRTY_RED_POOL_TILE);
blockWithItem(ModBlocks.DARK_RED_WOOL);
carpetBlock(ModBlocks.DARK_RED_CARPET, ModBlocks.DARK_RED_WOOL);
}
private void blockWithItem(RegistryObject<Block> blockRegistryObject)
{
simpleBlockWithItem(blockRegistryObject.get(), cubeAll(blockRegistryObject.get()));
}
private void blockWithItem(RegistryObject<Block> blockRegistryObject, ModelFile model)
{
simpleBlockWithItem(blockRegistryObject.get(), model);
}
private void stairBlock(RegistryObject<Block> blk, RegistryObject<Block> texture)
{
stairsBlock((StairBlock) blk.get(), blockTexture(texture.get()));
simpleBlockItem(blk.get(), stairsModel(blk.get(), texture.get()));
}
private void carpetBlock(RegistryObject<Block> blk, RegistryObject<Block> texture)
{
simpleBlockWithItem(blk.get(), carpetModel(blk.get(), texture.get()));
}
private String name(Block block) {
return this.key(block).getPath();
@ -86,6 +95,9 @@ public class ModBlockStatesProvider extends BlockStateProvider
public ModelFile stairsModel(Block block, Block texture) {
return this.models().stairs(name(block), blockTexture(texture), blockTexture(texture), blockTexture(texture));
}
public ModelFile carpetModel(Block block, Block texture) {
return this.models().carpet(name(block), blockTexture(texture));
}
public ModelFile slabModel(Block block, Block texture) {
return this.models().slab(name(block), blockTexture(texture), blockTexture(texture), blockTexture(texture));
}

5
src/main/java/dev/zontreck/otemod/data/ModItemModelsProvider.java
View file

@ -51,6 +51,11 @@ public class ModItemModelsProvider extends ItemModelProvider
item(ModItems.MIAB);
item(ModItems.EMPTY_SPAWN_EGG);
item(ModItems.GENERIC_DEPRECATED_ITEM);
item(ModItems.WHITE_BRICK);
item(ModItems.BLUE_BRICK);
item(ModItems.LIGHT_BLUE_BRICK);
item(ModItems.CYAN_BRICK);
item(ModItems.DARK_RED_DYE);
/*

5
src/main/java/dev/zontreck/otemod/data/loot/ModBlockLootTablesProvider.java
View file

@ -96,6 +96,11 @@ public class ModBlockLootTablesProvider extends BlockLootSubProvider
dropSelf(ModBlocks.FILTHY_RED_POOL_LIGHT.get());
dropSelf(ModBlocks.DIRTY_RED_POOL_TILE_STAIRS.get());
dropSelf(ModBlocks.DIRTY_RED_POOL_TILE_SLAB.get());
dropSelf(ModBlocks.DARK_RED_WOOL.get());
dropSelf(ModBlocks.DARK_RED_CARPET.get());
dropSelf(ModBlocks.DARK_RED_BED.get());
add(ModBlocks.DARK_RED_SHULKER_BOX.get(), createShulkerBoxDrop(ModBlocks.DARK_RED_SHULKER_BOX.get()));
}

46
src/main/java/dev/zontreck/otemod/implementation/ModDyes.java Normal file
View file

@ -0,0 +1,46 @@
package dev.zontreck.otemod.implementation;
import com.google.common.collect.ImmutableSet;
import dev.zontreck.otemod.blocks.ModBlocks;
import net.minecraft.world.item.DyeColor;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.entity.BlockEntityType;
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
public class ModDyes
{
public static List<DyeColor> DYES = new ArrayList<>();
public static DyeColor DARK_RED;
static {
DARK_RED = DyeColor.byName("dark_red", DyeColor.WHITE);
DYES.add(DARK_RED);
}
public static void UpdateBlockEntities()
{
Set<Block> shulkerSet = BlockEntityType.SHULKER_BOX.validBlocks;
List<Block> shulkerList = new ArrayList<>();
for(Block shulker : shulkerSet)
{
shulkerList.add(shulker);
}
shulkerList.add(ModBlocks.DARK_RED_SHULKER_BOX.get());
BlockEntityType.SHULKER_BOX.validBlocks = ImmutableSet.copyOf(shulkerList);
Set<Block> bedSet = BlockEntityType.BED.validBlocks;
List<Block> bedList = new ArrayList<>();
for (Block bed : bedSet) {
bedList.add(bed);
}
bedList.add(ModBlocks.DARK_RED_BED.get());
BlockEntityType.BED.validBlocks = ImmutableSet.copyOf(bedList);
}
}

10
src/main/java/dev/zontreck/otemod/items/ModItems.java
View file

@ -60,6 +60,16 @@ public class ModItems {
public static final RegistryObject<Item> GENERIC_DEPRECATED_ITEM = CreativeModeTabs.addToOTEModTab(ITEMS.register("deprecated", ()->new DeprecatedItem()));
public static final RegistryObject<Item> WHITE_BRICK = CreativeModeTabs.addToOTEModTab(ITEMS.register("white_brick", ()->new Item(new Item.Properties())));
public static final RegistryObject<Item> BLUE_BRICK = CreativeModeTabs.addToOTEModTab(ITEMS.register("blue_brick", ()->new Item(new Item.Properties())));
public static final RegistryObject<Item> LIGHT_BLUE_BRICK = CreativeModeTabs.addToOTEModTab(ITEMS.register("light_blue_brick", ()->new Item(new Item.Properties())));
public static final RegistryObject<Item> CYAN_BRICK = CreativeModeTabs.addToOTEModTab(ITEMS.register("cyan_brick", ()->new Item(new Item.Properties())));
public static final RegistryObject<Item> DARK_RED_DYE = CreativeModeTabs.addToOTEModTab(ITEMS.register("dark_red_dye", ()->new Item(new Item.Properties())));
//public static final RegistryObject<Item> POSSUM_SPAWN_EGG = ITEMS.register("possum_spawn_egg", () -> new ForgeSpawnEggItem(ModEntityTypes.POSSUM, 0x938686, 0xc68787, new Item.Properties())));

56
src/main/java/dev/zontreck/otemod/mixins/DyeColorMixin.java Normal file
View file

@ -0,0 +1,56 @@
package dev.zontreck.otemod.mixins;
import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
import net.minecraft.world.item.DyeColor;
import net.minecraft.world.level.material.MapColor;
import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Mutable;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.gen.Invoker;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Comparator;
import java.util.stream.Collectors;
@Mixin(DyeColor.class)
public abstract class DyeColorMixin {
@Shadow
@Final
@Mutable
public static DyeColor[] $VALUES;
private static final DyeColor DARK_RED = addVariant("DARK_RED", "dark_red", 128000001, MapColor.COLOR_RED, 128000001, 128000001);
@Shadow
@Final
@Mutable
private static final DyeColor[] BY_ID = Arrays.stream($VALUES).sorted(Comparator.comparingInt(DyeColor::getId)).toArray((p_41067_) -> {
return new DyeColor[p_41067_];
});
@Shadow
@Final
@Mutable
private static final Int2ObjectOpenHashMap<DyeColor> BY_FIREWORK_COLOR = new Int2ObjectOpenHashMap<>(Arrays.stream($VALUES).collect(Collectors.toMap((p_41064_) -> {
return p_41064_.getFireworkColor();
}, (p_41056_) -> {
return p_41056_;
})));
@Shadow @Final private int id;
@Invoker("<init>")
public static DyeColor invokeInit(String internalName, int internalId, int id, String p_41047_, int p_41048_, MapColor p_41049_, int p_41050_, int p_41051_) {
throw new AssertionError();
}
private static DyeColor addVariant(String internalName, String p_41047_, int p_41048_, MapColor p_41049_, int p_41050_, int p_41051_) {
ArrayList<DyeColor> variants = new ArrayList<DyeColor>(Arrays.asList(DyeColorMixin.$VALUES));
DyeColor color = DyeColorMixin.invokeInit(internalName, variants.get(variants.size() - 1).ordinal() + 1, variants.get(variants.size() - 1).ordinal() + 1, p_41047_, p_41048_, p_41049_, p_41050_, p_41051_);
variants.add(color);
DyeColorMixin.$VALUES = variants.toArray(new DyeColor[0]);
return color;
}
}

34
src/main/java/dev/zontreck/otemod/mixins/ShulkerBoxBlockMixin.java Normal file
View file

@ -0,0 +1,34 @@
package dev.zontreck.otemod.mixins;
import dev.zontreck.otemod.blocks.ModBlocks;
import dev.zontreck.otemod.implementation.ModDyes;
import net.minecraft.world.item.DyeColor;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.Blocks;
import net.minecraft.world.level.block.ShulkerBoxBlock;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
@Mixin(ShulkerBoxBlock.class)
public class ShulkerBoxBlockMixin {
@Inject(locals = LocalCapture.CAPTURE_FAILHARD,
method = "getBlockByColor",
at = @At(value = "HEAD"),
cancellable = true
)
private static void getBlockByColorInject(DyeColor p_56191_, CallbackInfoReturnable<Block> cir) {
if (p_56191_ == null) {
cir.setReturnValue(Blocks.SHULKER_BOX);
} else {
if(p_56191_ == ModDyes.DARK_RED)
{
cir.setReturnValue(ModBlocks.DARK_RED_SHULKER_BOX.get());
}
}
}
}

47
src/main/java/dev/zontreck/otemod/mixins/ShulkerMixin.java Normal file
View file

@ -0,0 +1,47 @@
package dev.zontreck.otemod.mixins;
import net.minecraft.network.syncher.EntityDataAccessor;
import net.minecraft.network.syncher.EntityDataSerializers;
import net.minecraft.network.syncher.SynchedEntityData;
import net.minecraft.world.entity.EntityType;
import net.minecraft.world.entity.animal.AbstractGolem;
import net.minecraft.world.entity.monster.Shulker;
import net.minecraft.world.item.DyeColor;
import net.minecraft.world.level.Level;
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 org.spongepowered.asm.mixin.injection.callback.LocalCapture;
@Mixin(Shulker.class)
public abstract class ShulkerMixin extends AbstractGolem {
@Shadow
protected static final EntityDataAccessor<Byte> DATA_COLOR_ID = SynchedEntityData.defineId(Shulker.class, EntityDataSerializers.BYTE);
protected ShulkerMixin(EntityType<? extends AbstractGolem> p_27508_, Level p_27509_) {
super(p_27508_, p_27509_);
}
@Inject(locals = LocalCapture.CAPTURE_FAILHARD,
method = "getColor",
at = @At(shift = At.Shift.BEFORE, value = "RETURN"),
cancellable = true
)
private void getColorInject(CallbackInfoReturnable<DyeColor> cir) {
byte b0 = this.entityData.get(DATA_COLOR_ID);
cir.setReturnValue( b0 != 64 && b0 <= 63 ? DyeColor.byId(b0) : null);
}
@Inject(locals = LocalCapture.CAPTURE_FAILHARD,
method = "defineSynchedData",
at = @At(shift = At.Shift.BEFORE, value = "TAIL"),
cancellable = true
)
private void defineSynchedDataInject(CallbackInfo ci) {
this.entityData.set(DATA_COLOR_ID, (byte)64);
}
}