Skip to content

Commit

Permalink
minecraft 1.18 update
Browse files Browse the repository at this point in the history
  • Loading branch information
Tigereye504 committed Nov 23, 2021
1 parent 291fa68 commit 8bd0828
Show file tree
Hide file tree
Showing 13 changed files with 46 additions and 27 deletions.
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
plugins {
id 'fabric-loom' version '0.8-SNAPSHOT'
id 'fabric-loom' version '0.10-SNAPSHOT'
id 'maven-publish'
}

sourceCompatibility = JavaVersion.VERSION_16
targetCompatibility = JavaVersion.VERSION_16
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17

archivesBaseName = project.archives_base_name
version = project.mod_version
Expand Down
10 changes: 5 additions & 5 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ org.gradle.jvmargs=-Xmx1G

# Fabric Properties
# check these on https://fabricmc.net/use
minecraft_version=1.17.1
yarn_mappings=1.17.1+build.37
loader_version=0.11.6
minecraft_version=1.18-pre4
yarn_mappings=1.18-pre4+build.3
loader_version=0.12.5

# Mod Properties
mod_version = 0.13.1
mod_version = 0.13.2
maven_group = com.github.tigereye.hellish_materials
archives_base_name = hellish-materials

# Dependencies
# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
fabric_version=0.37.2+1.17
fabric_version=0.42.7+1.18
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ public BatetBlock(){
super(FabricBlockSettings.of(Material.METAL)
.strength(3f,6f)
.breakByHand(false)
.breakByTool(FabricToolTags.PICKAXES, 2)
//.breakByTool(FabricToolTags.PICKAXES, 2)
.lightLevel(10)
.sounds(BlockSoundGroup.METAL));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public BatetOre(){
super(FabricBlockSettings.of(Material.STONE)
.strength(3f,50f)
.breakByHand(false)
.breakByTool(FabricToolTags.PICKAXES, 2)
//.breakByTool(FabricToolTags.PICKAXES, 2)
.sounds(BlockSoundGroup.STONE)
.nonOpaque());
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ public LussBlock(){
super(FabricBlockSettings.of(Material.METAL)
.strength(3f,6f)
.breakByHand(false)
.breakByTool(FabricToolTags.PICKAXES, 2)
//.breakByTool(FabricToolTags.PICKAXES, 2)
.lightLevel(10)
.sounds(BlockSoundGroup.METAL));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public VuldOre(){
super(FabricBlockSettings.of(Material.STONE)
.strength(20f,800f)
.breakByHand(false)
.breakByTool(FabricToolTags.PICKAXES, 2)
//.breakByTool(FabricToolTags.PICKAXES, 2)
.sounds(BlockSoundGroup.SLIME));
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package net.tigereye.hellishmaterials.mob_effect;

import net.minecraft.entity.effect.StatusEffect;
import net.minecraft.entity.effect.StatusEffectType;
import net.minecraft.entity.effect.StatusEffectCategory;

public class HM_StatusEffect extends StatusEffect {

public HM_StatusEffect(StatusEffectType type, int color) {
public HM_StatusEffect(StatusEffectCategory type, int color) {
super(type, color);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,11 @@
//import net.tigereye.hellishmaterials.blocks.LussOre;
//import net.tigereye.hellishmaterials.blocks.VuldOre;

public class HMBiomeFeatures {
public class HMBiomeFeatures {/*
public static final ConfiguredFeature<?,?> VULD_ORE_VEIN = BuiltinRegistries.CONFIGURED_FEATURE.get(new Identifier(HellishMaterials.MODID, "vuld_ore_vein"));
public static final ConfiguredFeature<?,?> VULD_ORE_OVERWORLD_TEST = BuiltinRegistries.CONFIGURED_FEATURE.get(new Identifier(HellishMaterials.MODID, "vuld_ore_overworld_test"));

*/
/*
public static void addFeatures(){
for (Biome biome : BuiltinRegistries.BIOME){
if (biome.getCategory() != Biome.Category.NETHER){
Expand All @@ -35,8 +36,8 @@ public static void addFeatures(){
//addFeatureToBiome(biome,GenerationStep.Feature.UNDERGROUND_ORES, BatetOre.BATET_ORE_VEIN);
}
}
}

}*/
/*
public static void addFeatureToBiome(Biome biome, GenerationStep.Feature feature, ConfiguredFeature<?, ?> configuredFeature) {
//ConvertImmutableFeatures(biome);
List<List<Supplier<ConfiguredFeature<?, ?>>>> biomeFeatures = biome.getGenerationSettings().getFeatures();
Expand All @@ -45,7 +46,7 @@ public static void addFeatureToBiome(Biome biome, GenerationStep.Feature feature
}
biomeFeatures.get(feature.ordinal()).add(() -> configuredFeature);
}
}*/
/*
private static void ConvertImmutableFeatures(Biome biome) {
if (biome.getGenerationSettings().getFeatures() instanceof ImmutableList) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package net.tigereye.hellishmaterials.registration;

import net.fabricmc.fabric.api.tag.TagFactory;
import net.fabricmc.fabric.api.tag.TagRegistry;
import net.minecraft.block.Block;
import net.minecraft.entity.EquipmentSlot;
Expand Down Expand Up @@ -57,7 +58,7 @@ public class HMItems {
public static final Item BATET_CHESTPLATE = new BaseArmor(BATET_ARMOR, EquipmentSlot.CHEST);
public static final Item BATET_LEGGINGS = new BaseArmor(BATET_ARMOR, EquipmentSlot.LEGS);
public static final Item BATET_BOOTS = new BaseArmor(BATET_ARMOR, EquipmentSlot.FEET);
public static final Item BATET_GEM = new Item(new Item.Settings().group(ItemGroup.MISC));
public static final Item BATET_GEM = new Item(new Item.Settings().group(ItemGroup.MISC).fireproof());
public static final Item BATET_FRAGMENT = new Item(new Item.Settings().group(ItemGroup.MISC));
public static final Item BATET_AXE = new BaseAxe(new BatetMaterial());
public static final Item BATET_HOE = new BaseHoe(new BatetMaterial());
Expand All @@ -75,10 +76,10 @@ public class HMItems {
public static final Potion LONG_LUCK = new Potion("luck", new StatusEffectInstance(StatusEffects.LUCK, 9600));
public static final Potion STRONG_LUCK = new Potion("luck", new StatusEffectInstance(StatusEffects.LUCK, 1800, 1));

public static final Tag<Item> TAG_LUSS = TagRegistry.item(new Identifier(HellishMaterials.MODID,"luss"));
public static final Tag<Item> TAG_VULD = TagRegistry.item(new Identifier(HellishMaterials.MODID,"vuld"));
public static final Tag<Item> TAG_BATET = TagRegistry.item(new Identifier(HellishMaterials.MODID,"batet"));
public static final Tag<Block> TAG_REPLACEABLE_VULD_ORE = TagRegistry.block(new Identifier(HellishMaterials.MODID,"replaceable_vuld_ore"));
public static final Tag<Item> TAG_LUSS = TagFactory.ITEM.create(new Identifier(HellishMaterials.MODID,"luss"));
public static final Tag<Item> TAG_VULD = TagFactory.ITEM.create(new Identifier(HellishMaterials.MODID,"vuld"));
public static final Tag<Item> TAG_BATET = TagFactory.ITEM.create(new Identifier(HellishMaterials.MODID,"batet"));
public static final Tag<Block> TAG_REPLACEABLE_VULD_ORE = TagFactory.BLOCK.create(new Identifier(HellishMaterials.MODID,"replaceable_vuld_ore"));

public static void register(){
Registry.register(Registry.ITEM, new Identifier(HellishMaterials.MODID, "luss_dust"), LUSS_DUST);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import net.minecraft.entity.LivingEntity;
import net.minecraft.entity.effect.StatusEffect;
import net.minecraft.entity.effect.StatusEffectInstance;
import net.minecraft.entity.effect.StatusEffectType;
import net.minecraft.entity.effect.StatusEffectCategory;
import net.minecraft.util.Identifier;
import net.minecraft.util.registry.Registry;
import net.tigereye.hellishmaterials.HellishMaterials;
Expand All @@ -13,7 +13,7 @@

public class HMStatusEffects {

public static StatusEffect HM_BLOODDEBT = new HM_StatusEffect(StatusEffectType.HARMFUL, 104562){
public static StatusEffect HM_BLOODDEBT = new HM_StatusEffect(StatusEffectCategory.HARMFUL, 104562){
@Override
public boolean canApplyUpdateEffect(int duration, int amplifier) {
return duration % BatetDeferment.REPAYMENT_PERIOD == 0;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"replace": false,
"values": [
"hellish-materials:batet_block",
"hellish-materials:batet_ore",
"hellish-materials:vuld_ore"
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"replace": false,
"values": [
"hellish-materials:batet_block",
"hellish-materials:batet_ore",
"hellish-materials:luss_block",
"hellish-materials:vuld_ore"
]
}
2 changes: 1 addition & 1 deletion src/main/resources/fabric.mod.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"depends": {
"fabricloader": ">=0.7.4",
"fabric": "*",
"minecraft": "1.17.x"
"minecraft": "1.18.x"
},
"suggests": {
"flamingo": "*"
Expand Down

0 comments on commit 8bd0828

Please sign in to comment.