Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to 19w13a, minor cleanups #2

Merged
merged 4 commits into from
Mar 28, 2019
Merged

Update to 19w13a, minor cleanups #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
15dfbd8
Update to 19w13a, use new fabric version
doublej472 Mar 28, 2019
dc383a6
Remove useless if statement
doublej472 Mar 28, 2019
c02a54a
Make structure rarity actually do something
doublej472 Mar 28, 2019
cc9fcfe
Stop using deprecated size() function
doublej472 Mar 28, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ repositories {
}

dependencies {
minecraft "com.mojang:minecraft:19w12b"
mappings "net.fabricmc:yarn:19w12b.7"
minecraft "com.mojang:minecraft:19w13a"
mappings "net.fabricmc:yarn:19w13a.3"
modCompile "net.fabricmc:fabric-loader:0.3.7.109"

//Fabric api
modCompile "net.fabricmc:fabric:0.2.5.114"
modCompile "net.fabricmc:fabric:0.2.6.116"
}

// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/com/github/draylar/battleTowers/common/Entities.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,13 @@
import com.github.draylar.battleTowers.common.entity.tower_guard.TowerGuardEntity;
import net.fabricmc.fabric.api.entity.FabricEntityTypeBuilder;
import net.minecraft.entity.EntityCategory;
import net.minecraft.entity.EntitySize;
import net.minecraft.entity.EntityType;
import net.minecraft.util.registry.Registry;

public class Entities
{
public static final EntityType<TowerGuardEntity> towerGuard = FabricEntityTypeBuilder.<TowerGuardEntity>create(EntityCategory.CREATURE, TowerGuardEntity::new).size(3, 6).build();
public static final EntityType<TowerGuardEntity> towerGuard = FabricEntityTypeBuilder.<TowerGuardEntity>create(EntityCategory.CREATURE, TowerGuardEntity::new).size(EntitySize.resizeable(3, 6)).build();

// public static final EntityType<?> towerGuard = Registry.register(Registry.ENTITY_TYPE, "battle-towers:tower_guard", EntityType.Builder.<TowerGuardEntity>create(TowerGuardEntity::new, EntityCategory.CREATURE).build("tower_guard"));

Expand Down
3 changes: 2 additions & 1 deletion src/main/java/com/github/draylar/battleTowers/common/Structures.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import com.github.draylar.battleTowers.common.world.BattleTowerFeature;
import com.github.draylar.battleTowers.common.world.BattleTowerGenerator;
import com.github.draylar.battleTowers.config.ConfigHolder;
import net.minecraft.structure.StructurePieceType;
import net.minecraft.util.registry.Registry;
import net.minecraft.world.biome.Biome;
Expand Down Expand Up @@ -32,7 +33,7 @@ public static void registerStructures()
if(biome.getCategory() != Biome.Category.OCEAN && biome.getCategory() != Biome.Category.RIVER && biome.getCategory() != Biome.Category.NETHER && biome.getCategory() != Biome.Category.THE_END)
{
biome.addStructureFeature(battleTowerFeature, new DefaultFeatureConfig());
biome.addFeature(GenerationStep.Feature.SURFACE_STRUCTURES, Biome.configureFeature(battleTowerFeature, new DefaultFeatureConfig(), Decorator.CHANCE_HEIGHTMAP, new ChanceDecoratorConfig(1000)));
biome.addFeature(GenerationStep.Feature.SURFACE_STRUCTURES, Biome.configureFeature(battleTowerFeature, new DefaultFeatureConfig(), Decorator.CHANCE_HEIGHTMAP, new ChanceDecoratorConfig(ConfigHolder.configInstance.structureRarity)));
}
}
}
Expand Down
6 changes: 0 additions & 6 deletions src/main/java/com/github/draylar/battleTowers/common/world/BattleTowerGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,12 +125,6 @@ protected void handleMetadata(String s, BlockPos blockPos, IWorld iWorld, Random
{
iWorld.setBlockState(blockPos, Blocks.AIR.getDefaultState(), 3);
BlockEntity blockEntity = iWorld.getBlockEntity(blockPos.down());

if (blockEntity instanceof FurnaceBlockEntity)
{
// ((FurnaceBlockEntity) blockEntity).setInvStack(0, new ItemStack(Items.WOODEN_AXE));
// ((FurnaceBlockEntity) blockEntity).setInvStack(1, new ItemStack(Items.COAL));
}
}

else if (s.contains("normal_blacksmith_barrel"))
Expand Down