Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-11-22 23:28:35 +01:00
Code Issues Projects Releases Wiki Activity

bysco fixes, no more worm errors...

Browse source
This commit is contained in:
Flanks255 2023-01-15 16:42:43 -06:00
parent db9b199d76
commit 72e29bf696
3 changed files with 2 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/de/ellpeck/actuallyadditions/mod/ActuallyAdditions.java
View file

@ -83,8 +83,8 @@ public class ActuallyAdditions {
}; };
public static final Logger LOGGER = LogManager.getLogger(NAME); public static final Logger LOGGER = LogManager.getLogger(NAME);
public static final DeferredRegister<EntityType<?>> ENTITIES = DeferredRegister.create(ForgeRegistries.ENTITIES, "entities"); public static final DeferredRegister<EntityType<?>> ENTITIES = DeferredRegister.create(ForgeRegistries.ENTITIES, MODID);
public static final RegistryObject<EntityType<EntityWorm>> ENTITY_WORM = ENTITIES.register("worm", () -> EntityType.Builder.of(EntityWorm::new, EntityClassification.CREATURE).build(MODID + ":worm")); public static final RegistryObject<EntityType<EntityWorm>> ENTITY_WORM = ENTITIES.register("worm", () -> EntityType.Builder.of(EntityWorm::new, EntityClassification.MISC).build(MODID + ":worm"));
public static boolean commonCapsLoaded; public static boolean commonCapsLoaded;

30
src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockColoredLamp.java
View file

@ -68,7 +68,6 @@ public class BlockColoredLamp extends BlockBase {
builder.add(LIT); builder.add(LIT);
} }
// TODO: [port][test] validate this rework works
@Override @Override
public ActionResultType use(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult hit) { public ActionResultType use(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult hit) {
ItemStack stack = player.getItemInHand(hand); ItemStack stack = player.getItemInHand(hand);
@ -101,33 +100,4 @@ public class BlockColoredLamp extends BlockBase {
? 15 ? 15
: 0; : 0;
} }
// TODO: [port] Add this back correctly
// public static class TheItemBlock extends ItemBlockBase {
//
// public TheItemBlock(Block block) {
// super(block);
// this.setHasSubtypes(true);
// this.setMaxDamage(0);
// }
//
// @Override
// public String getItemStackDisplayName(ItemStack stack) {
// if (stack.getItemDamage() >= ALL_LAMP_TYPES.length) {
// return StringUtil.BUGGED_ITEM_NAME;
// }
// if (Util.isClient()) {
// return super.getItemStackDisplayName(stack) + (((BlockColoredLamp) this.block).isOn
// ? " (" + StringUtil.localize("tooltip." + ActuallyAdditions.MODID + ".onSuffix.desc") + ")"
// : "");
// } else {
// return super.getItemStackDisplayName(stack);
// }
// }
//
// @Override
// public String getTranslationKey(ItemStack stack) {
// return ActuallyBlocks.blockColoredLamp.getTranslationKey() + "_" + ALL_LAMP_TYPES[stack.getItemDamage()].regName;
// }
// }
} }

21
src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCrystal.java
View file

@ -29,25 +29,4 @@ public class BlockCrystal extends ActuallyBlock {
} }
}; };
} }
// public static class TheItemBlock extends ItemBlockBase {
//
// public TheItemBlock(Block block) {
// super(block);
// this.setHasSubtypes(true);
// this.setMaxDamage(0);
// }
//
// @Override
// public String getTranslationKey(ItemStack stack) {
// return stack.getItemDamage() >= ALL_CRYSTALS.length
// ? StringUtil.BUGGED_ITEM_NAME
// : this.getTranslationKey() + "_" + ALL_CRYSTALS[stack.getItemDamage()].name;
// }
//
// @Override
// public boolean hasEffect(ItemStack stack) {
// return this.block instanceof BlockCrystal && ((BlockCrystal) this.block).isEmpowered;
// }
// }
} }